Changeset 4559 for trunk/MagicSoft

Timestamp:

08/10/04 12:31:54 (20 years ago)

Author:

tonello

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbadpixels/MBadPixelsTreat.cc (modified) (2 diffs)
• mbadpixels/MBadPixelsTreat.h (modified) (2 diffs)
• mjobs/MJExtractCalibTest.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+  2004/08/10: Nadia Tonello
+
+   * mbadpixels/MBadPixelsTreat.[h,cc]
+     - replaced flag SetSloppyTreatment() with SetHardTreatment() 
+        Now the default behaviour consists on treating only the 
+        unsuitable pixels, and not also the ureliable, as it was 
+        before. If you want to keep on treating both unsuitable and
+        unreliable pixels, please set the new flag on in your macro. 
+
+   * mjobs/MJExtractCalibTest.cc
+     - removed line containing SetSloppyTreatment()
 
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc

@@ -38 +38 @@
 //  should be set using SetNumMinNeighbors
 //
-//  If you don't want to interpolate unreliable pixels but only unsuitable
-//  (broken) pixels use SetSloppyTreatment().
+//  If you want to interpolate unreliable pixels and  unsuitable
+//  (broken) pixels use SetHardTreatment().
 //
 //
@@ -95 +95 @@
 // --------------------------------------------------------------------------
 //
-// Returns the status of a pixel. If kSloppyTreatment is set a pixel must
-// be unsuitable to be treated. If not it is enough if it is unreliable
+// Returns the status of a pixel. If kHardTreatment is set a pixel must
+// be unsuitable or uriliable to be treated. If not it is treated only if 
+// it is unsuitable
 // (IsBad() checks for any flag)
 //
 Bool_t MBadPixelsTreat::IsPixelBad(Int_t idx) const
 {
-    return TESTBIT(fFlags, kSloppyTreatment) ? (*fBadPixels)[idx].IsUnsuitable() : (*fBadPixels)[idx].IsBad();
+    return TESTBIT(fFlags, kHardTreatment) ? (*fBadPixels)[idx].IsBad():(*fBadPixels)[idx].IsUnsuitable() ;
 }
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.h

@@ -27 +27 @@
         kUseCentralPixel  = 2,
         kProcessRMS       = 3,
-        kSloppyTreatment  = 4
+        kHardTreatment  = 4
     };
 
@@ -59 +59 @@
         b ? SETBIT(fFlags, kProcessRMS) : CLRBIT(fFlags, kProcessRMS);
     }
-    void SetSloppyTreatment(Bool_t b=kTRUE)
+    void SetHardTreatment(Bool_t b=kTRUE)
     {
-        b ? SETBIT(fFlags, kSloppyTreatment) : CLRBIT(fFlags, kSloppyTreatment);
+        b ? SETBIT(fFlags, kHardTreatment) : CLRBIT(fFlags, kHardTreatment);
     }
     void SetNumMinNeighbors(Byte_t num) { fNumMinNeighbors=num; }

trunk/MagicSoft/Mars/mjobs/MJExtractCalibTest.cc

@@ -262 +262 @@
   MBadPixelsTreat       badtreat;
   badtreat.SetUseInterpolation();
-  badtreat.SetSloppyTreatment();
   MCalibrationTestCalc  testcalc;
   testcalc.SetOutputPath(fOutputPath);