Changeset 3279

Timestamp:

02/24/04 18:09:51 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrate.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -184 +184 @@
   UInt_t npix = fSignals->GetSize();
 
-  Float_t hiloconv      = 1.;
+  Float_t hiloconv      = 0.;
   Float_t hiloconverr   = 0.;
-  Float_t calibrationConversionFactor    = 1.;
+  Float_t calibrationConversionFactor    = 0.;
   Float_t calibrationConversionFactorErr = 0.;
   
@@ -197 +197 @@
           if (!pix.IsChargeValid())
             continue;
-          
-          hiloconv   = pix.GetConversionHiLo();
-          hiloconverr= pix.GetConversionHiLoErr();
           
           switch(fCalibrationMode)
@@ -209 +206 @@
                     calibrationConversionFactorErr   = pix.GetConversionBlindPixelMethodErr();
                 }
+                else
+                    continue;
               break;
             case kPinDiode:
@@ -216 +215 @@
                     calibrationConversionFactorErr   = pix.GetConversionPINDiodeMethodErr();
                 }
+                else
+                    continue;
               break;
             case kFfactor:
@@ -223 +224 @@
                     calibrationConversionFactorErr   = pix.GetConversionFFactorMethodErr();
                 }
+                else
+                    continue;
               break;
             case kCombined:
@@ -230 +233 @@
                     calibrationConversionFactorErr   = pix.GetConversionCombinedMethodErr();
                 }
+                else
+                    continue;
                 break;
             case kDummy:
+              hiloconv                         = 1.;
+              hiloconverr                      = 0.;
               calibrationConversionFactor      = 1.;
               calibrationConversionFactorErr   = 0.;
               break;
-            }
-        }
+
+            } /* switch calibration mode */
+          
+          hiloconv   = pix.GetConversionHiLo();
+          hiloconverr= pix.GetConversionHiLoErr();
+          
+        } /* if(fCalibrationMode!=kNone) */
       
       MExtractedSignalPix &sig =  (*fSignals)[pixidx];
@@ -272 +284 @@
       if (sig.GetNumLoGainSaturated() > 0)
         cpix->SetPixelSaturated();
-    }
+
+    } /* for (UInt_t pixidx=0; pixidx<npix; pixidx++) */
   
   fCerPhotEvt->FixSize();