Changeset 3931 for trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

Timestamp:

05/03/04 10:47:30 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -116 +116 @@
 #include "MGeomCam.h"
 
+#include "MBadPixelsPix.h"
+#include "MBadPixelsCam.h"
+
 #include "MGeomCamMagic.h"
 
@@ -133 +136 @@
 //
 // Sets:
+// - all pointers to NULL
 // - fWindowSizeHiGain to fgHiGainWindowSize
 // - fWindowSizeLoGain to fgLoGainWindowSize
@@ -144 +148 @@
 MPedCalcPedRun::MPedCalcPedRun(const char *name, const char *title)
     : fWindowSizeHiGain(fgHiGainWindowSize), 
-      fWindowSizeLoGain(fgLoGainWindowSize)
+      fWindowSizeLoGain(fgLoGainWindowSize), 
+      fGeom(NULL),fBad(NULL)
 {
   fName  = name  ? name  : "MPedCalcPedRun";
@@ -263 +268 @@
 //  - MRawRunHeader
 //  - MGeomCam
+//  - MBadPixelsCam
 // 
 // The following output containers are also searched and created if
@@ -298 +304 @@
   if (!fPedestals)
     return kFALSE;
+
+  fBad       =  (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
 
   return kTRUE;
@@ -318 +326 @@
 // modifying the ranges again, if necessary.
 //
+// A loop over the MBadPixelsCam is performed and bad pixels are set
+// to MPedestalPix::SetValid(kFALSE);
+//
 Bool_t MPedCalcPedRun::ReInit(MParList *pList)
 {
@@ -385 +396 @@
   *fLog << inf << GetDescriptor() << ": Taking " << (int)fWindowSizeLoGain
         << " LoGain FADC samples starting with slice: " << (int)fLoGainFirst << endl;
+
+
+  if (fBad)
+    {
+      const Int_t nbads = fBad->GetSize();
+      for (Int_t i=0; i<(nbads>npixels?npixels:nbads);i++)
+        if ((*fBad)[i].IsBad())
+          (*fPedestals)[i].SetValid(kFALSE);
+    }
   
   return kTRUE;
-  
+      
 }
 // --------------------------------------------------------------------------