Changeset 4527 for trunk/MagicSoft

Timestamp:

08/06/04 16:26:18 (20 years ago)

Author:

tonello

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbadpixels/MBadPixelsCalc.cc (modified) (10 diffs)
• mbadpixels/MBadPixelsCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
 
- 2004/08/05: Nadia Tonello
+ 2004/08/06: Nadia Tonello
 
    * mimage/MImgCleanStd.cc:
@@ -27 +27 @@
         is skipped when no action is espected, i.e. if lvl1 <= lvl2.
         This will accelerate the cleaning process in such cases.
+
+   * mbadpixels/MBadPixelsCalc.[h,cc]:
+     - removed dependence on MSigmabar 
 
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

@@ -35 +35 @@
 //
 // Check the pedestal RMS of every pixel with respect to the mean
-// pedestal RMS of the camera (Sigmabar).
+// pedestal RMS of the camera.
 //
 // The pixels can be set as blind if the pedestalRMS is too big or 0.
@@ -48 +48 @@
 //   [MPedPhotCam]
 //   [MGeomCam]
-//   [MSigmabar]
 //
 //  Output Containers:
@@ -66 +65 @@
 #include "MGeomPix.h"
 
-#include "MSigmabar.h"
+//#include "MSigmabar.h"
 
 #include "MPedPhotCam.h"
@@ -117 +116 @@
         }
 
-        fSigmabar = (MSigmabar*)pList->FindObject(AddSerialNumber("MSigmabar"));
+        /*        fSigmabar = (MSigmabar*)pList->FindObject(AddSerialNumber("MSigmabar"));
         if (!fSigmabar)
         {
@@ -123 +122 @@
             return kFALSE;
         }
+        */
     }
     return kTRUE;
@@ -138 +138 @@
 //     MBadPixelsCalc calc;
 //     calc.SetPedestalLevel(-1);
-//
+/*
 void MBadPixelsCalc::CheckPedestalRMS() const
 {
@@ -157 +157 @@
     }
 }
-
+*/
 // --------------------------------------------------------------------------
 // Check the pedestal Rms of the pixels: compute with 2 iterations the mean 
@@ -233 +233 @@
         const Byte_t  aidx = (*fGeomCam)[i].GetAidx();
 
-        if (rms>meanrms2[aidx]/3 && rms<=meanrms2[aidx]*3)
+        if (rms>meanrms2[aidx]/fPedestalLevel && rms<=meanrms2[aidx]*fPedestalLevel)
             continue;
 
@@ -242 +242 @@
     // Check if the number of pixels to blind is > 60% of total number of pixels
     //
-    if (bads>0.6*entries)
-    {
-        //fErrors[2]++;
-        return kFALSE;
-    }
+    //    if (bads>0.6*entries)
+    //    {
+    //    fErrors[2]++;
+    //    return kFALSE;
+    //    }
 
     return kTRUE;
@@ -262 +262 @@
     return kTRUE;
 }
+
+

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h

@@ -7 +7 @@
 
 class MBadPixelsCam;
-class MSigmabar;
+//class MSigmabar;
 class MGeomCam;
 class MPedPhotCam;
@@ -15 +15 @@
 private:
     MGeomCam      *fGeomCam;    //! Input container storing the pixel sizes
-    MSigmabar     *fSigmabar;   //! Input container storing mean pedestal rms of the camera
+    //    MSigmabar     *fSigmabar;   //! Input container storing mean pedestal rms of the camera
     MPedPhotCam   *fPedPhotCam; //! Input container storing the pedestal and pedestal rms of all pixels
 
@@ -22 +22 @@
     Float_t fPedestalLevel;
 
-    void CheckPedestalRMS() const;
+    //    void CheckPedestalRMS() const;
     Bool_t CheckPedestalRms() const;