Changeset 3801 for trunk/MagicSoft/Mars

Timestamp:

04/22/04 20:02:35 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbadpixels/MBadPixelsTreat.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -53 +53 @@
    * mraw/MRawRead.[h,cc]:
      - added fForceMode flag to be able to suppress event errors
+
+   * mbadpixels/MBadPixelsTreat.[h,cc]:
+     - changes such that the pedestal interpolation is now done
+       only in ReInit. If you need the old behaviour call
+       SetProcessRMS()
 
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -235 +235 @@
         // If not, unmap the pixel. The maximum number of blind neighbors
         // should be 2
-        if (num<3)
+        if (num<fNumMinNeighbors)
         {
             pix->SetPixelUnmapped();
@@ -351 +351 @@
 //      the Image Parameters.
 //
+/*
 void MBadPixelsTreat::Interpolate() const
 {
@@ -453 +454 @@
         }
 
-        if (num<2)
+        if (num<fNumMinNeighbors)
         {
             pix->SetPixelUnmapped();
@@ -492 +493 @@
     }
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -517 +519 @@
 // --------------------------------------------------------------------------
 //
+// Interpolate Pedestals if kProcessRMS not set
+//
+Bool_t MBadPixelsTreat::ReInit(MParList *pList)
+{
+    if (!TESTBIT(fFlags, kProcessRMS))
+        InterpolatePedestals();
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
 // Treat the blind pixels
 //
 Int_t MBadPixelsTreat::Process()
 {
-    /*
-    if (TESTBIT(fFlags, kCheckPedestalRms))
-    {
-        // if the number of blind pixels is too high, do not interpolate
-       if (CheckPedestalRms()==kFALSE)
-           return kTRUE;
-
-       if (TESTBIT(fFlags, kUseInterpolation))
-           InterpolatePedestals();
-    }
-    */
-
     if (TESTBIT(fFlags, kUseInterpolation) && fGeomCam)
-        Interpolate();
+    {
+        InterpolateSignal();
+        if (TESTBIT(fFlags, kProcessRMS))
+            InterpolatePedestals();
+    }
     else
         Unmap();
-
-
-    //fErrors[0]++;
 
     return kTRUE;