Changeset 8106 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

Timestamp:

10/17/06 18:18:40 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.166 2006-10-17 17:15:59 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -1807 +1809 @@
       
       MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
+      MCalibrationQEPix     &qpix  = (MCalibrationQEPix&)    (*qecam)    [i];
       MBadPixelsPix         &bad   =                         (*badcam)   [i];
 
@@ -1818 +1820 @@
       const Float_t qerelvar = avphotrelvar +  pix.GetPheFFactorMethodRelVar();
 
-      qepix.SetQEFFactor    ( qe            , fPulserColor );
-      qepix.SetQEFFactorVar ( qerelvar*qe*qe, fPulserColor );      
-      qepix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
-
-      if (!qepix.UpdateFFactorMethod( qecam->GetPlexiglassQE() ))
+      qpix.SetQEFFactor    ( qe            , fPulserColor );
+      qpix.SetQEFFactorVar ( qerelvar*qe*qe, fPulserColor );
+      qpix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
+
+      if (!qpix.UpdateFFactorMethod( qecam->GetPlexiglassQE() ))
         *fLog << warn << GetDescriptor() 
               << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl;
@@ -1949 +1951 @@
     {
       
-      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
-      MBadPixelsPix         &bad   =                         (*badcam)   [i];
+      MCalibrationChargePix &pix  = (MCalibrationChargePix&)(*chargecam)[i];
+      MCalibrationQEPix     &qpix = (MCalibrationQEPix&)    (*qecam)    [i];
+      MBadPixelsPix         &bad  =                         (*badcam)   [i];
 
       if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
         {
-          qepix.SetFFactorMethodValid(kFALSE,fPulserColor);
+          qpix.SetFFactorMethodValid(kFALSE,fPulserColor);
           pix.SetFFactorMethodValid(kFALSE);
           continue;