Changeset 5879 for trunk/MagicSoft/Mars/mtemp/mifae/library

Timestamp:

01/18/05 10:53:10 (20 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/library

Files:

• MControlPlots.cc (modified) (9 diffs)
• MControlPlots.h (modified) (2 diffs)
• MIslands.cc (modified) (2 diffs)

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

@@ -63 +63 @@
     fCameraHisto[kOn] = NULL;
     fCameraHisto[kOff] = NULL;
+
 }
 // -------------------------------------------------------------------------
@@ -70 +71 @@
 MControlPlots::~MControlPlots()
 {
-  if(fGeomCam)
-    delete fGeomCam;
+  Clear();
 
   if(fCameraHisto[kOn])
@@ -79 +79 @@
 }
 
+void MControlPlots::Clear(const Option_t *o)
+{
+
+  if(fGeomCam)
+    delete fGeomCam;
+
+  fGeomCam = NULL;
+}
+
 
 // -------------------------------------------------------------------------
@@ -86 +95 @@
 Int_t MControlPlots::PreProcess(MParList* pList)
 { 
+
+  Reset();
+
   // FIXME! only valid for Magic geometry for the time being!
   fGeomCam = new MGeomCamMagic;
@@ -94 +106 @@
     *fLog << warn << AddSerialNumber("MIslands") << " [MIslands] not found... Some control plots will not be produced" << endl;
   else
-    fCameraHisto[fMode] = new MHCamera(*fGeomCam,"Survive","Pixels surviving Image Cleaning");
+    {  
+      if (fCameraHisto[fMode])
+        {
+          *fLog << err << GetDescriptor() 
+                << "Camera with mode " << fMode << " already existing " << endl;
+          return kFALSE;
+        }
+      TString name = "";
+      switch (fMode)
+        {
+        case kOn:
+          name += "On";
+          break;
+        case kOff:
+          name += "Off";
+          break;
+        }
+      fCameraHisto[fMode] = new MHCamera(*fGeomCam,
+                                         name.Data(),
+                                         "Pixels surviving Image Cleaning");
+    }
   return kTRUE;
 }
@@ -105 +137 @@
   if(!fIslands) return kTRUE;
 
-  MImgIsland *imgIsl = new MImgIsland;
+  MImgIsland *imgIsl = NULL;
   TIter Next(fIslands->GetList());
   
@@ -111 +143 @@
   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);
-      }
-  }
+  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++)
@@ -142 +174 @@
 Int_t MControlPlots::PostProcess()
 {
-  fCameraHisto[fMode]->SetEntries(fGeomCam->GetNumPixels());
-
   if(!fProduceFile) return kTRUE;
   if(fProduceFile && !fFileName.Length())
@@ -165 +195 @@
   if(fCameraHisto[kOn] && fCameraHisto[kOff])
     {      
-      diff = new MHCamera(*fGeomCam,"Diff","Pixels surviving Image Cleaning");
+      diff = new MHCamera(*fGeomCam,"Diff","Difference of pixels surviving Image Cleaning");
 
       // Normalize Off to On

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

@@ -15 +15 @@
 {
  public:
-  enum OnOffMode_t {kOn=0,kOff};
+  enum OnOffMode_t {kOn=0,kOff=1};
   
  private:
@@ -34 +34 @@
   virtual ~MControlPlots();
 
+  void Reset() { Clear(); }
+  void Clear(const Option_t *o="");
+
   void SetFilename(TString fname)           {fFileName=fname;}
   void SetMode(OnOffMode_t mode)            {fMode=mode;}

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

@@ -24 +24 @@
 
     fIslands = new TList;
-    
+    fIslands->SetOwner();    
 }
 
@@ -33 +33 @@
 MIslands::~MIslands()
 {
-   fIslands->SetOwner();
    fIslands->Delete();
 }