Changeset 3415 for trunk/MagicSoft/Mars/mimage

Timestamp:

03/05/04 21:29:08 (21 years ago)

Author:

tonello

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -340 +340 @@
     MCerPhotEvtIter Next(fEvt, kFALSE);
     while ((pix=static_cast<MCerPhotPix*>(Next())))
-        if (data[pix->GetPixId()] <= fCleanLvl1)
+        if (!pix->IsPixelUnmapped() && data[pix->GetPixId()] <= fCleanLvl1)
             pix->SetPixelUnused();
 }
@@ -356 +356 @@
     // 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();
@@ -387 +388 @@
     // now we declare all pixels that survive as CorePixels
     //
+
     Next.Reset();
     while ((pix=static_cast<MCerPhotPix*>(Next())))
-        pix->SetPixelCore();
+      {
+        if ( pix->IsPixelUsed())
+        pix->SetPixelCore();}
 } 
 
@@ -430 +434 @@
     //
     if (pix.GetRing() != 0)
-        return;
+      {  
+        return;
+      }
 
     //
@@ -471 +477 @@
 
         // Loop over all pixels
+
         MCerPhotEvtIter NextAll(fEvt, kFALSE);
         while ((pix=static_cast<MCerPhotPix*>(NextAll())))
-        {
+          {
             //
-            // if pixel is a core pixel go to the next pixel
+            // if pixel is a core pixel or unmapped, go to the next pixel
             //
-            if (pix->IsPixelCore())
-                continue;
-
-            if (data[pix->GetPixId()] <= fCleanLvl2)
-                continue;
-
-            if (r==1)
-                CleanStep3b(*pix);
-            else
-                CleanStep4(r, *pix);
+          if (pix->IsPixelCore())
+            {
+            continue;}
+          if (pix->IsPixelUnmapped())
+            {
+            continue;}
+          
+          if (data[pix->GetPixId()] <= fCleanLvl2)
+            {
+              continue;}
+
+          if (r==1)
+            {
+            CleanStep3b(*pix);}
+          else
+            {
+            CleanStep4(r, *pix);}
+          
         }
     }
@@ -553 +568 @@
 #endif
     CleanStep1();
+
 #ifdef DEBUG
     *fLog << all << "CleanStep 2" << endl;