Detector Calibration Branch Version 0xD006

Lots of changes to use the new detector calibration methods.