Changeset 2879 for trunk/MagicSoft

Timestamp:

01/21/04 22:45:54 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -15 +15 @@
      - calculate PedRMS as RMS of the sums, later renormalized to units 
        of RMS/slice (eliminate the wrong effect of odd and even slices)
+
+   * mcalib/MCalibrationCalc.cc
+     - if bit SkipBlindPixelFit is set, now number of photons outside 
+       plexiglass is not intended to be calculated any more (previous
+       bug)
+
 
  2004/01/21: Abelardo Moralejo

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -495 +495 @@
   fCalibrations->CutEdges();
 
-  //
-  // Get pointer to blind pixel
-  //
-  MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
-
-  *fLog << inf << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
-
   // 
   // Fit the blind pixel
@@ -507 +500 @@
   if (TESTBIT(fFlags,kUseBlindPixelFit))
     {
+      //
+      // Get pointer to blind pixel
+      //
+      MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
+      
+      *fLog << inf << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
 
       if (!blindpixel.FitCharge())
@@ -517 +516 @@
       blindpixel.DrawClone();
     }
+  else 
+    *fLog << inf << GetDescriptor() << ": Skipping Blind Pixel Fit " << endl;
+
   
   *fLog << inf << GetDescriptor() << ": Fitting the Normal Pixels" << endl;
@@ -559 +561 @@
     }
 
-  if (!fCalibrations->CalcNumPhotInsidePlexiglass())
-    {
-      *fLog << err << GetDescriptor() 
-            << ": Could not calculate the number of photons from the blind pixel " << endl;
-      return kFALSE;
-    }
   
+  if (TESTBIT(fFlags,kUseBlindPixelFit))
+    {
+      
+      if (!fCalibrations->CalcNumPhotInsidePlexiglass())
+        {
+          *fLog << err 
+                << "Could not calculate the number of photons from the blind pixel " << endl;
+          *fLog << err 
+                << "You can try to calibrate using the MCalibrationCalc::SkipBlindPixelFit()" << endl;
+          return kFALSE;
+        }
+    }
+  else
+    *fLog << inf << GetDescriptor() << ": Skipping Blind Pixel Fit " << endl;
+
   fCalibrations->SetReadyToSave();