Index: trunk/MagicSoft/Mars/macros/MagicHillas.C
===================================================================
--- trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 892)
+++ trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 895)
@@ -51,12 +51,16 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree read("Events", "data/my_file.root");
-    // read.AddFile("data/test.root");
+    MReadTree read("Events", "data/cer000020.root");
+    // read.AddFile("data/cer000019.root");
 
-    MCerPhotCalc  ncalc;
-    MImgCleanStd  clean;
-    MHillasCalc   hcalc;
-    MFillHHillas  hfill;
-    MFillHStarMap sfill;
+    MCerPhotCalc    ncalc;
+    MImgCleanStd    clean;
+    MHillasCalc     hcalc;
+    MFillH          hfill("MHillas", "MHHillas");
+    MFillHStarMap   sfill("MHillas", "MHStarMap");
+    MWriteRootFile write("hillas.root");
+    write.AddContainer("MHillas");
+    write.AddContainer("MHHillas");
+    write.AddContainer(smap);
 
     tlist.AddToList(&read);
@@ -66,4 +70,5 @@
     tlist.AddToList(&hfill);
     tlist.AddToList(&sfill);
+    tlist.AddToList(&write);
 
     //
@@ -76,5 +81,6 @@
     // Execute your analysis
     //
-    evtloop.Eventloop();
+    if (!evtloop.Eventloop())
+        return;
 
     //