Index: trunk/MagicSoft/Mars/macros/MagicHillas.C
===================================================================
--- trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 2009)
+++ trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 2026)
@@ -36,5 +36,4 @@
     //
     MParList plist;
-
 
     MTaskList tlist;
@@ -112,10 +111,4 @@
     MHillasSrcCalc csrc1;
 
-    //
-    // To use MHillasExt instead of MHillas
-    //
-    MHillasExt hext;
-    plist.AddToList(&hext);
-
     MFillH hfill1("MHHillas", "MHillas");
     MFillH hfill2("MHHillasExt");
@@ -123,4 +116,5 @@
     MFillH hfill4("HistExtSource [MHHillasExt]", "MHillasSrc");
     MFillH hfill5("HistSource [MHHillasSrc]", "MHillasSrc");
+    MFillH hfill6("MHNewImagePar");
 
     MWriteRootFile write("hillas.root");
@@ -130,4 +124,5 @@
     write.AddContainer("HistSource");
     write.AddContainer("HistExtSource");
+    write.AddContainer("MHNewImagePar");
 
     tlist.AddToList(&read);
@@ -146,4 +141,5 @@
     tlist.AddToList(&hfill4);
     tlist.AddToList(&hfill5);
+    tlist.AddToList(&hfill6);
     tlist.AddToList(&write);
 
@@ -172,4 +168,5 @@
     plist.FindObject("HistSource")->DrawClone();
     plist.FindObject("HistExtSource")->DrawClone();
+    plist.FindObject("MHNewImagePar")->DrawClone();
 }
 
Index: trunk/MagicSoft/Mars/macros/readCT1.C
===================================================================
--- trunk/MagicSoft/Mars/macros/readCT1.C	(revision 2009)
+++ trunk/MagicSoft/Mars/macros/readCT1.C	(revision 2026)
@@ -49,10 +49,14 @@
     MParList plist;
 
-    MGeomCamCT1 geomcam;
-    MHillas     hillas;
-    MTaskList   tlist;
+    MGeomCamCT1  geomcam;
+    MHillas      hillas;
+    MHillasExt   hillasext;
+    MNewImagePar newimgpar;
+    MTaskList    tlist;
 
     plist.AddToList(&geomcam);
     plist.AddToList(&hillas);
+    plist.AddToList(&hillasext);
+    plist.AddToList(&newimagepar);
     plist.AddToList(&tlist);
 
@@ -77,21 +81,25 @@
     display.Draw();
 
-    while (tlist.Process())
+    while ((rc=tlist.Process()))
     {
         cout << "Event #" << icount++ << endl;
 
         MCerPhotEvt *evt = (MCerPhotEvt*)clone.GetClone();
-
-        if (!evt)
+        if (!evt)      // If skipped due to MInputStreamId
             continue;
 
-        display.DrawPhotNum(evt);
+        display.FillPhotNum(*evt);
+        display.Update();
 
         if (!HandleInput())
             break;
 
+        hillas.Draw();
         hillas.Print();
-        hillas.Draw();
-        display.DrawPhotNum((MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
+        hillasext.Print();
+        newimgpar.Print();
+
+        display.FillPhotNum(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
+        display.Update();
 
         if (!HandleInput())
Index: trunk/MagicSoft/Mars/macros/readMagic.C
===================================================================
--- trunk/MagicSoft/Mars/macros/readMagic.C	(revision 2009)
+++ trunk/MagicSoft/Mars/macros/readMagic.C	(revision 2026)
@@ -51,9 +51,13 @@
 
     MGeomCamMagic geomcam;
-    MHillasExt    hillas;
+    MHillas       hillas;
+    MHillasExt    hillasext;
+    MNewImagePar  newimgpar;
     MTaskList     tlist;
 
     plist.AddToList(&geomcam);
     plist.AddToList(&hillas);
+    plist.AddToList(&hillasext);
+    plist.AddToList(&newimgpar);
     plist.AddToList(&tlist);
 
@@ -107,6 +111,8 @@
             break;
 
+	hillas.Draw();
         hillas.Print();
-	hillas.Draw();
+        hillasext.Print();
+        newimgpar.Print();
 
         display.FillPhotNum(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
Index: trunk/MagicSoft/Mars/macros/star.C
===================================================================
--- trunk/MagicSoft/Mars/macros/star.C	(revision 2009)
+++ trunk/MagicSoft/Mars/macros/star.C	(revision 2026)
@@ -52,11 +52,4 @@
 
     //
-    // Uncomment this two line if you want to use MHillasExt instead
-    // of MHillas
-    //
-    MHillasExt hext;
-    plist.AddToList(&hext);
-
-    //
     // The geometry container must be created by yourself to make sure
     // that you don't choose a wrong geometry by mistake
@@ -73,5 +66,5 @@
 
     // ------------- user change -----------------
-    read.AddFile("Pro*.root");
+    read.AddFile("data/Gamma_z*.root");
     //read.AddFile("Gam*.root");
 
@@ -90,4 +83,6 @@
     MWriteRootFile write("data/star_protons.root");
     write.AddContainer("MHillas",       "Events");
+    write.AddContainer("MHillasExt",    "Events");
+    write.AddContainer("MNewImagePar",  "Events");
     write.AddContainer("MMcEvt",        "Events");
     write.AddContainer("MHillasSrc",    "Events");