Changeset 1608

Timestamp:

11/14/02 12:07:41 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• multidimdist2.C (added)
• star.C (modified) (6 diffs)

trunk/MagicSoft/Mars/macros/star.C

@@ -35 +35 @@
 {
     //
-    // This is a demonstration program which calculates the Hillas
-    // parameter out of a Magic root file.
+    // This is a demonstration program which calculates the image 
+    // parameters from a Magic raw data root file.
 
     //
@@ -47 +47 @@
     plist.AddToList(&tlist);
 
+    MSrcPosCam src;
+    plist.AddToList(&src);
+
     //
     // Uncomment this two line if you want to use MHillasExt instead
@@ -56 +59 @@
     //
     // The geometry container must be created by yourself to make sure
-    // that you don't choos a wrong geometry by chance
+    // that you don't choose a wrong geometry by mistake
     //
     MGeomCamMagic geomcam;
     plist.AddToList(&geomcam);
-
-    //
-    // Craete the object which hlods the source positions in the camera
-    // plain in respect to which the image parameters will be calculated.
-    // 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);
-
-    plist.AddToList(&source);
-    plist.AddToList(&antisrc);
 
     //
@@ -80 +69 @@
     //
     MReadMarsFile read("Events");
-    read.AddFile("Gammas*.root");
     read.DisableAutoScheme();
+
+    // ------------- user change -----------------
+    read.AddFile("Pro*.root");
+    //read.AddFile("Gam*.root");
 
     MMcPedestalCopy   pcopy;
@@ -92 +84 @@
     MImgCleanStd      clean;
     MHillasCalc       hcalc;
-    MHillasSrcCalc    csrc1("Source",  "HillasSource");
-    MHillasSrcCalc    csrc2("AntiSrc", "HillasAntiSrc");
+    MHillasSrcCalc    scalc; // !!Preliminary!! Will be removed later!
 
-    MWriteRootFile write("star.root");
+    // ------------- user change -----------------
+    MWriteRootFile write("data/star_protons.root");
     write.AddContainer("MHillas",       "Events");
     write.AddContainer("HillasSource",  "Events");
-    write.AddContainer("HillasAntiSrc", "Events");
     write.AddContainer("MMcEvt",        "Events");
+    write.AddContainer("MHillasSrc",    "Events");
     write.AddContainer("MRawRunHeader", "RunHeaders");
     write.AddContainer("MMcRunHeader",  "RunHeaders");
-    write.AddContainer("Source",        "RunHeaders");
-    write.AddContainer("AntiSource",    "RunHeaders");
 
     tlist.AddToList(&read);
@@ -112 +102 @@
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
-    tlist.AddToList(&csrc1);
-    tlist.AddToList(&csrc2);
+    tlist.AddToList(&scalc);
     tlist.AddToList(&write);
 
     //
-    // Create and setup the eventloop
+    // Create and set up the eventloop
     //
     MProgressBar bar;