Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4526)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4527)
@@ -21,5 +21,5 @@
 
 
- 2004/08/05: Nadia Tonello
+ 2004/08/06: Nadia Tonello
 
    * mimage/MImgCleanStd.cc:
@@ -27,4 +27,7 @@
 	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 
 
 
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4526)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 4527)
@@ -35,5 +35,5 @@
 //
 // 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,5 +48,4 @@
 //   [MPedPhotCam]
 //   [MGeomCam]
-//   [MSigmabar]
 //
 //  Output Containers:
@@ -66,5 +65,5 @@
 #include "MGeomPix.h"
 
-#include "MSigmabar.h"
+//#include "MSigmabar.h"
 
 #include "MPedPhotCam.h"
@@ -117,5 +116,5 @@
         }
 
-        fSigmabar = (MSigmabar*)pList->FindObject(AddSerialNumber("MSigmabar"));
+	/*        fSigmabar = (MSigmabar*)pList->FindObject(AddSerialNumber("MSigmabar"));
         if (!fSigmabar)
         {
@@ -123,4 +122,5 @@
             return kFALSE;
         }
+	*/
     }
     return kTRUE;
@@ -138,5 +138,5 @@
 //     MBadPixelsCalc calc;
 //     calc.SetPedestalLevel(-1);
-//
+/*
 void MBadPixelsCalc::CheckPedestalRMS() const
 {
@@ -157,5 +157,5 @@
     }
 }
-
+*/
 // --------------------------------------------------------------------------
 // Check the pedestal Rms of the pixels: compute with 2 iterations the mean 
@@ -233,5 +233,5 @@
         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,9 +242,9 @@
     // 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,2 +262,4 @@
     return kTRUE;
 }
+
+
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h	(revision 4526)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h	(revision 4527)
@@ -7,5 +7,5 @@
 
 class MBadPixelsCam;
-class MSigmabar;
+//class MSigmabar;
 class MGeomCam;
 class MPedPhotCam;
@@ -15,5 +15,5 @@
 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,5 +22,5 @@
     Float_t fPedestalLevel;
 
-    void CheckPedestalRMS() const;
+    //    void CheckPedestalRMS() const;
     Bool_t CheckPedestalRms() const;