Changeset 4141

Timestamp:

05/24/04 13:46:40 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• library/MHillasDisplay.cc (modified) (4 diffs)
• library/MHillasDisplay.h (modified) (1 diff)
• programs/makeHillas.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -20 +20 @@
 
  2004/05/24 Javier Rico
-   * library/MDisplay.[h,cc], library/MHillasDisplay.[h,cc]
-     programs/makeHillas.cc, programs/makehillas.datacard
+   * library/MDisplay.[h,cc], programs/makeHillas.cc, 
+     programs/makehillas.datacard
      - Add possibility to save a ps file
      - Update documentation
         
-   * library/MHillasDisplay     
+   * library/MHillasDisplay[h.cc]
      - correct minor axis paint
+     - include MNewImagePar dumping
+     - update documentation
         
  2004/05/21 Oscar Blanch

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

@@ -56 +56 @@
 #include "MGeomCam.h"
 #include "MHillas.h"
+#include "MNewImagePar.h"
 #include "MSrcPosCam.h"
 
@@ -71 +72 @@
 //
 MHillasDisplay::MHillasDisplay(MCerPhotEvt* event, MGeomCam* geom, Int_t type, const char* name, const char* title) 
-  :  MDisplay(event,geom,type), fHillas(NULL), fSrcPos(NULL)
+  :  MDisplay(event,geom,type), fHillas(NULL), fNewImage(NULL), fSrcPos(NULL)
 {
   fName  = name  ? name  : gsDefName.Data();
@@ -97 +98 @@
     }
 
+  // Look for the MNewImagePar container  
+  if(!fNewImage)
+    fNewImage = (MNewImagePar*)pList->FindObject(AddSerialNumber("MNewImagePar"), "MNewImagePar");
+  if(!fNewImage)
+    *fLog << warn << "MHillasDisplay::PreProcess Warning: MNewImagePar object not found" << endl;
+
   // Look for the MHillas container  
   if(!fSrcPos)
@@ -114 +121 @@
   if(fHillas && GetPauseMode())
     fHillas->Print();
+  if(fNewImage && GetPauseMode())
+    fNewImage->Print();
+      
    
   // draw the event

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

@@ -10 +10 @@
 class MGeomCam;
 class MHillas;
+class MNewImagePar;
 
 class MHillasDisplay : public MDisplay
 {
  private:
-  MHillas* fHillas;    // pointer to container with the hillas parameters
-  MSrcPosCam* fSrcPos; // pointer to the source position in camera
+  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
 
   virtual Int_t PreProcess(MParList *plist);

trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

@@ -31 +31 @@
 #include "MPedPhotCalc.h"
 #include "MHillas.h"
+#include "MNewImagePar.h"
 #include "MRawRunHeader.h"
 #include "MSrcPosCam.h"
@@ -227 +228 @@
   // containers 
   MHillas       hillas;
+  MNewImagePar  newimagepar;
   MSrcPosCam    source;
   MRawRunHeader runhead;
@@ -259 +261 @@
   plist4.AddToList(&source);
   plist4.AddToList(&hillas);
+  plist4.AddToList(&newimagepar);
   plist4.AddToList(&runhead);