Changeset 768 for trunk/MagicSoft/Mars

Timestamp:

04/24/01 11:22:42 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/CT1Hillas.C (modified) (1 diff)
• macros/MagicHillas.C (modified) (1 diff)
• mbase/MReadTree.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/CT1Hillas.C

@@ -35 +35 @@
     // Now setup the tasks and tasklist:
     //
-    //  1) read in the data from a ct1 ascii file
-    //  2) clean the image
-    //  3) calculate hillas
-    //  4) fill the hillas into the histograms
+    //  1) read in the data from a ct1 ascii file   MCTReadAscii
+    //  2) clean the image                          MImgCleanStd
+    //  3) calculate hillas                         MHillasCalc
+    //  4) fill the hillas into the histograms      MFillHHillas
     //
-    MCT1ReadAscii read;
-    read.AddFile("CT1_99_off1.dat");
-    read.AddFile("CT1_99_off2.dat");
+    MCT1ReadAscii read("data/MCCT1_97_ga45.dat");
+    // read.AddFile("data/MCCT1_97_ga20.dat");
 
     MImgCleanStd  clean;

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -38 +38 @@
     // Now setup the tasks and tasklist:
     //
-    //  1) read in the data from a ct1 ascii file
+    //  1) read in the data from a magic root file   MReadTree
     //  2) clean the image
     //  3) calculate hillas
     //  4) fill the hillas into the histograms
     //
-    MReadTree    read("Events", "oscar_protons.root");
-    read.AddFile("test.root");
+
+    //
+    // The first argument is the tree you want to read.
+    //   Events:     Cosmic ray events
+    //   PedEvents:  Pedestal Events
+    //   CalEvents:  Calibration Events
+    //
+    MReadTree read("Events", "data/my_file.root");
+    // read.AddFile("data/test.root");
 
     MCerPhotCalc  ncalc;

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -63 +63 @@
 //
 MReadTree::MReadTree(const char *tname, const char *fname,
-                     const char *name, const char *title)
+                     const char *name, const char *title) : fNumEntry(0)
 {
     *fName  = name  ? name  : "MReadTree";
@@ -131 +131 @@
 
     //
-    // set pointer to first event
-    //
-    fNumEntry   = 0;
-
-    //
     // output logging information
     //
@@ -200 +195 @@
     // check for end of file
     //
-    if (fNumEntry==fNumEntries)
+    if (fNumEntry>=fNumEntries)
         return kFALSE;
 
@@ -272 +267 @@
 // this function makes Process() read event number nr next
 //
+// Remark: You can use this function to set the event number from which
+//         you want to start reading.
+//
 Bool_t MReadTree::SetEventNum(UInt_t nr)
 {