Add wrappers and tidy hs_calibrate.py