Changeset 7349 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

09/12/05 16:35:04 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

• MBadPixelsCalc.cc (modified) (2 diffs)
• MBadPixelsTreat.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

@@ -137 +137 @@
 // too high pedestal Rms with respect to the mean.
 // 
-Bool_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsPix::UnsuitableType_t type) const
+Int_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsPix::UnsuitableType_t type) const
 {
     const Bool_t checklo = fPedestalLevelVarianceLo>0;
@@ -310 +310 @@
 Int_t MBadPixelsCalc::Process()
 {
-    return fCheckInProcess ? CheckPedestalRms(MBadPixelsPix::kUnsuitableEvt) : kTRUE;
+    if (!fCheckInProcess)
+        return kTRUE;
+
+    return CheckPedestalRms(MBadPixelsPix::kUnsuitableEvt) ? kTRUE : kERROR;
 }
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -441 +441 @@
         for (unsigned int j=0; j<time.GetSize(); j++)
         {
-            const Double_t t = (*fEvt)[j].GetArrivalTime();
-            if (t>=0)
+            const Int_t nn = gpix.GetNeighbor(j);
+
+            const Double_t t = (*fEvt)[nn].GetArrivalTime();
+            if (t>=0 && !IsPixelBad(nn))
                 time[n0++] = t;
         }