Changeset 2840

Timestamp:

01/19/04 11:36:40 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -7 +7 @@
  2004/01/19: Markus Gaug
 
+   * mcalib/MCalibrationCalc.cc
    * mcalib/MCalibrationPix.[h,cc]
      - new Flag fExcluded to indicate if pixel has been excluded from 

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -1 @@
- /* ======================================================================== *\
+/* ======================================================================== *\
 !
 ! *
@@ -107 +107 @@
 //
 MCalibrationCalc::MCalibrationCalc(const char *name, const char *title)
-    : fColor(kEBlue)
+    : fPedestals(NULL), fCalibrations(NULL), fSignals(NULL),
+      fRawEvt(NULL), fRunHeader(NULL), fEvtTime(NULL),
+      fEvents(0), fHistOverFlow(0), fCosmics(0),
+      fNumHiGainSamples(0), fNumLoGainSamples(0), fConversionHiLo(0.),
+      fColor(kEBlue)
 {
 
@@ -139 +143 @@
 Int_t MCalibrationCalc::PreProcess(MParList *pList)
 {
-
-    fHistOverFlow = 0;
-    fEvents       = 0;
-    fCosmics      = 0;
 
     fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
@@ -253 +253 @@
  
 }
-
 
 // --------------------------------------------------------------------------
@@ -475 +474 @@
       pix.SetPedestal(ped,prms);
 
+
+      //
+      // Check if the pixel has been excluded from the fits
+      //
+      if (pix.IsExcluded())
+        continue;
+
       //
       // perform the Gauss fits to the charges
@@ -505 +511 @@
   return kTRUE;
 }
+