Changeset 2052 for trunk/MagicSoft/Mars/mimage

Timestamp:

05/02/03 08:56:31 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MImgCleanStd.cc (modified) (9 diffs)
• MImgCleanStd.h (modified) (1 diff)

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -285 +285 @@
 //
 MImgCleanStd::MImgCleanStd(const Float_t lvl1, const Float_t lvl2,
-                     const char *name, const char *title)
+                           const char *name, const char *title)
     : fSgb(NULL), fCleaningMethod(kStandard), fCleanLvl1(lvl1),
     fCleanLvl2(lvl2), fCleanRings(1)
@@ -324 +324 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        const Float_t entry = pix.GetNumPhotons();
-        const Float_t noise = pix.GetErrorPhot();
-
         const Int_t id = pix.GetPixId();
+
+        const Float_t  entry = pix.GetNumPhotons();
+        const Float_t  noise = pix.GetErrorPhot();
         const Double_t ratio = TMath::Sqrt(fCam->GetPixRatio(id));
 
         // COBB: '<=' to skip entry=noise=0
-        if (entry <= fCleanLvl1 * noise / ratio)
+        if (entry * ratio <= fCleanLvl1 * noise)
             pix.SetPixelUnused();
 
@@ -366 +366 @@
         MCerPhotPix &pix = (*fEvt)[i];
 
-        const Float_t entry = pix.GetNumPhotons();
-
         const Int_t id = pix.GetPixId();
 
+        const Float_t  entry = pix.GetNumPhotons();
         const Double_t ratio = fCam->GetPixRatio(id);
 
         // COBB: '<=' to skip entry=noise=0
-        if (entry <= fCleanLvl1 * fInnerNoise / ratio)
+        if (entry * ratio <= fCleanLvl1 * fInnerNoise)
             pix.SetPixelUnused();
 
@@ -451 +450 @@
             const Int_t id2 = gpix.GetNeighbor(j);
 
-            // when you find an used  neighbor, break the loop
+            // when you find an used neighbor, break the loop
             if (ispixused[id2] == 1)
             {
-                hasNeighbor = kTRUE ;
+                hasNeighbor = kTRUE;
                 break;
             }
@@ -460 +459 @@
         
         if (hasNeighbor == kFALSE)
-          pix.SetPixelUnused();
+            pix.SetPixelUnused();
     }
 
@@ -493 +492 @@
     // 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 = pix.GetErrorPhot();
     const Double_t ratio = TMath::Sqrt(fCam->GetPixRatio(id));
 
-    return (entry <= fCleanLvl2 * noise / ratio);
+    return (entry * ratio <= fCleanLvl2 * noise);
 }
 
@@ -517 +515 @@
     // check the num of photons against the noise level
     //
-    const Float_t entry = pix.GetNumPhotons();
-
+    const Float_t  entry = pix.GetNumPhotons();
     const Double_t ratio = fCam->GetPixRatio(id);
 
-    return (entry <= fCleanLvl2 * fInnerNoise / ratio);
+    return (entry * ratio <= fCleanLvl2 * fInnerNoise);
 }
 
@@ -583 +580 @@
 
         pix.SetRing(r);
-            break;
+        break;
     }
 }
@@ -819 +816 @@
     }
     out << ");" << endl;
-}
+
+    if (fCleaningMethod!=kDemocratic)
+        return;
+
+    out << "   " << GetUniqueName() << ".SetMethod(MImgCleanStd::kDemocratic);" << endl;
+
+    if (fCleanRings==1)
+        return;
+
+    out << "   " << GetUniqueName() << ".SetCleanRings(" << fCleanRings << ");" << endl;
+}

trunk/MagicSoft/Mars/mimage/MImgCleanStd.h

@@ -62 +62 @@
     UShort_t GetCleanRings() const { return fCleanRings;}
 
-    void SetCleanRings(UShort_t r) { fCleanRings=r; }
+    void SetCleanRings(UShort_t r) { if(r==0) r=1; fCleanRings=r; }
     void SetMethod(CleaningMethod_t m) { fCleaningMethod = m; }