Calib: Improve CBEnergy/PIDTime runset macros