Changeset 4528 for trunk/MagicSoft/Mars/mtemp/mifae

Timestamp:

08/06/04 16:26:35 (20 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• library/MDisplay.cc (modified) (1 diff)
• library/MHillasDisplay.cc (modified) (4 diffs)
• library/MHillasDisplay.h (modified) (2 diffs)
• library/MIslands.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/08/04 Javier Rico
+    * library/MIslands.[cc]
+     - Correct tiny compilation error
+    
+    * library/MDisplay.cc, library/MHillasDisplay.[h,cc]
+     - Print hillas source position dependent stuff
 
  2004/08/03 Ester Aliu Fusté

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

@@ -123 +123 @@
 
   // update the display contents
-  fDisplay->SetCamContent(*fCamEvent);
+  fDisplay->SetCamContent(*fCamEvent,fDisplayType);
   fCanvas->GetPad(1)->Modified();
   fCanvas->GetPad(1)->Update();

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

@@ -57 +57 @@
 #include "MGeomCam.h"
 #include "MHillas.h"
+#include "MHillasSrc.h"
 #include "MNewImagePar.h"
 #include "MSrcPosCam.h"
@@ -73 +74 @@
 //
 MHillasDisplay::MHillasDisplay(MCerPhotEvt* event, MGeomCam* geom, Int_t type, const char* name, const char* title) 
-  :  MDisplay(event,geom,type), fHillas(NULL), fNewImage(NULL), fSrcPos(NULL), fIslands(NULL)
+  :  MDisplay(event,geom,type), fHillas(NULL), fHillasSrc(NULL), fNewImage(NULL), fSrcPos(NULL), fIslands(NULL)
 {
   fName  = name  ? name  : gsDefName.Data();
@@ -99 +100 @@
     }
 
+  // Look for src dependent hillas parameters container
+  if(!fHillasSrc)
+    fHillasSrc = (MHillasSrc*)pList->FindObject(AddSerialNumber("MHillasSrc"), "MHillasSrc");
+
+
   // Look for the MNewImagePar container  
   if(!fNewImage)
@@ -133 +139 @@
       if(fHillas)
         fHillas->Print();
+      if(fHillasSrc)
+        fHillasSrc->Print();
       if(fNewImage)
         fNewImage->Print();

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

@@ -10 +10 @@
 class MGeomCam;
 class MHillas;
+class MHillasSrc;
 class MIslands;
 class MNewImagePar;
@@ -17 +18 @@
  private:
   MHillas*      fHillas;    // pointer to container with the hillas parameters
+  MHillasSrc*   fHillasSrc; // pointer to container with source dependent hillas parameters
   MNewImagePar* fNewImage;  // pointer to container with the new image parameters
   MSrcPosCam*   fSrcPos;    // pointer to the source position in camera

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

@@ -59 +59 @@
 // Print the island parameters to *fLog
 //
-void MIslands::Print(Option_t *opt=NULL) const
+void MIslands::Print(Option_t *opt) const
 {
     *fLog << all;