Changeset 7829 for trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

Timestamp:

08/01/06 14:13:34 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -312 +312 @@
           // used later to convert from C-photons into "equivalent phes":
           //
+
+          // Average areas not yet initialized? use default value
+          fRenormFactor = MCalibrationQEPix::gkDefaultAverageQE;
           if (fQEs->GetAverageAreas() > 0)
           {
@@ -317 +320 @@
               fRenormFactor = avqepix.GetAverageQE();
           }
-          else // Average areas not yet initialized, use default value
-              fRenormFactor = MCalibrationQEPix::gkDefaultAverageQE;
-
-          fRenormFactor = MCalibrationQEPix::gkDefaultAverageQE;
           break;
+
       case kPhot:
           fRenormFactor = 1.;
@@ -543 +543 @@
     // For the moment, we use only a dummy zenith for the calibration:
     //
-    const Float_t zenith = -1.;
-
     UInt_t skip = 0;
 
@@ -620 +618 @@
                   if (pix.IsFFactorMethodValid())
                     {
-                      const Float_t convmin1 = qe.GetQECascadesFFactor(zenith)/pix.GetMeanConvFADC2Phe();
+                      const Float_t convmin1 = qe.GetQECascadesFFactor()/pix.GetMeanConvFADC2Phe();
                       if (convmin1 > 0)
                         calibFFactor *= TMath::Sqrt(convmin1);
@@ -634 +632 @@
                     continue;
                   }
-                calibQE     = qe.GetQECascadesBlindPixel   ( zenith );
-                calibQEVar  = qe.GetQECascadesBlindPixelVar( zenith );
+                calibQE     = qe.GetQECascadesBlindPixel();
+                calibQEVar  = qe.GetQECascadesBlindPixelVar();
                 break;
                 
@@ -644 +642 @@
                     continue;
                   }
-                calibQE     = qe.GetQECascadesPINDiode   ( zenith );
-                calibQEVar  = qe.GetQECascadesPINDiodeVar( zenith );
+                calibQE     = qe.GetQECascadesPINDiode();
+                calibQEVar  = qe.GetQECascadesPINDiodeVar();
                 break;
                 
@@ -654 +652 @@
                     continue;
                   }
-                calibQE     = qe.GetQECascadesFFactor   ( zenith );
-                calibQEVar  = qe.GetQECascadesFFactorVar( zenith );
+                calibQE     = qe.GetQECascadesFFactor();
+                calibQEVar  = qe.GetQECascadesFFactorVar();
                 break;
                 
@@ -664 +662 @@
                     continue;
                   }
-                calibQE     = qe.GetQECascadesCombined   ( zenith );
-                calibQEVar  = qe.GetQECascadesCombinedVar( zenith );
+                calibQE     = qe.GetQECascadesCombined();
+                calibQEVar  = qe.GetQECascadesCombinedVar();
                 break;
                 
@@ -695 +693 @@
 
         fHiLoConv     [pixidx] = hiloconv;
-        fHiLoConvErr  [pixidx] = hiloconverr;        
+        fHiLoConvErr  [pixidx] = hiloconverr;
         fCalibConsts  [pixidx] = calibConv;
         fCalibFFactors[pixidx] = calibFFactor;
@@ -711 +709 @@
 
       } /*     for (Int_t pixidx=0; pixidx<fGeomCam->GetNumPixels(); pixidx++) */
-    
+
     if (skip>fGeomCam->GetNumPixels()*0.9)
     {