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

Timestamp:

03/18/05 17:21:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -61 +61 @@
 //
 // When an event is read, before the image cleaning, all the pixels that
-// are in MCerPhotEvt are set as USED and NOT CORE. All the pixels belong
+// are in MSignalCam are set as USED and NOT CORE. All the pixels belong
 // to RING number 1 (like USED pixels).
-// Look at MCerPhotPix.h to see how these informations of the pixel are
+// Look at MSignalPix.h to see how these informations of the pixel are
 // stored.
 // The default  cleaning METHOD is the STANDARD one and the number of the
@@ -84 +84 @@
 // This avoids problems of deformations of the shower images.
 // The signal S_i and the pedestal RMS Prms_i of the pixel are called from
-// the object MCerPhotPix.
+// the object MSignalPix.
 // If (default method = kStandard)
 //Begin_Html
@@ -281 +281 @@
 //   MGeomCam
 //   MPedPhotCam
-//   MCerPhotEvt
+//   MSignalCam
 //
 //  Output Containers:
-//   MCerPhotEvt
+//   MSignalCam
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -307 +307 @@
 #include "MGeomCam.h"
 
-#include "MCerPhotPix.h"
-#include "MCerPhotEvt.h"
+#include "MSignalPix.h"
+#include "MSignalCam.h"
 
 #include "MGGroupFrame.h" // MGGroupFrame
@@ -325 +325 @@
 
 const TString MImgCleanStd::gsNamePedPhotCam="MPedPhotCam"; // default name of the 'MPedPhotCam' container
-const TString MImgCleanStd::gsNameCerPhotEvt="MCerPhotEvt"; // default name of the 'MCerPhotEvt' container
+const TString MImgCleanStd::gsNameSignalCam ="MSignalCam"; // default name of the 'MSignalCam' container
 const TString MImgCleanStd::gsNameGeomCam   ="MGeomCam";    // default name of the 'MGeomCam' container
 
@@ -341 +341 @@
     fCleanLvl2(lvl2), fCleanRings(1), fKeepSinglePixels(kFALSE),
     fNamePedPhotCam(gsNamePedPhotCam), fNameGeomCam(gsNameGeomCam),
-    fNameCerPhotEvt(gsNameCerPhotEvt)
+    fNameSignalCam(gsNameSignalCam)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -374 +374 @@
     // set them to 'unused' state if necessary
     //
-    MCerPhotPix *pix;
-
-    // Loop over all pixels
-    MCerPhotEvtIter Next(fEvt, kFALSE);
-    while ((pix=static_cast<MCerPhotPix*>(Next())))
-        if (!pix->IsPixelUnmapped() && data[pix->GetPixId()] <= fCleanLvl1)
-            pix->SetPixelUnused();
+    const UInt_t npixevt = fEvt->GetNumPixels();
+    for (UInt_t idx=0; idx<npixevt; idx++)
+    {
+        if (data[idx]>fCleanLvl1)
+            continue;
+
+        MSignalPix &pix = (*fEvt)[idx];
+        if (!pix.IsPixelUnmapped())
+            pix.SetPixelUnused();
+    }
 }
 
@@ -395 +398 @@
     size = 0;
 
