Changeset 5840 for trunk


Ignore:
Timestamp:
01/14/05 14:46:14 (20 years ago)
Author:
gaug
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

    r5661 r5840  
    654654      if (bad && (*bad)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
    655655        continue;
    656      
     656
    657657      const UInt_t aidx = geom[i].GetAidx();
    658658     
    659659      if (ai != aidx)
    660660        continue;
    661 
     661     
    662662      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
    663       if (!qepix.IsAverageQECombinedAvailable())
     663      if (!qepix.IsAverageQEFFactorAvailable())
    664664        continue;
    665665     
    666666      const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
    667667      const Float_t conv = pix.GetMeanConvFADC2Phe();
    668       const Float_t qe   = qepix.GetQECascadesCombined();
     668      const Float_t qe   = qepix.GetQECascadesFFactor();
    669669
    670670      mean  += conv/qe;
     
    714714
    715715      const MCalibrationQEPix &qepix = (MCalibrationQEPix&)qecam[i];
    716       if (!qepix.IsAverageQECombinedAvailable())
     716      if (!qepix.IsAverageQEFFactorAvailable())
    717717        continue;
    718718     
    719719      const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*this)[i];
    720720      const Float_t conv = pix.GetMeanConvFADC2Phe();
    721       const Float_t qe = qepix.GetQECascadesCombined();
     721      const Float_t qe = qepix.GetQECascadesFFactor();
    722722
    723723      mean  += conv/qe;
Note: See TracChangeset for help on using the changeset viewer.