Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 952)
+++ trunk/MagicSoft/Mars/Changelog	(revision 953)
@@ -9,4 +9,7 @@
      - added entry field for cleaning levels
      - restructured code a bit
+
+   * mhist/MFillH.cc:
+     - fixed missing initialization of member variables in Init
 
    * mhist/MHHillas.[h,cc]:
@@ -14,5 +17,5 @@
      - Added DrawClone
      - Removed kCanDelete bits from Draw function
-     
+
    * mhist/MHStarMap.[h,cc]:
      - Added comments
Index: trunk/MagicSoft/Mars/mhist/MFillH.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 952)
+++ trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 953)
@@ -62,4 +62,7 @@
     *fName  = name  ? name  : "MFillH";
     *fTitle = title ? title : "Task to fill Mars histograms";
+
+    fH            = NULL;
+    fParContainer = NULL;
 }
 
@@ -160,5 +163,5 @@
 
     return kTRUE;
-} 
+}
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mmain/MAnalysis.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 952)
+++ trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 953)
@@ -165,4 +165,5 @@
 // ======================================================================
 
+#include "MLog.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -178,5 +179,5 @@
 #include "MEvtLoop.h"
 #include "MHillas.h"
-
+#include <iostream.h>
 void MAnalysis::CalculateHillas() const
 {
@@ -212,4 +213,5 @@
     plist.AddToList(&tlist);
 
+
     //
     // The geometry container must be created by yourself to make sure
@@ -221,17 +223,4 @@
     MPedestalCam pedest;
     plist.AddToList(&pedest);
-
-    //
-    // The Hillas histograms (MHHillas) could be created automatically
-    // but to make sure, that they are not deleted when the macro is
-    // finished you must create them yourself and add it to the list
-    //
-    MHillas hillas;
-    plist.AddToList(&hillas);
-
-    MHHillas  hists;
-    MHStarMap smap;
-    plist.AddToList(&hists);
-    plist.AddToList(&smap);
 
     //
@@ -261,6 +250,6 @@
     tlist.AddToList(&hcalc);
 
-    MFillH hfill(&hillas, &hists);
-    MFillH sfill(&hillas, &smap);
+    MFillH hfill("MHillas", "MHHillas");
+    MFillH sfill("MHillas", "MHStarMap");
 
     if (displhillas)
@@ -286,8 +275,8 @@
     //
     if (displhillas)
-        hists.DrawClone();
+        plist.FindObject("MHHillas")->DrawClone();
 
     if (displstarmap)
-        smap.DrawClone();
+        plist.FindObject("MHStarMap")->DrawClone();
 
     cout << endl;