Changeset 5170 for trunk/MagicSoft

Timestamp:

10/05/04 08:44:08 (20 years ago)

Author:

aliu

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/library

Files:

• MControlPlots.cc (modified) (4 diffs)
• MControlPlots.h (modified) (1 diff)
• MImgIsland.cc (added)
• MImgIsland.h (added)
• MIslands.cc (deleted)
• MIslands.h (deleted)
• MIslandsCalc.cc (added)
• MIslandsCalc.h (added)
• MIslandsClean.cc (added)
• MIslandsClean.h (added)

trunk/MagicSoft/Mars/mtemp/mifae/library/MControlPlots.cc

@@ -36 +36 @@
 #include "MControlPlots.h"
 #include "MIslands.h"
+#include "MImgIsland.h"
 #include "MHCamera.h"
 #include "MGeomCamMagic.h"
@@ -93 +94 @@
   else
     fCameraHisto[fMode] = new MHCamera(*fGeomCam,"Survive","Pixels surviving Image Cleaning");
-
   return kTRUE;
 }
@@ -101 +101 @@
 //
 Int_t MControlPlots::Process()
-{  
+{ 
   if(!fIslands) return kTRUE;
 
-  for (UInt_t i=0;i<fGeomCam->GetNumPixels();i++)
+  MImgIsland *imgIsl = new MImgIsland;
+  TIter Next(fIslands->GetList());
+  
+  Int_t pixNum = 0;  
+  Int_t idPix = -1;
+  
+  while ((imgIsl=(MImgIsland*)Next())) {
+
+    pixNum = imgIsl->GetPixNum();
+    
+    for(Int_t k = 0; k<pixNum; k++)
+      {
+        idPix = imgIsl->GetPixList(k);
+        fCameraHisto[fMode]->Fill(idPix,1);
+        fCameraHisto[fMode]->SetUsed(idPix);
+      }
+  }
+
+  /*  for (UInt_t i=0;i<fGeomCam->GetNumPixels();i++)
     {
       //      cout << fIslands->GetIslId(i) << " ";
@@ -112 +130 @@
           fCameraHisto[fMode]->SetUsed(i);
         }
-    }
+        }*/
+
   //  cout << endl;
   return kTRUE;

trunk/MagicSoft/Mars/mtemp/mifae/library/MControlPlots.h

@@ -8 +8 @@
 class TString;
 class MIslands;
+class MImgIsland;
 class MGeomCam;
 class MHCamera;