Changeset 3278 for trunk/MagicSoft/Mars/mcalib

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrate.cc (modified) (1 diff)

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.;