Changeset 4761

Timestamp:

08/27/04 15:18:46 (20 years ago)

Author:

rico

Message:

Changelog

Location:

trunk/MagicSoft/Mars/mtemp/mifae/library

Files:

• MDisplay.cc (modified) (4 diffs)
• MDisplay.h (modified) (2 diffs)

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

@@ -51 +51 @@
 #include "MGeomCam.h"
 #include "MHCamera.h"
+#include "MRawRunHeader.h"
+#include "MRawEvtHeader.h"
 
 #include "MLog.h"
@@ -107 +109 @@
   fDisplay->Draw();
 
+  //look for the run and event headers
+  fEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
+  if (!fEvtHeader)
+    {
+      *fLog << err << "MRawEvtHeader not found... aborting." << endl;
+      return kFALSE;
+    }
+  
+  fRunHeader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
+  if (!fRunHeader)
+    {
+      *fLog << err << AddSerialNumber("MRawRunHeader") << " not found... aborting." << endl;
+      return kFALSE;
+    }
+
   return kTRUE;
 }
@@ -126 +143 @@
   fCanvas->GetPad(1)->Modified();
   fCanvas->GetPad(1)->Update();
+  
+  *fLog << all << "Run: " << fRunHeader->GetRunNumber() << ", Event: " << fEvtHeader->GetDAQEvtNumber() << endl;
 
   // pause execution
   if(fPause)
     {
-      cout << "Type 'q' to exit, <return> to go on: ";      
+      cout << "Type 'q' to exit, 'p' to print event into ps file, <return> to go on: ";      
       TString input;
       input =cin.get(); 
@@ -136 +155 @@
       if (input=='q')
         return kFALSE;
+      if(input=='p')
+        {
+          Char_t psfile[200];
+          sprintf(psfile,"Run%06dEvent%07d.ps", fRunHeader->GetRunNumber(), fEvtHeader->GetDAQEvtNumber());
+          fCanvas->Print(psfile);
+        }
     }
 

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

@@ -6 +6 @@
 #endif
 
+class MRawRunHeader;
+class MRawEvtHeader;
 class MHCamera;
 class MCamEvent;
@@ -15 +17 @@
 {
  private:
-  MHCamera*     fDisplay;      // pointer to the camera display
-  MGeomCam*     fGeomCam;      // pointer to the camera geometry
-  MCamEvent*    fCamEvent;     // pointer to camera event
-  TCanvas*      fCanvas;       // pointer to the canvas
-  TPostScript*  fPSFile;       // pointer to ps file
-  TString       fPSFileName;   // name for ps file
-  Int_t         fDisplayType;  // display type (see MHCamera)
-  Bool_t        fCreatePSFile; // flag to produce a ps file with events
-  Bool_t        fPause;        // flag to pause execution between events
+  MRawEvtHeader*  fEvtHeader;    // event header
+  MRawRunHeader*  fRunHeader;    // run header
+  MHCamera*       fDisplay;      // pointer to the camera display
+  MGeomCam*       fGeomCam;      // pointer to the camera geometry
+  MCamEvent*      fCamEvent;     // pointer to camera event
+  TCanvas*        fCanvas;       // pointer to the canvas
+  TPostScript*    fPSFile;       // pointer to ps file
+  TString         fPSFileName;   // name for ps file
+  Int_t           fDisplayType;  // display type (see MHCamera)
+  Bool_t          fCreatePSFile; // flag to produce a ps file with events
+  Bool_t          fPause;        // flag to pause execution between events