Index: trunk/MagicSoft/Mars/macros/star.C
===================================================================
--- trunk/MagicSoft/Mars/macros/star.C	(revision 1846)
+++ trunk/MagicSoft/Mars/macros/star.C	(revision 1847)
@@ -16,5 +16,5 @@
 !
 !
-!   Author(s): Thomas Bretz  5/2002 <mailto:(tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz  5/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2002
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEst.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEst.h	(revision 1846)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEst.h	(revision 1847)
@@ -22,5 +22,5 @@
     void Print(Option_t *o="") const;
 
-    ClassDef(MEnergyEst, 0) // Storage Container for the estimated Energy
+    ClassDef(MEnergyEst, 1) // Storage Container for the estimated Energy
 };
 
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h	(revision 1846)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h	(revision 1847)
@@ -41,5 +41,5 @@
 
 public:
-    MEnergyEstParam(const char *hil="Hillas", const char *name=NULL, const char *title=NULL);
+    MEnergyEstParam(const char *hil="MHillas", const char *name=NULL, const char *title=NULL);
     ~MEnergyEstParam();
 
Index: trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc	(revision 1846)
+++ trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc	(revision 1847)
@@ -138,5 +138,5 @@
   if (!fMcEvt)
     {
-       *fLog << err << dbginf << "MPadSchweizer::PreProcess : MMcEvt not found... aborting." << endl;
+       *fLog << err << dbginf << "MMcEvt not found... aborting." << endl;
        return kFALSE;
      }
@@ -145,5 +145,5 @@
    if (!fPed)
      {
-       *fLog << dbginf << "MPadSchweizer::PreProcess : MPedestalCam not found... aborting." << endl;
+       *fLog << dbginf << "MPedestalCam not found... aborting." << endl;
        return kFALSE;
      }
@@ -152,5 +152,5 @@
    if (!fCam)
      {
-       *fLog << dbginf << "MPadSchweizer::PreProcess : MGeomCam not found (no geometry information available)... aborting." << endl;
+       *fLog << dbginf << "MGeomCam not found (no geometry information available)... aborting." << endl;
        return kFALSE;
      }
@@ -159,5 +159,5 @@
    if (!fEvt)
      {
-       *fLog << dbginf << "MPadSchweizer::PreProcess : MCerPhotEvt not found... aborting." << endl;
+       *fLog << dbginf << "MCerPhotEvt not found... aborting." << endl;
        return kFALSE;
      }
@@ -166,5 +166,5 @@
    if (!fSigmabar)
      {
-       *fLog << dbginf << "MPadSchweizer::PreProcess : MSigmabar not found... aborting." << endl;
+       *fLog << dbginf << "MSigmabar not found... aborting." << endl;
        return kFALSE;
      }
@@ -174,5 +174,5 @@
    if (!binstheta)
      {
-       *fLog << err << dbginf << "MPadSchweizer::PreProcess : BinningTheta not found... aborting." << endl;
+       *fLog << err << dbginf << "BinningTheta not found... aborting." << endl;
        return kFALSE;      
      }
@@ -182,5 +182,5 @@
    if (!binssigma)
      {
-       *fLog << err << dbginf << "MPadSchweizer::PreProcess : BinningSigmabar not found... aborting." << endl;
+       *fLog << err << dbginf << "BinningSigmabar not found... aborting." << endl;
        return kFALSE;      
      }
@@ -190,5 +190,5 @@
    if (!binsdiff)
      {
-       *fLog << err << dbginf << "MHSigmaTheta::SetupFill : BinningDiffsigma2 not found... aborting." << endl;
+       *fLog << err << dbginf << "BinningDiffsigma2 not found... aborting." << endl;
        return kFALSE;      
      }
Index: trunk/MagicSoft/Mars/manalysis/MSelFinal.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MSelFinal.h	(revision 1846)
+++ trunk/MagicSoft/Mars/manalysis/MSelFinal.h	(revision 1847)
@@ -40,5 +40,5 @@
 
 public:
-    MSelFinal(const char *HilName, const char *HilSrcName,
+    MSelFinal(const char *HilName="MHillas", const char *HilSrcName="MHillasSrc",
               const char *name=NULL, const char *title=NULL);
 
Index: trunk/MagicSoft/Mars/manalysis/MSelStandard.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MSelStandard.h	(revision 1846)
+++ trunk/MagicSoft/Mars/manalysis/MSelStandard.h	(revision 1847)
@@ -35,5 +35,5 @@
 
 public:
-    MSelStandard(const char *HilName, const char *HilSrcName,
+    MSelStandard(const char *HilName="MHillas", const char *HilSrcName="MHillasSrc",
                  const char *name=NULL, const char *title=NULL);