Tweaked calibration.h to make it ISO C++ compliant. Added variable change to CmakeLists.