-    MCerPhotPix *pix;
-
-    // Loop over used pixels only
-    TIter Next(*fEvt);
-
-    while ((pix=static_cast<MCerPhotPix*>(Next())))
-    {
-        // get pixel id of this entry
-        const Int_t idx = pix->GetPixId();
+    const UInt_t npixevt = fEvt->GetNumPixels();
+    for (UInt_t idx=0; idx<npixevt; idx++)
+    {
+        MSignalPix &pix = (*fEvt)[idx];
+        if (!pix.IsPixelUsed())
+            continue;
  
         // check for 'used' neighbors of this pixel
@@ -427 +427 @@
         {
             if (!fKeepSinglePixels)
-                pix->SetPixelUnused();
-            size += pix->GetNumPhotons();
+                pix.SetPixelUnused();
+            size += pix.GetNumPhotons();
             n++;
         }
     }
 
-    Next.Reset();
-    while ((pix=static_cast<MCerPhotPix*>(Next())))
-    {
-        if (pix->IsPixelUsed())
-            pix->SetPixelCore();
+    for (UInt_t idx=0; idx<npixevt; idx++)
+    {
+        MSignalPix &pix = (*fEvt)[idx];
+        if (pix.IsPixelUsed())
+            pix.SetPixelCore();
     }
 
@@ -443 +443 @@
 } 
 
-void MImgCleanStd::CleanStep3b(MCerPhotPix &pix)
-{
-    const Int_t idx = pix.GetPixId();
+void MImgCleanStd::CleanStep3b(Int_t idx)
+{
+    MSignalPix &pix = (*fEvt)[idx];
 
     //
@@ -475 +475 @@
 //   If a value<2 for fCleanRings is used, no CleanStep4 is done.
 //
-void MImgCleanStd::CleanStep4(UShort_t r, MCerPhotPix &pix)
-{
+void MImgCleanStd::CleanStep4(UShort_t r, Int_t idx/*MSignalPix &pix*/)
+{
+    MSignalPix &pix = (*fEvt)[idx];
+
     //
     // Skip events that have already a defined status;
@@ -488 +490 @@
     // and tell to which ring it belongs to.
     //
-    const Int_t idx = pix.GetPixId();
-
     MGeomPix  &gpix  = (*fCam)[idx];
 
@@ -498 +498 @@
         const Int_t idx2 = gpix.GetNeighbor(j);
 
-        MCerPhotPix *npix = fEvt->GetPixById(idx2);
+        MSignalPix *npix = fEvt->GetPixById(idx2);
         if (!npix || !npix->IsPixelUsed() || npix->GetRing()>r-1 ) 
             continue;
@@ -519 +519 @@
     for (UShort_t r=1; r<fCleanRings+1; r++)
     {
-        MCerPhotPix *pix;
-
         // Loop over all pixels
-
-        MCerPhotEvtIter NextAll(fEvt, kFALSE);
-        while ((pix=static_cast<MCerPhotPix*>(NextAll())))
+        const UInt_t npixevt = fEvt->GetNumPixels();
+        for (UInt_t idx=0; idx<npixevt; idx++)
         {
+            MSignalPix &pix = (*fEvt)[idx];
+
             //
             // if pixel is a core pixel or unmapped, go to the next pixel
             //
-            if (pix->IsPixelCore() || pix->IsPixelUnmapped())
+            if (pix.IsPixelCore() || pix.IsPixelUnmapped())
                 continue;
 
-            if (data[pix->GetPixId()] <= fCleanLvl2)
+            if (data[idx] <= fCleanLvl2)
                 continue;
 
             if (r==1)
-                CleanStep3b(*pix);
+                CleanStep3b(idx);
             else
-                CleanStep4(r, *pix);
+                CleanStep4(r, idx);
         }
     }
@@ -557 +556 @@
     }
 
-    fEvt = (MCerPhotEvt*)pList->FindObject(AddSerialNumber(fNameCerPhotEvt), "MCerPhotEvt");
+    fEvt = (MSignalCam*)pList->FindObject(AddSerialNumber(fNameSignalCam), "MSignalCam");
     if (!fEvt)
     {
-        *fLog << err << fNameCerPhotEvt << " [MCerPhotEvt] not found... aborting." << endl;
+        *fLog << err << fNameSignalCam << " [MSignalCam] not found... aborting." << endl;
         return kFALSE;
     }
@@ -570 +569 @@
         return kFALSE;
     }
-
-    fTime = (MArrivalTime*)pList->FindObject(AddSerialNumber("MArrivalTime"));
-    if (!fTime && fCleaningMethod==kProbability)
-        *fLog << warn << "MArrivalTime not found... probability cleaning done with signal only!" << endl;
 
     fData = (MCameraData*)pList->FindCreateObj(AddSerialNumber("MCameraData"));
@@ -602 +597 @@
         break;
     case kProbability:
-        fData->CalcCleaningProbability(*fEvt, *fPed, *fCam, fTime);
+        fData->CalcCleaningProbability(*fEvt, *fPed, *fCam);
         break;
     case kAbsolute:
@@ -819 +814 @@
     if (gsNameGeomCam!=fNameGeomCam)
         out << "   " << GetUniqueName() << ".SetNameGeomCam(\"" << fNameGeomCam << "\");" << endl;
-    if (gsNameCerPhotEvt!=fNameCerPhotEvt)
-        out << "   " << GetUniqueName() << ".SetNameCerPhotEvt(\"" << fNameCerPhotEvt << "\");" << endl;
+    if (gsNameSignalCam!=fNameSignalCam)
+        out << "   " << GetUniqueName() << ".SetNameSignalCam(\"" << fNameSignalCam << "\");" << endl;
     if (fKeepSinglePixels)
         out << "   " << GetUniqueName() << ".SetKeepSinglePixels();" << endl;