major changes to the structure of Calibration class. Simplified interface & function structure
imporved and simplified structure of Calibration class