Changeset 7053 for trunk/MagicSoft/Mars/mcalib

Timestamp:

05/18/05 11:12:11 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibCalcFromPast.cc (modified) (1 diff)
• MCalibrateData.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -77 +77 @@
 MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title)
     : fGeom(NULL), fParList(NULL), fRunHeader(NULL),
-      fIntensCharge(NULL), fIntensBlind(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
-      fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL),
-      fNumEvents(0), fNumCam(0), fUpdateWithFFactorMethod(kFALSE)
+    fIntensCharge(NULL), fIntensBlind(NULL), fIntensQE(NULL),
+    fIntensRelTime(NULL), fIntensBad(NULL), fChargeCalc(NULL),
+    fRelTimeCalc(NULL), fCalibrate(NULL), fNumEvents(0), fNumCam(0),
+    fUpdateWithFFactorMethod(kFALSE)
 {
 

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -253 +253 @@
     }
 
-    if (fPedestalFlag)
+    if (fPedestalFlag!=kNo)
     {
         if (fNamesPedestal.GetSize()==0)
@@ -323 +323 @@
 
     // Sizes might have changed
-    if (fPedestalFlag)
+    if (fPedestalFlag!=kNo)
     {
         TIter Next(&fPedestalCams);
@@ -405 +405 @@
           {
             *fLog << "Size mismatch between MGeomCam and MCalibrationChargeCam... abort!" << endl;
-            return kFALSE;
-          }
-        
-        if (fBadPixels->GetSize() != npixels)
-          {
-            *fLog << "Size mismatch between MGeomCam and MBadPixelsCam... abort!" << endl;
             return kFALSE;
           }
@@ -598 +592 @@
         if (calibConv != 0. && calibQE != 0.)
           {
-            // Now doing:
             calibConvVar  = calibConvVar/(calibConv*calibConv) + calibQEVar/(calibQE*calibQE);
             calibConvVar *= (calibConv*calibConv);
-            // The above two lines had been commented by TB and replaced by the following line 
-            // (without notice to me!) but it is simply wrong!
-            //          calibConvVar += calibQEVar*(calibConv*calibConv)/(calibQE*calibQE);
           }
 
@@ -631 +621 @@
         return kFALSE;
     }
-
-    
-
-    //    Print();
 
     return kTRUE;