Enhancements Calibration Helper

Hi Luigi,
I would like to propose some changes in the calibration helper classes, I guess self explaining. Could you have a look whether that makes sense ? The test suite does not complain. Also I try to get closer to the library's standards, so I compiled with -wAll (with linux gcc 4.6.3). The code does not throw any warnings.
Thank you and regards
Peter