Changeset 594 for trunk

Timestamp:

01/31/01 12:01:29 (24 years ago)

Author:

harald

Message:

problems with running the macro readCT1.C. The reason was the Name and
Title of MNphotEvent. --> Solved!!

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Makefile

@@ -35 +35 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mgui meventdisp mdatacheck mbase mraw manalysis mmc
+SUBDIRS = mgui manalysis meventdisp mdatacheck mbase mraw mmc
 
 LIBRARIES = $(SUBDIRS:=.a)
@@ -64 +64 @@
 
 $(LIBRARIES):
+        @echo " ++++++++++++++++++++++++++++++ "  
         @echo " Creating lib$@:"
         (cd $*; make; cd ..; mv $*/$@ lib/lib$@) 

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -11 +11 @@
   MNphotEvent *phevt = new MNphotEvent() ; 
 
+
   plist->AddToList( phevt ) ; 
   
+
   MReadCT1Ascii *readct1 = new MReadCT1Ascii("/hd10/www/Anal_MAGIC/MCCT1_99_ga20.dat") ; 
 
   // MReadCT1Ascii *readct1 = new MReadCT1Ascii("/hd10/www/Anal_MAGIC/CT1_99_on1.dat") ; 
+
 
   

trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc

@@ -41 +41 @@
 
 
-MNphotEvent::MNphotEvent(Int_t type ) 
+MNphotEvent::MNphotEvent(const char *name, const char *title ) 
 {
-  fType = type ; 
+  //   the default constructor 
+
+  
+  *fName  = name  ? name  : "MNphotEvent";
+  *fTitle = name  ? name  : "(Number of Photon)-Event Information";
+  
+  fType = 0 ; 
   fNbPixels = 0 ; 
   
-  if (fType == 0 )  // this is MAGIC
-    {
-      fPixels = new TClonesArray ("MNphotPix", 577) ;
-    }
-  else if ( fType == 1 ) // this is CT1
-    {
-      fPixels = new TClonesArray ("MNphotPix", 127) ;
-    }
-
+  fPixels = new TClonesArray ("MNphotPix", 577) ;
+  
   fPixels->Clear() ; 
 }
@@ -63 +62 @@
   // 
   
-//   MCamDisplay disp(fType)  ; 
+  //   MCamDisplay disp(fType)  ; 
+  
+  //   for (Int_t i=0; i<fNbPixels; i++)
+  //     {
+  //       disp.SetPixelColor( ((MNphotPix *) fPixels->At(i))->GetPixId(), 
+  //                      ((MNphotPix *) fPixels->At(i))->GetPhotons()) ; 
+  //     } 
+  //   disp.Draw() ; 
+  
+}
 
-//   for (Int_t i=0; i<fNbPixels; i++)
-//     {
-//       disp.SetPixelColor( ((MNphotPix *) fPixels->At(i))->GetPixId(), 
-//                        ((MNphotPix *) fPixels->At(i))->GetPhotons()) ; 
-//     } 
-//   disp.Draw() ; 
-
-}
 
 

trunk/MagicSoft/Mars/manalysis/MNphotEvent.h

@@ -60 +60 @@
  public:
   
-  MNphotEvent( Int_t type=0 ) ; 
+  MNphotEvent(const char *name=NULL, const char *title=NULL) ; 
 
   void Draw(Option_t* option) ; 
@@ -72 +72 @@
   void Print() ; 
 
-  ClassDef(MNphotEvent, 1)    // class for CeNphotons Events
+  ClassDef(MNphotEvent, 1)    // class for Nphotons Events
 };