added getSirionSiCpsPerNa to jmGen.py and added anaSiBeamCal.py to other macros