Changeset 4848 for trunk/MagicSoft/Mars/mcalib

Timestamp:

09/03/04 18:25:07 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -600 +600 @@
         continue;
 
+      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
+      if (!qepix.IsAverageQECombinedAvailable())
+        continue;
+      
       const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
       const Float_t conv = pix.GetMeanConvFADC2Phe();
-
-      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
-      const Float_t qe = qepix.GetQECascadesCombined();
+      const Float_t qe   = qepix.GetQECascadesCombined();
 
       mean  += conv/qe;
@@ -653 +655 @@
         continue;
 
+      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
+      if (!qepix.IsAverageQECombinedAvailable())
+        continue;
+      
       const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
       const Float_t conv = pix.GetMeanConvFADC2Phe();
-
-      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
       const Float_t qe = qepix.GetQECascadesCombined();