Changeset 2005 for trunk/MagicSoft/Mars

Timestamp:

04/24/03 14:31:12 (22 years ago)

Author:

stamerra

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMcTriggerLvl2.cc (modified) (8 diffs)
• MMcTriggerLvl2.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.cc

@@ -49 +49 @@
 #include "MGeomCamMagic.h"
 #include "MCamDisplay.h"
-
-#include "MCluster.h"
 
 #include "MMcTrig.hxx"
@@ -260 +258 @@
 {
 
-  // MCluster temp;
-  //MCluster &clust = (temp).FindCluster();
-  //  temp=*clust;
-
-  // Reads the number of NN that define a compact pixel
-
   // Find the Lut and cell with the higher LutPseudoSize. 
   int lutcell = CalcBiggerLutPseudoSize(); 
@@ -275 +267 @@
 
   fSizeBiggerCell = GetCellNumberFired(CalcBiggerFiredCell());
- 
+
 }
 
@@ -347 +339 @@
     }
 
-  //fCam->Draw(); 
-  //fCam->Reset();
-
   //
   // Set the array of colors for each pixel (that will be painted after 
@@ -358 +347 @@
   for(int i=0; i<577; i++)
     {
-      color = (fMcTrig->IsPixelFired(i,0)) ? 5 : 3;
+      color = (fMcTrig->IsPixelFired(i,0)) ? 1 : 2;
       fCam->SetPix( i, color, 1, 5 );
     }
@@ -709 +698 @@
 void MMcTriggerLvl2::CalcPseudoSize()
 {
-      *fLog <<" In CalcPseudoSize  ";
+  // Fill the fCompactPixel array with the compact pixels
   CalcCompactPixels(fGeomCam);
 
@@ -727 +716 @@
       int pixcell =gsPixelsInLut[maxlut][pixlut];
       startpix = gsPixelsInCell[pixcell][maxcell]-1;
+      *fLog << "pix, compact:" << startpix << "@"<<fCompactPixel[startpix];
       if (fCompactPixel[startpix]) // a starting pixel was found
         break;
@@ -815 +805 @@
           
           fCompactPixel[pixid]=1; // pixel is compact
+
+          *fLog << ","<<pixid;
+
           break;
         }      

trunk/MagicSoft/Mars/manalysis/MMcTriggerLvl2.h

@@ -13 +13 @@
 class MGeomCam;
 class MGeomPix;
-
-class MCluster;
 
 class MMcTriggerLvl2 : public MParContainer