Changeset 5840 for trunk/MagicSoft/Mars/mcalib

Timestamp:

01/14/05 14:46:14 (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

@@ -654 +654 @@
       if (bad && (*bad)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
         continue; 
-      
+
       const UInt_t aidx = geom[i].GetAidx();
       
       if (ai != aidx)
         continue;
-
+      
       const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
-      if (!qepix.IsAverageQECombinedAvailable())
+      if (!qepix.IsAverageQEFFactorAvailable())
         continue;
       
       const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
       const Float_t conv = pix.GetMeanConvFADC2Phe();
-      const Float_t qe   = qepix.GetQECascadesCombined();
+      const Float_t qe   = qepix.GetQECascadesFFactor();
 
       mean  += conv/qe;
@@ -714 +714 @@
 
       const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
-      if (!qepix.IsAverageQECombinedAvailable())
+      if (!qepix.IsAverageQEFFactorAvailable())
         continue;
       
       const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
       const Float_t conv = pix.GetMeanConvFADC2Phe();
-      const Float_t qe = qepix.GetQECascadesCombined();
+      const Float_t qe = qepix.GetQECascadesFFactor();
 
       mean  += conv/qe;