Changeset 7130 for trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

Timestamp:

06/03/05 18:02:36 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc

@@ -139 +139 @@
 Bool_t MBadPixelsCalc::CheckPedestalRms(MBadPixelsPix::UnsuitableType_t type) const
 {
-    if (!fGeomCam || !fPedPhotCam || !fBadPixels)
-    {
-        *fLog << err << "MBadPixelsCalc::CheckPedestalRms: ERROR - One of the necessary container are not initialized..." << endl;
-        return kFALSE;
-    }
-
-    const Bool_t checklo  = fPedestalLevelVarianceLo>0;
-    const Bool_t checkhi  = fPedestalLevelVarianceHi>0;
+    const Bool_t checklo = fPedestalLevelVarianceLo>0;
+    const Bool_t checkhi = fPedestalLevelVarianceHi>0;
 
     if (fPedestalLevel<=0 && !checklo && !checkhi)
         return kTRUE;
 
+    if (!fGeomCam || !fPedPhotCam || !fBadPixels)
+    {
+        *fLog << err << "MBadPixelsCalc::CheckPedestalRms: ERROR - One of the necessary container are not initialized..." << endl;
+        return kFALSE;
+    }
+
     const Int_t entries = fPedPhotCam->GetSize();
 
@@ -175 +175 @@
 
     //if no pixel has a minimum signal, return
+    Int_t counter=0;
     for (int i=0; i<na; i++)
     {
-        if (npix[i]==0 || meanrms[i]==0)
-        {
-            //fErrors[1]++;          //no valid Pedestals Rms
-            return kFALSE;
+        if (npix[i]==0 || meanrms[i]==0) //no valid Pedestals Rms
+        {
+            counter++;
+            continue;
         }
 
         meanrms[i] /= npix[i];
         npix[i]=0;
+    }
+
+    if (counter==na)
+    {
+        *fLog << err << "MBadPixelsCalc::CheckPedestalRms: ERROR - No pixel seems to contain a valid pedestal RMS..." << endl;
+        return kFALSE;
     }
 
@@ -209 +216 @@
     MArrayD lolim1(na), lolim2(na); // Precalcualtion of limits
     MArrayD uplim1(na), uplim2(na); // for speeed reasons
+    counter = 0;
     for (int i=0; i<na; i++)
     {
         if (npix[i]==0 || meanrms2[i]==0)
         {
-            //fErrors[1]++;          //no valid Pedestals Rms
-            return kFALSE;
+            counter++;
+            continue;
         }
 
@@ -233 +241 @@
             uplim2[i]   = meanrms2[i]+fPedestalLevelVarianceHi*varrms2[i];
         }
+    }
+
+    if (counter==na)
+    {
+        *fLog << err << "MBadPixelsCalc::CheckPedestalRms: ERROR - No pixel seems to contain a valid pedestal RMS anymore..." << endl;
+        return kFALSE;
     }