Changeset 1633 for trunk

Timestamp:

11/18/02 11:35:20 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/CT1Hillas.C (modified) (1 diff)
• macros/MagicHillas.C (modified) (5 diffs)
• macros/estfit.C (modified) (1 diff)
• macros/estimate.C (modified) (1 diff)
• macros/multidimdist.C (modified) (1 diff)
• macros/star.C (modified) (2 diffs)
• macros/starplot.C (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -2 +2 @@
 
  2002/11/18: Thomas Bretz
+
+   * macros/CT1Hillas.C:
+     - changed MWRiteRootFile to write the histograms only
+     - renamed HillasSource to MHillasSrc
+
+   * macros/MagicHillas.C:
+     - removed all anti source stuff (corresponding to star.C)
+     - changed MWRiteRootFile to write the histograms only
+     - renamed HillasSource to MHillasSrc
+
+   * macros/estfit.C, macros/estimate.C:
+     - renamed HillasSource to MHillasSrc
+
+   * multidimdist.C:
+     - added Theta
+     - added Alpha
+
+   * macros/star.C
+     - removed wrong HillasSource
+     - added MSrcPosCam
+
+   * starplot.C:
+     - removed all anti source stuff (corresponding to star.C)
+     - renamed HillasSource to MHillasSrc
 
    * macros/multidimdist2.C:

trunk/MagicSoft/Mars/macros/CT1Hillas.C

@@ -127 +127 @@
 
     MWriteRootFile write("hillas.root");
-    write.AddContainer("HillasSource",  "Hillas");
     write.AddContainer("MHStarMap");
-    write.AddContainer("MMcEvt","Hillas");
-    write.AddContainer("Source","RunHeaders");
+    write.AddContainer("MHHillas");
+    write.AddContainer("MHHillasExt");
+    write.AddContainer("HistSource");
+    write.AddContainer("HistExtSource");
 
     tlist.AddToList(&read);

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -72 +72 @@
     // For real data the containers will be filled by a task.
     //
-    MSrcPosCam source("Source")
-    source.SetXY(0, 0);
-
-    MSrcPosCam antisrc("AntiSrc");
-    antisrc.SetXY(240, 0);
-
+    MSrcPosCam source;
+    source.SetReadyToSave();
     plist.AddToList(&source);
-    plist.AddToList(&antisrc);
 
     //
@@ -115 +110 @@
     //
     MHillasCalc    hcalc;
-    MHillasSrcCalc csrc1("Source",  "HillasSource");
-    MHillasSrcCalc csrc2("AntiSrc", "HillasAntiSrc");
+    MHillasSrcCalc csrc1;
 
     //
@@ -127 +121 @@
     MFillH hfill2("MHHillasExt");
     MFillH hfill3("MHStarMap", "MHillas");
-    MFillH hfill4("HistExtSource [MHHillasExt]", "HillasSource");
-    MFillH hfill5("HistExtAntiSrc [MHHillasExt]", "HillasAntiSrc");
-    MFillH hfill6("HistSource [MHHillasSrc]", "HillasSource");
-    MFillH hfill7("HistAntiSrc [MHHillasSrc]", "HillasAntiSrc");
+    MFillH hfill4("HistExtSource [MHHillasExt]", "MHillasSrc");
+    MFillH hfill5("HistSource [MHHillasSrc]", "MHillasSrc");
 
     MWriteRootFile write("hillas.root");
-    write.AddContainer("HillasSource",  "Hillas");
-    write.AddContainer("HillasAntiSrc", "Hillas");
     write.AddContainer("MHStarMap");
-    write.AddContainer("MMcEvt","Hillas");
-    write.AddContainer("Source","RunHeaders");
-    write.AddContainer("AntiSrc","RunHeaders");
+    write.AddContainer("MHHillas");
+    write.AddContainer("MHHillasExt");
+    write.AddContainer("HistSource");
+    write.AddContainer("HistExtSource");
 
     tlist.AddToList(&read);
@@ -156 +147 @@
     tlist.AddToList(&hfill4);
     tlist.AddToList(&hfill5);
-    tlist.AddToList(&hfill6);
-    tlist.AddToList(&hfill7);
     tlist.AddToList(&write);
 
@@ -183 +172 @@
     plist.FindObject("MHStarMap")->DrawClone();
     plist.FindObject("HistSource")->DrawClone();
-    plist.FindObject("HistAntiSrc")->DrawClone();
     plist.FindObject("HistExtSource")->DrawClone();
-    plist.FindObject("HistExtAntiSrc")->DrawClone();
 }
 

trunk/MagicSoft/Mars/macros/estfit.C

@@ -178 +178 @@
 
     MEnergyEstParam eest;
-    eest.Add("HillasSource");
+    eest.Add("MHillasSrc");
     eest.InitMapping(&matrix);
 

trunk/MagicSoft/Mars/macros/estimate.C

@@ -60 +60 @@
 
     MEnergyEstParam eest;
-    eest.Add("HillasSource");
+    eest.Add("MHillasSrc");
 
     TArrayD fA(5);

trunk/MagicSoft/Mars/macros/multidimdist.C

@@ -104 +104 @@
     matrix.AddColumn("MHillasSrc.fDist");
     matrix.AddColumn("log10(MHillas.fSize)");
+    matrix.AddColumn("MHillasSrc.fAlpha");
+    matrix.AddColumn("MMcEvt.fTheta");
     plist.AddToList(&matrix);
 

trunk/MagicSoft/Mars/macros/star.C

@@ -48 +48 @@
 
     MSrcPosCam src;
+    src.SetReadyToSave();
     plist.AddToList(&src);
 
@@ -89 +90 @@
     MWriteRootFile write("data/star_protons.root");
     write.AddContainer("MHillas",       "Events");
-    write.AddContainer("HillasSource",  "Events");
     write.AddContainer("MMcEvt",        "Events");
     write.AddContainer("MHillasSrc",    "Events");
     write.AddContainer("MRawRunHeader", "RunHeaders");
     write.AddContainer("MMcRunHeader",  "RunHeaders");
+    write.AddContainer("MSrcPosCam",    "RunHeaders");
 
     tlist.AddToList(&read);

trunk/MagicSoft/Mars/macros/starplot.C

@@ -82 +82 @@
     MFillH hfill2("MHHillasExt");
     MFillH hfill3("MHStarMap", "MHillas");
-    MFillH hfill4("HistExtSource [MHHillasExt]", "HillasSource");
-    MFillH hfill5("HistExtAntiSource [MHHillasExt]", "HillasAntiSource");
-    MFillH hfill6("HistSource [MHHillasSrc]", "HillasSource");
-    MFillH hfill7("HistAntiSrc [MHHillasSrc]", "HillasAntiSrc");
+    MFillH hfill4("HistExtSource [MHHillasExt]", "MHillasSrc");
+    MFillH hfill5("HistSource [MHHillasSrc]", "MHillasSrc");
 
     tlist.AddToList(&read);
@@ -93 +91 @@
     tlist.AddToList(&hfill4);
     tlist.AddToList(&hfill5);
-    tlist.AddToList(&hfill6);
-    tlist.AddToList(&hfill7);
 
     //
@@ -119 +115 @@
     plist.FindObject("MHStarMap")->DrawClone();
     plist.FindObject("HistSource")->DrawClone();
-    plist.FindObject("HistAntiSource")->DrawClone();
     plist.FindObject("HistExtSource")->DrawClone();
-    plist.FindObject("HistExtAntiSource")->DrawClone();
 }