amendments to cpmCalc.py