Changeset 895 for trunk/MagicSoft/Mars

Timestamp:

07/23/01 14:44:07 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/MagicHillas.C (modified) (3 diffs)
• mbase/MReadTree.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -15 +15 @@
        We cannot use GetBranch()->SetAddress() we have to use
        SetBranchAddress.
+       
+   * macros/MagicHillas.C:
+     - changed to new stilish histogram fillers.
 
 

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -51 +51 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree read("Events", "data/my_file.root");
-    // read.AddFile("data/test.root");
+    MReadTree read("Events", "data/cer000020.root");
+    // read.AddFile("data/cer000019.root");
 
-    MCerPhotCalc  ncalc;
-    MImgCleanStd  clean;
-    MHillasCalc   hcalc;
-    MFillHHillas  hfill;
-    MFillHStarMap sfill;
+    MCerPhotCalc    ncalc;
+    MImgCleanStd    clean;
+    MHillasCalc     hcalc;
+    MFillH          hfill("MHillas", "MHHillas");
+    MFillHStarMap   sfill("MHillas", "MHStarMap");
+    MWriteRootFile write("hillas.root");
+    write.AddContainer("MHillas");
+    write.AddContainer("MHHillas");
+    write.AddContainer(smap);
 
     tlist.AddToList(&read);
@@ -66 +70 @@
     tlist.AddToList(&hfill);
     tlist.AddToList(&sfill);
+    tlist.AddToList(&write);
 
     //
@@ -76 +81 @@
     // Execute your analysis
     //
-    evtloop.Eventloop();
+    if (!evtloop.Eventloop())
+        return;
 
     //

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -108 +108 @@
 //
 //  If you want to read the given tree over several files you must add
-//  the files here before PreProcess is called. Be carfull: This does
-//  only work if the trees in the files containing the same branches yet.
+//  the files here before PreProcess is called. Be careful: If the tree
+//  doesn't have the same contents (branches) it may confuse your
+//  program (trees which are are not existing in later files are not read
+//  anymore, tree wich are not existing in the first file are never read)
 //
 /*Int_t*/ void MReadTree::AddFile(const char *fname)
@@ -175 +177 @@
             continue;
 
-
         //
         // Create a pointer to the pointer to the object in which the
@@ -202 +203 @@
         // the actual branch should be stored - enable branch.
         //
-        // FIXME: is it correct, that the pointer is deleted immediatly afterwards?
         fChain->SetBranchAddress(name, pcont);
     }