Index: trunk/MagicSoft/Mars/macros/MagicHillas.C
===================================================================
--- trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 1206)
+++ trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 1209)
@@ -24,5 +24,5 @@
 
 
-void MagicHillas(const char *filename="data/camera.root")
+void MagicHillas(const char *filename="~/data/Gamma*.root")
 {
     //
@@ -46,17 +46,21 @@
     plist.AddToList(&geomcam);
 
-    MPedestalCam pedest;
-    plist.AddToList(&pedest);
+    //
+    // 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);
 
     //
     // Now setup the tasks and tasklist:
-    //
-    //  1) read in the data from a magic root file   MReadTree
-    //  2) calculate number of cerenkov photons      MCerPhotCalc
-    //  3) clean the image                           MImgCleanStd
-    //  4) calculate hillas                          MHillasCalc
-    //  5) fill the hillas into the histograms       MFillH
-    //
-
+    // ---------------------------------
     //
     // The first argument is the tree you want to read.
@@ -65,5 +69,5 @@
     //   CalEvents:  Calibration Events
     //
-    MReadMarsFile  read("Events",filename);
+    MReadMarsFile  read("Events", filename);
 
     MMcPedestalCopy   pcopy;
@@ -73,12 +77,16 @@
     MBlindPixelCalc   blind;
     MHillasCalc       hcalc;
-    MFillH            hfill("MHillas", "MHHillas");
-    MFillH            sfill("MHillas", "MHStarMap");
+    MHillasSrcCalc    csrc1("Source",  "HillasSource");
+    MHillasSrcCalc    csrc2("AntiSrc", "HillasAntiSrc");
 
-    //
-    // Crete and setup Tasklist
-    //
+    MFillH hfill("MHHillas",   "MHillas");
+    MFillH sfill("MHStarMap",  "MHillas");
+    MFillH hfill2s("HistSource  [MHHillasSrc]", "HillasSource");
+    MFillH hfill2a("HistAntiSrc [MHHillasSrc]", "HillasAntiSrc");
+
     MWriteRootFile write("hillas.root");
-    write.AddContainer("MHillas");
+    write.AddContainer("MHillas",       "Hillas");
+    write.AddContainer("HillasSource",  "Hillas");
+    write.AddContainer("HillasAntiSrc", "Hillas");
     write.AddContainer("MHStarMap");
 
@@ -90,6 +98,10 @@
     tlist.AddToList(&blind);
     tlist.AddToList(&hcalc);
+    tlist.AddToList(&csrc1);
+    tlist.AddToList(&csrc2);
     tlist.AddToList(&hfill);
     tlist.AddToList(&sfill);
+    tlist.AddToList(&hfill2s);
+    tlist.AddToList(&hfill2a);
     tlist.AddToList(&write);
 
@@ -112,4 +124,6 @@
     //
     plist.FindObject("MHHillas")->DrawClone();
+    plist.FindObject("HistSource")->DrawClone();
+    plist.FindObject("HistAntiSrc")->DrawClone();
     plist.FindObject("MHStarMap")->DrawClone();
 }