Changeset 4202

Timestamp:

05/26/04 19:02:26 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• library/MHillasDisplay.cc (modified) (5 diffs)
• library/MHillasDisplay.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+        
+ 2004/05/24 Javier Rico
+   * library/MHillasDisplay.[h,cc]
+     - Call for MIslands::Print() in the process if any MIslands is 
+       found
+        
  2004/05/24 Javier Rico
    * library/MDisplay.[h,cc], programs/makeHillas.cc, 

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

@@ -36 +36 @@
 //  MHillas
 //  [MSrcPosCam]
+//  [MIslands]
 //
 // Output containers
@@ -58 +59 @@
 #include "MNewImagePar.h"
 #include "MSrcPosCam.h"
-
+#include "MIslands.h"
 
 ClassImp(MHillasDisplay);
@@ -104 +105 @@
     *fLog << warn << "MHillasDisplay::PreProcess Warning: MNewImagePar object not found" << endl;
 
-  // Look for the MHillas container  
+  // Look for the MSrcPosCam container  
   if(!fSrcPos)
     fSrcPos = (MSrcPosCam*)pList->FindObject(AddSerialNumber("MSrcPosCam"), "MSrcPosCam");
@@ -110 +111 @@
     *fLog << warn << "MHillasDisplay::PreProcess Warning: MSrcPosCam object not found" << endl;
 
+  // Look for the MIslands container  
+  if(!fIslands)
+    fIslands = (MIslands*)pList->FindObject(AddSerialNumber("MIslands"), "MIslands");
+  if(!fIslands)
+    *fLog << warn << "MHillasDisplay::PreProcess Warning: MIslands object not found" << endl;
+
   return kTRUE;
 }
@@ -119 +126 @@
 {
    // draw the hillas parameters
-  if(fHillas && GetPauseMode())
-    fHillas->Print();
-  if(fNewImage && GetPauseMode())
-    fNewImage->Print();
-      
+  if(GetPauseMode())
+    {
+      if(fHillas)
+        fHillas->Print();
+      if(fNewImage)
+        fNewImage->Print();
+      if(fIslands)
+        fIslands->Print();
+    }      
    
   // draw the event

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

@@ -10 +10 @@
 class MGeomCam;
 class MHillas;
+class MIslands;
 class MNewImagePar;
 
@@ -17 +18 @@
   MHillas*      fHillas;    // pointer to container with the hillas parameters
   MNewImagePar* fNewImage;  // pointer to container with the new image parameters
-  MSrcPosCam*   fSrcPos;     // pointer to the source position in camera
+  MSrcPosCam*   fSrcPos;    // pointer to the source position in camera
+  MIslands*     fIslands;   // pointer to the islands
 
   virtual Int_t PreProcess(MParList *plist);
@@ -28 +30 @@
   virtual ~MHillasDisplay(){};
 
-  void SetHillas(MHillas* hillas) {fHillas=hillas;}
+  void SetHillas(MHillas* hillas)    {fHillas=hillas;}
   void SetSrcPos(MSrcPosCam* srcpos) {fSrcPos=srcpos;}
+  void SetIslands(MIslands* islands) {fIslands=islands;}
 
   virtual void Paint(Option_t* option);