Changeset 3278 for trunk/MagicSoft/Mars

Timestamp:

02/24/04 17:56:35 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
      - discovered an error in the calculation of phe's in 
        CalcFFactorMethod(). The average QE was applied twice. 
-       This error has been introduced on 13/02/04
+       This error had been introduced on 13/02/04
+
+   * mcalib/MCalibrate.cc
+     - test validity of every calibration method before retrieving
+       conversion factors
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -204 +204 @@
             {
             case kBlindPixel:
-              calibrationConversionFactor      = pix.GetMeanConversionBlindPixelMethod();
-              calibrationConversionFactorErr   = pix.GetConversionBlindPixelMethodErr();
+                if (pix.IsBlindPixelMethodValid())
+                {
+                    calibrationConversionFactor      = pix.GetMeanConversionBlindPixelMethod();
+                    calibrationConversionFactorErr   = pix.GetConversionBlindPixelMethodErr();
+                }
               break;
             case kPinDiode:
-              calibrationConversionFactor      = pix.GetMeanConversionPINDiodeMethod();
-              calibrationConversionFactorErr   = pix.GetConversionPINDiodeMethodErr();
+                if (pix.IsPINDiodeMethodValid())
+                {
+                    calibrationConversionFactor      = pix.GetMeanConversionPINDiodeMethod();
+                    calibrationConversionFactorErr   = pix.GetConversionPINDiodeMethodErr();
+                }
               break;
             case kFfactor:
-              calibrationConversionFactor      = pix.GetMeanConversionFFactorMethod();
-              calibrationConversionFactorErr   = pix.GetConversionFFactorMethodErr();
+                if (pix.IsFFactorMethodValid())
+                {
+                    calibrationConversionFactor      = pix.GetMeanConversionFFactorMethod();
+                    calibrationConversionFactorErr   = pix.GetConversionFFactorMethodErr();
+                }
               break;
             case kCombined:
-              calibrationConversionFactor      = pix.GetMeanConversionCombinedMethod();
-              calibrationConversionFactorErr   = pix.GetConversionCombinedMethodErr();
-              break;
+                if (pix.IsCombinedMethodValid())
+                {
+                    calibrationConversionFactor      = pix.GetMeanConversionCombinedMethod();
+                    calibrationConversionFactorErr   = pix.GetConversionCombinedMethodErr();
+                }
+                break;
             case kDummy:
               calibrationConversionFactor      = 1.;