Changeset 2488 for trunk/MagicSoft/Mars/mimage

Timestamp:

11/07/03 19:03:41 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MImgCleanStd.cc (modified) (8 diffs)
• MImgCleanStd.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -266 +266 @@
 #include "MParList.h"
 #include "MSigmabar.h"
+#include "MCameraData.h"
 
 #include "MGeomPix.h"
@@ -312 +313 @@
 // --------------------------------------------------------------------------
 //
-//  NT 28/04/2003: now the option to use the standard method or the 
+// The first step of cleaning defines the CORE pixels. All the other pixels
+// are set as UNUSED and belong to RING 0.
+// After this point, only the CORE pixels are set as USED, with RING
+// number 1.
+//
+//  NT 28/04/2003: now the option to use the standard method or the
 //  democratic method is implemented:
 //
-//  KStandard: This method looks for all pixels with an entry (photons)
-//             that is three times bigger than the noise of the pixel
-//             (default: 3 sigma, clean level 1)
-//
-// --------------------------------------------------------------------------
-//
-//  Returns the maximum Pixel Id (used for ispixused in CleanStep2)
-//
-void MImgCleanStd::CleanStep1Std()
+//  kStandard:   This method looks for all pixels with an entry (photons)
+//               that is three times bigger than the noise of the pixel
+//               (default: 3 sigma, clean level 1)
+//
+//  kDemocratic: this method looks for all pixels with an entry (photons)
+//               that is n times bigger than the noise of the mean of the
+//               inner pixels (default: 3 sigmabar, clean level 1)
+//
+//
+void MImgCleanStd::CleanStep1()
 {
     const Int_t entries = fEvt->GetNumPixels();
-
-    //
-    // check the number of all pixels against the noise level and
-    // set them to 'unused' state if necessary
-    // 
-
-    for (Int_t i=0; i<entries; i++ )
-    {
-        MCerPhotPix &pix = (*fEvt)[i];
-
-        const Int_t idx = pix.GetPixId();
-
-        const Float_t entry = pix.GetNumPhotons();
-        const Float_t noise = (*fPed)[idx].GetPedestalRms();
-
-        //
-        // We calculate a correction factor which accounts for the 
-        // fact that pixels have different size (see TDAS 02-14).
-        //
-        const Double_t factor = fCam->GetPixRatioSqrt(idx);
-
-        // COBB: '<=' to skip entry=noise=0
-        if (entry * factor <= fCleanLvl1 * noise)
-            pix.SetPixelUnused();
-    }
-}
-
-// --------------------------------------------------------------------------
-//
-//  NT 28/04/2003: now the option to use the standard method or the 
-//  democratic method is implemented:
-//
-//  "KDemocratic": this method looks for all pixels with an entry (photons)
-//                 that is n times bigger than the noise of the mean of the 
-//                 inner pixels (default: 3 sigmabar, clean level 1)
-//
-//  Returns the maximum Pixel Id (used for ispixused in CleanStep2)
-//
-void MImgCleanStd::CleanStep1Dem()
-{
-    const Int_t entries = fEvt->GetNumPixels();
+    const TArrayD &data = fData->GetData();
 
     //
@@ -376 +343 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        const Int_t idx = pix.GetPixId();
-
-        const Float_t  entry = pix.GetNumPhotons();
-        const Double_t ratio = fCam->GetPixRatio(idx);
-
-        // COBB: '<=' to skip entry=noise=0
-        if (entry * ratio <= fCleanLvl1 * fInnerNoise)
+        if (data[pix.GetPixId()] <= fCleanLvl1)
             pix.SetPixelUnused();
-    }
-}
-
-// --------------------------------------------------------------------------
-// The first step of cleaning defines the CORE pixels. All the other pixels 
-// are set as UNUSED and belong to RING 0.                
-// After this point, only the CORE pixels are set as USED, with RING      
-// number 1.                                                              
-// Returns the maximum Pixel Id (used for ispixused in CleanStep2)
-//
-void MImgCleanStd::CleanStep1()
-{
-   switch (fCleaningMethod)
-    {
-    case kStandard:
-        CleanStep1Std();
-        return;
-    case kDemocratic:
-        CleanStep1Dem();
-        return;
     }
 }
