CHG: working on all Calibration2 classes. all tests passing,