Changeset 2237 for trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

Timestamp:

06/26/03 17:00:06 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -263 +263 @@
 
 #include "MParList.h"
+#include "MSigmabar.h"
+
 #include "MGeomPix.h"
 #include "MGeomCam.h"
+
 #include "MCerPhotPix.h"
 #include "MCerPhotEvt.h"
-#include "MSigmabar.h"
+
+#include "MPedestalPix.h"
+#include "MPedestalCam.h"
 
 #include "MGGroupFrame.h" // MGGroupFrame
@@ -328 +333 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        const Int_t id = pix.GetPixId();
-
-        const Float_t  entry = pix.GetNumPhotons();
-        const Float_t  noise = pix.GetErrorPhot();
-
-        //
+        const Int_t idx = pix.GetPixId();
+
+        const Float_t entry = pix.GetNumPhotons();
+        const Float_t noise = (*fPed)[idx].GetSigma();
+
+        //
         // We calculate a correction factor which accounts for the 
         // fact that pixels have different size (see TDAS 02-14).
         //
-        const Double_t factor = TMath::Sqrt(fCam->GetPixRatio(id));
+        const Double_t factor = TMath::Sqrt(fCam->GetPixRatio(idx));
 
         // COBB: '<=' to skip entry=noise=0
@@ -485 +490 @@
     // get pixel id of this entry
     //
-    const Int_t id = pix.GetPixId();
+    const Int_t idx = pix.GetPixId();
 
     //
     // check the num of photons against the noise level
     //
-    const Float_t  entry = pix.GetNumPhotons();
-    const Float_t  noise = pix.GetErrorPhot();
+    const Float_t entry = pix.GetNumPhotons();
+    const Float_t noise = (*fPed)[idx].GetSigma();
 
     //
@@ -497 +502 @@
     // fact that pixels have different size (see TDAS 02-14).
     //
-    const Double_t factor = TMath::Sqrt(fCam->GetPixRatio(id));
+    const Double_t factor = TMath::Sqrt(fCam->GetPixRatio(idx));
 
     return (entry * factor <= fCleanLvl2 * noise);
@@ -653 +658 @@
     }
 
-    if (fCleaningMethod != kDemocratic)
-        return kTRUE;
-
-    fSgb = (MSigmabar*)pList->FindObject("MSigmabar");
-    if (!fSgb)
-    {
-        *fLog << dbginf << "MSigmabar not found... aborting." << endl;
-        return kFALSE;
+    if (fCleaningMethod == kDemocratic)
+    {
+        fSgb = (MSigmabar*)pList->FindObject("MSigmabar");
+        if (!fSgb)
+        {
+            *fLog << dbginf << "MSigmabar not found... aborting." << endl;
+            return kFALSE;
+        }
+    }
+    else
+    {
+        fPed = (MPedestalCam*)pList->FindObject("MPedestalCam");
+        if (!fPed)
+        {
+            *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
+            return kFALSE;
+        }
     }
 
@@ -674 +688 @@
     if (fSgb)
         fInnerNoise = fSgb->GetSigmabarInner();
-
+#ifdef DEBUG
+    *fLog << all << "CleanStep 1" << endl;
+#endif
     CleanStep1();
+#ifdef DEBUG
+    *fLog << all << "CleanStep 2" << endl;
+#endif
     CleanStep2();
+#ifdef DEBUG
+    *fLog << all << "CleanStep 3" << endl;
+#endif
     CleanStep3();
+#ifdef DEBUG
+    *fLog << all << "Done." << endl;
+#endif
 
     return kTRUE;