Changeset 595 for trunk/MagicSoft/Mars

Timestamp:

02/02/01 11:28:36 (24 years ago)

Author:

harald

Message:

Added the first implementation of a EventDisplay for MAGIC.
The class doing the job is called "MCamDisplay".

Location:

trunk/MagicSoft/Mars

Files:

• macros/readCT1.C (modified) (1 diff)
• manalysis/MNphotEvent.cc (modified) (3 diffs)
• manalysis/MNphotEvent.h (modified) (2 diffs)
• mgui/MCamDisplay.cc (added)
• mgui/MCamDisplay.h (added)
• mgui/Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -19 +19 @@
   // MReadCT1Ascii *readct1 = new MReadCT1Ascii("/hd10/www/Anal_MAGIC/CT1_99_on1.dat") ; 
 
-
-  
   cout << readct1->PreProcess(plist) << endl ; 
 
   Int_t icount = 0 ; 
+
+  MCamDisplay display(0) ; 
+
   while ( readct1->Process() == kTRUE )
     {
       cout << "Event: " << icount++  << endl  ;
-      //      phevt->Print() ;  
+      
+      if ( icount == 3 ) 
+        phevt->Print() ;
+      
+      display->Draw( phevt )  ; 
+
+      gClient->HandleInput();   
+      if(getchar()=='e') break;  
     } 
 

trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc

@@ -6 +6 @@
 
 #include "MCamGeom.h"
-//#include "MCamDisplay.h"
+#include "MCamDisplay.h"
 #include "MHexagon.h"
 
@@ -62 +62 @@
   // 
   
-  //   MCamDisplay disp(fType)  ; 
+  MCamDisplay *disp = new MCamDisplay(fType)  ; 
   
-  //   for (Int_t i=0; i<fNbPixels; i++)
-  //     {
-  //       disp.SetPixelColor( ((MNphotPix *) fPixels->At(i))->GetPixId(), 
-  //                      ((MNphotPix *) fPixels->At(i))->GetPhotons()) ; 
-  //     } 
-  //   disp.Draw() ; 
+  disp->Draw( this ) ; 
   
+  //  disp->Draw() ; 
+
 }
 
@@ -106 +103 @@
 }
   
+Int_t MNphotEvent::GetPixelId(Int_t i ) 
+{ 
+  return ( ( (MNphotPix *) fPixels->At(i))->GetPixId() ) ; 
+} 
+
+Float_t MNphotEvent::GetPhotons(Int_t i ) 
+{ 
+  return ( ( (MNphotPix *) fPixels->At(i))->GetPhotons() ) ; 
+} 

trunk/MagicSoft/Mars/manalysis/MNphotEvent.h

@@ -62 +62 @@
   MNphotEvent(const char *name=NULL, const char *title=NULL) ; 
 
-  void Draw(Option_t* option) ; 
+  void Draw(Option_t* option = "" ) ; 
 
   Int_t    GetNbPixels() ; 
@@ -72 +72 @@
   void Print() ; 
 
-  ClassDef(MNphotEvent, 1)    // class for Nphotons Events
+  Int_t GetPixelId(Int_t i ) ; 
+  Float_t GetPhotons(Int_t i ) ; 
+  
+    ClassDef(MNphotEvent, 1)    // class for Nphotons Events
 };
 

trunk/MagicSoft/Mars/mgui/Makefile

@@ -27 +27 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../mdatacheck -I../meventdisp
+INCLUDES = -I. -I../mbase -I../mraw -I../mdatacheck -I../meventdisp -I../manalysis
 
 #
@@ -58 +58 @@
            MGPrototyp.cc \
            MHexagon.cc \
-           MCamGeom.cc
+           MCamGeom.cc \
+           MCamDisplay.cc