Changeset 6312 for trunk/MagicSoft

Timestamp:

02/09/05 16:04:12 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndChargeDigitalFilterPeakSearch.cc (modified) (5 diffs)
• MExtractTimeAndChargeDigitalFilterPeakSearch.h (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc

@@ -62 +62 @@
 #include "MLogManip.h"
 
+#include "MParList.h"
+
 #include "MPedestalPix.h"
 #include "MPedestalCam.h"
@@ -72 +74 @@
 #include "MArrivalTimeCam.h"
 #include "MArrivalTimePix.h"
+
+#include "MBadPixelsCam.h"
+#include "MBadPixelsPix.h"
 
 ClassImp(MExtractTimeAndChargeDigitalFilterPeakSearch);
@@ -98 +103 @@
 //
 MExtractTimeAndChargeDigitalFilterPeakSearch::MExtractTimeAndChargeDigitalFilterPeakSearch(const char *name, const char *title) 
+    : fBadPixels(NULL)
 {
     fName  = name  ? name  : "MExtractTimeAndChargeDigitalFilterPeakSearch";
@@ -142 +148 @@
   fLoGainOutOfRangeRight = 0;
   
+  fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+  if (!fBadPixels)
+    {
+      *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl;
+      return kFALSE;
+    }
+
   return kTRUE;
 }
@@ -293 +306 @@
       sat = 0;
 
-      FindPeak(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), startslice, sumhi, sat, satpos);
+      MBadPixelsPix &bad = (*fBadPixels)[pixel.GetPixelId()];
+      
+      if (!bad.IsUnsuitable())
+        FindPeak(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), startslice, sumhi, sat, satpos);
 
       if (sumhi > maxsumhi && sat == 0)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.h

@@ -17 +17 @@
 class TH2F;
 class MPedestalPix;
+class MBadPixelsCam;
+
 class MExtractTimeAndChargeDigitalFilterPeakSearch : public MExtractTimeAndChargeDigitalFilter
 {
@@ -42 +44 @@
   ULong_t fLoGainOutOfRangeRight;              // Number of events out of range to the right side in low gain
 
+  MBadPixelsCam *fBadPixels;                   // Bad Pixels Camera
+  
   void    FindPeak(Byte_t *ptr, Byte_t *logain,
                    Byte_t &startslice, Int_t &max, Int_t &sat, Byte_t &satpos) const;