Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1280)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1281)
@@ -7,4 +7,7 @@
        return a List of TBaseClasses not a List of TClass objects)
      - added a security check to Process whether we have something to process or not.
+
+   * macros/CT1Hillas.C:
+     - changed to the new Hillas classes
 
 
Index: trunk/MagicSoft/Mars/macros/CT1Hillas.C
===================================================================
--- trunk/MagicSoft/Mars/macros/CT1Hillas.C	(revision 1280)
+++ trunk/MagicSoft/Mars/macros/CT1Hillas.C	(revision 1281)
@@ -47,4 +47,34 @@
 
     //
+    // Setup binning for your histograms.
+    //
+    MBinning binswidth("BinningWidth");
+    binswidth.SetEdges(100, 0, 1);   // 100 bins from 0 to 1 deg
+
+    MBinning binslength("BinningLength");
+    binslength.SetEdges(100, 0, 1);  // 100 bins from 0 to 1 deg
+
+    MBinning binsalpha("BinningAlpha");
+    binsalpha.SetEdges(90, 0, 90);   // 90 bins from 0 to 90 deg
+
+    MBinning binsdist("BinningDist");
+    binsdist.SetEdges(100, 0, 2);    // 100 bins from 0 to 2 deg
+
+    plist.AddToList(&binswidth);
+    plist.AddToList(&binslength);
+    plist.AddToList(&binsalpha);
+    plist.AddToList(&binsdist);
+
+    //
+    // 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);
+
+    plist.AddToList(&source);
+
+    //
     // Now setup the tasks and tasklist:
     //
@@ -54,17 +84,22 @@
     //  4) fill the hillas into the histograms      MFillHHillas
     //
-    MCT1ReadAscii read("data/CT1_97_on1.dat");
-    read.AddFile("data/CT1_97_off1.dat");
+    MCT1ReadAscii read("../data/CT1_97_on1.dat");
+    //read.AddFile("../data/CT1_97_off1.dat");
 
-    MImgCleanStd  clean;
-    MHillasCalc   hcalc;
-    MFillH        hfill("MHillas", "MHHillas");
-    MFillH        sfill("MHillas", "MHStarMap");
+    MImgCleanStd   clean;
+    MHillasCalc    hcalc;
+    MHillasSrcCalc csrc1("Source",  "HillasSource");
+
+    MFillH hfill("MHHillas",   "MHillas");
+    MFillH sfill("MHStarMap",  "MHillas");
+    MFillH hfill2s("HistSource  [MHHillasSrc]", "HillasSource");
 
     tlist.AddToList(&read);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
+    tlist.AddToList(&csrc1);
     tlist.AddToList(&hfill);
     tlist.AddToList(&sfill);
+    tlist.AddToList(&hfill2s);
 
     //
@@ -84,4 +119,5 @@
     //
     plist.FindObject("MHHillas")->DrawClone();
+    plist.FindObject("HistSource")->DrawClone();
     plist.FindObject("MHStarMap")->DrawClone();
 }