Changeset 1023 for trunk/MagicSoft/Mars/macros

Timestamp:

11/01/01 10:19:46 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/MagicHillas.C (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -24 +24 @@
 
 
-void MagicHillas()
+void MagicHillas(const char *filename="data/camera.root")
 {
     //
@@ -50 +50 @@
 
     //
-    // The Hillas histograms (MHHillas) could be created automatically
-    // but to make sure, that they are not deleted when the macro is
-    // finished you must create them yourself and add it to the list
-    //
-    MHHillas *hists = new MHHillas;
-    plist.AddToList(hists);
-
-    MHStarMap *smap = new MHStarMap;
-    plist.AddToList(smap);
-
-    //
     // Now setup the tasks and tasklist:
     //
@@ -76 +65 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree read("Events", "data/octobertest.root");
+    MReadTree read("Events", filename);
     // read.AddFile("data/cer000019.root");
 
-    MCerPhotCalc    ncalc;
-    MImgCleanStd    clean;
-    MHillasCalc     hcalc;
-    MFillH          hfill("MHillas", "MHHillas");
-    MFillH          sfill("MHillas", "MHStarMap");
+    MCerPhotCalc ncalc;
+    MImgCleanStd clean;
+    MHillasCalc  hcalc;
+    MFillH       hfill("MHillas", "MHHillas");
+    MFillH       sfill("MHillas", "MHStarMap");
 
-    MWriteRootFile  write("hillas.root");
+    //
+    // Crete and setup Tasklist
+    //
+    MWriteRootFile write("hillas.root");
     write.AddContainer("MHillas");
-    write.AddContainer("MHHillas");
-    write.AddContainer(smap);
+    write.AddContainer("MHStarMap");
 
     tlist.AddToList(&read);
@@ -113 +104 @@
     // After the analysis is finished we can display the histograms
     //
-    hists->Draw();
-    smap->Draw();
+    plist.FindObject("MHHillas")->DrawClone();
+    plist.FindObject("MHStarMap")->DrawClone();
 }