Index: trunk/MagicSoft/Mars/mimage/MHillasCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mimage/MHillasCalc.cc	(revision 2028)
+++ trunk/MagicSoft/Mars/mimage/MHillasCalc.cc	(revision 2029)
@@ -16,8 +16,8 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!   Author(s): Harald Kornmayer 1/2001 (harald@mppmu.mpg.de)
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Harald Kornmayer, 1/2001
 !
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -54,5 +54,4 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-
 #include "MHillasCalc.h"
 
@@ -75,13 +74,9 @@
 //
 MHillasCalc::MHillasCalc(const char *name, const char *title)
+    : fHilName("MHillas"), fHilExtName("MHillasExt"),
+    fImgParName("MNewImagePar"), fFlags(0xff)
 {
     fName  = name  ? name  : "MHillasCalc";
     fTitle = title ? title : "Calculate Hillas parameters";
-
-    fHilName    = "MHillas";
-    fHilExtName = "MHillasExt";
-    fImgParName = "MNewImagePar";
-
-    fFlags = 0xff;
 }
 
@@ -89,6 +84,7 @@
 //
 // Check for a MCerPhotEvt object from which the Hillas are calculated.
-// Try to find the Geometry conatiner. And try to find the output
-// (Hillas) container or create one.
+// Try to find the Geometry conatiner. Depending on the flags
+// try to find (and maybe create) the containers MHillas, MHillasExt,
+// MNewImagePar, too.
 //
 Bool_t MHillasCalc::PreProcess(MParList *pList)
@@ -110,5 +106,5 @@
     }
 
-    // sometimes necessary
+    // depend on whether MHillas is an in- or output container
     if (TestFlag(kCalcHillas))
         fHillas = (MHillas*)pList->FindCreateObj("MHillas", fHilName);
@@ -121,4 +117,5 @@
         return kFALSE;
 
+    // if enabled
     if (TestFlag(kCalcHillasExt))
     {
@@ -128,4 +125,5 @@
     }
 
+    // if enabled
     if (TestFlag(kCalcNewImagePar))
     {