Changeset 1011 for trunk/MagicSoft/Mars

Timestamp:

10/29/01 14:42:25 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/CT1Hillas.C (modified) (4 diffs)
• manalysis/MCT1ReadAscii.cc (modified) (1 diff)

trunk/MagicSoft/Mars/macros/CT1Hillas.C

@@ -47 +47 @@
 
     //
-    // 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:
     //
@@ -65 +54 @@
     //  4) fill the hillas into the histograms      MFillHHillas
     //
-    MCT1ReadAscii read("data/MCCT1_97_ga45.dat");
-    // read.AddFile("data/MCCT1_97_ga20.dat");
+    MCT1ReadAscii read("data/CT1_97_on1.dat");
+    read.AddFile("data/CT1_97_off1.dat");
 
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
-    MFillHHillas  hfill;
-    MFillHStarMap sfill;
+    MFillH        hfill("MHillas", "MHHillas");
+    MFillH        sfill("MHillas", "MHStarMap");
 
     tlist.AddToList(&read);
@@ -83 +72 @@
     //
     MEvtLoop evtloop;
-    evtloop.SetParList(&plist)
+    evtloop.SetParList(&plist);
 
     //
@@ -94 +83 @@
     // After the analysis is finished we can display the histograms
     //
-    hists->Draw();
-    smap->Draw();
+    plist.FindObject("MHHillas")->DrawClone();
+    plist.FindObject("MHStarMap")->DrawClone();
 }

trunk/MagicSoft/Mars/manalysis/MCT1ReadAscii.cc

@@ -185 +185 @@
 void MCT1ReadAscii::ReadPedestals()
 {
-    *fLog << "MCT1Pedestals::AsciiRead: Reading Pedestals..." << endl;
-
     //
     // skip the next 4 values