@@ -487 +428 @@
 } 
 
-
-// --------------------------------------------------------------------------
-//
-//   Look for the boundary pixels around the core pixels
-//   if a pixel has more than 2.5 (clean level 2.5) sigma, and
-//   a core neigbor it is declared as used.
-//
-Bool_t MImgCleanStd::CleanStep3Std(const MCerPhotPix &pix)
-{
-    //
-    // get pixel id of this entry
-    //
-    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 = (*fPed)[idx].GetPedestalRms();
-
-    //
-    // We calculate a correction factor which accounts for the 
-    // fact that pixels have different size (see TDAS 02-14).
-    //
-    const Double_t factor = fCam->GetPixRatioSqrt(idx);
-
-    return (entry * factor <= fCleanLvl2 * noise);
-}
-
-// --------------------------------------------------------------------------
-//
-//   Look for the boundary pixels around the core pixels
-//   if a pixel has more than 2.5 (clean level 2.5) sigmabar and
-//   a core neighbor, it is declared as used.
-//
-Bool_t MImgCleanStd::CleanStep3Dem(const MCerPhotPix &pix)
-{
-    //
-    // get pixel id of this entry
-    //
-    const Int_t idx = pix.GetPixId();
-
-    //
-    // check the num of photons against the noise level
-    //
-    const Float_t  entry = pix.GetNumPhotons();
-    const Double_t ratio = fCam->GetPixRatio(idx);
-
-    return (entry * ratio <= fCleanLvl2 * fInnerNoise);
-}
-
 void MImgCleanStd::CleanStep3b(MCerPhotPix &pix)
 {
@@ -598 +488 @@
 // --------------------------------------------------------------------------
 //
-//   Look for the boundary pixels around the core pixels
-//   if a pixel has more than 2.5 (clean level 2.5) sigma, and
-//   a core neigbor, it is declared as used.
+//  Look for the boundary pixels around the core pixels
+//  if a pixel has more than 2.5 (clean level 2.5) sigma, and
+//  a core neigbor, it is declared as used.
 //
 void MImgCleanStd::CleanStep3()
 {
     const Int_t entries = fEvt->GetNumPixels();
+    const TArrayD &data = fData->GetData();
 
     for (UShort_t r=1; r<fCleanRings+1; r++)
@@ -621 +512 @@
                 continue;
 
-            switch (fCleaningMethod)
-            {
-            case kStandard:
-                if (CleanStep3Std(pix))
-                    continue;
-                break;
-            case kDemocratic:
-                if (CleanStep3Dem(pix))
-                    continue;
-                break;
-            }
+            if (data[pix.GetPixId()] <= fCleanLvl2)
+                continue;
 
             if (r==1)
@@ -681 +563 @@
     }
 
+    fData = (MCameraData*)pList->FindCreateObj(AddSerialNumber("MCameraData"));
+    if (!fData)
+        return kFALSE;
+
     return kTRUE;
 }
@@ -691 +577 @@
 {
     if (fSgb)
-        fInnerNoise = fSgb->GetSigmabarInner();
+        fData->Calc(*fEvt, *fSgb, *fCam);
+    else
+        fData->Calc(*fEvt, *fPed, *fCam);
+
 #ifdef DEBUG
     *fLog << all << "CleanStep 1" << endl;

trunk/MagicSoft/Mars/mimage/MImgCleanStd.h

@@ -11 +11 @@
 class MCerPhotEvt;
 class MPedestalCam;
+class MCameraData;
 
 class MGGroupFrame;
@@ -27 +28 @@
           MSigmabar    *fSgb;  //!
           MPedestalCam *fPed;  //!
+          MCameraData  *fData; //!
 
     CleaningMethod_t fCleaningMethod;
@@ -40 +42 @@
     void StreamPrimitive(ofstream &out) const;
 
-    void   CleanStep1Dem();
-    void   CleanStep1Std();
-    Bool_t CleanStep3Dem(const MCerPhotPix &pix);
-    Bool_t CleanStep3Std(const MCerPhotPix &pix);
     void   CleanStep3b(MCerPhotPix &pix);
     void   CleanStep4(UShort_t r, MCerPhotPix &pix);