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

Timestamp:

02/15/05 16:18:28 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -339 +339 @@
                            const char *name, const char *title)
     : fCleaningMethod(kStandard), fCleanLvl1(lvl1),
-    fCleanLvl2(lvl2), fCleanRings(1), fNamePedPhotCam(gsNamePedPhotCam),
-    fNameGeomCam(gsNameGeomCam), fNameCerPhotEvt(gsNameCerPhotEvt)
-
+    fCleanLvl2(lvl2), fCleanRings(1), fKeepSinglePixels(kFALSE),
+    fNamePedPhotCam(gsNamePedPhotCam), fNameGeomCam(gsNameGeomCam),
+    fNameCerPhotEvt(gsNameCerPhotEvt)
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -386 +386 @@
 //
 //  Check if the survived pixel have a neighbor, that also
-//  survived, otherwise set pixel to unused (removes pixels without
-//  neighbors).
-//
-void MImgCleanStd::CleanStep2()
-{
+//  survived. Set all single pixels Unused if !fKeepSinglePixels. Now we
+//  declare all pixels that survived previous CleanSteps as CorePixels.
+//  Return number of single pixels, and there cumulative size in size.
+//
+Short_t MImgCleanStd::CleanStep2(Float_t &size)
+{
+    Short_t n=0;
+    size = 0;
+
     MCerPhotPix *pix;
 
@@ -420 +424 @@
         }
 
-        if (hasNeighbor == kFALSE)
-            pix->SetPixelUnused();
-    }
-
-    //
-    // now we declare all pixels that survive as CorePixels
-    //
+        if (hasNeighbor == kFALSE)
+        {
+            if (!fKeepSinglePixels)
+                pix->SetPixelUnused();
+            size += pix->GetNumPhotons();
+            n++;
+        }
+    }
 
     Next.Reset();
@@ -434 +439 @@
             pix->SetPixelCore();
     }
+
+    return n;
 } 
 
@@ -613 +620 @@
     *fLog << all << "CleanStep 2" << endl;
 #endif
-    CleanStep2();
+    Float_t size;
+    const Short_t n = CleanStep2(size);
+    fEvt->SetSinglePixels(n, size);
 
     // For speed reasons skip the rest of the cleaning if no
@@ -812 +821 @@
     if (gsNameCerPhotEvt!=fNameCerPhotEvt)
         out << "   " << GetUniqueName() << ".SetNameCerPhotEvt(\"" << fNameCerPhotEvt << "\");" << endl;
+    if (fKeepSinglePixels)
+        out << "   " << GetUniqueName() << ".SetKeepSinglePixels();" << endl;
+
 }
 
@@ -821 +833 @@
 //   MImgCleanStd.CleanMethod: Standard, Scaled, Democratic, Probability, Absolute
 //   MImgCleanStd.CleanRings:  1
+//   MImgCleanStd.KeepSinglePixels: yes, no
 //
 Int_t MImgCleanStd::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
@@ -839 +852 @@
         rc = kTRUE;
         fCleanLvl2 = GetEnvValue(env, prefix, "CleanLevel2", fCleanLvl2);
+    }
+    if (IsEnvDefined(env, prefix, "KeepSinglePixels", print))
+    {
+        rc = kTRUE;
+        fKeepSinglePixels = GetEnvValue(env, prefix, "KeepSinglePixels", fKeepSinglePixels);
     }