Modified CalibrationMetric to read in an instrument calibration file,
specified in config.xml, and cleaned up some other classes.