Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1861)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1862)
@@ -5,4 +5,17 @@
       - now energy estimation (for CT1) is done using the same model 
 	as in D.Krannich's thesis.
+
+
+
+ 2003/03/24: Thomas Bretz
+
+    * manalysis/MHillasSrcCalc.[h,cc]:
+      - removed last argument in constructor, replaced by SetInput
+
+    * mfilter/MFEventSelector.[h,cc]:
+      - removed unnecessary last argument
+
+
+
 
  2003/03/21: Thomas Hengstebeck
Index: trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc	(revision 1861)
+++ trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc	(revision 1862)
@@ -70,6 +70,5 @@
 //
 MHillasSrcCalc::MHillasSrcCalc(const char *src, const char *hil,
-                               const char *name, const char *title,
-                               const char *hilinput)
+                               const char *name, const char *title)
     : fHillas(NULL), fSrcPos(NULL), fHillasSrc(NULL)
 {
@@ -77,7 +76,7 @@
     fTitle = title ? title : gsDefTitle.Data();
 
-    fSrcName    = src;
-    fHillasName = hil;
-    fHillasInput = hilinput;
+    fSrcName     = src;
+    fHillasName  = hil;
+    fHillasInput = "MHillas";
 }
 
@@ -86,5 +85,5 @@
 Bool_t MHillasSrcCalc::PreProcess(MParList *pList)
 {
-    fHillas = (MHillas*)pList->FindObject(fHillasInput);
+    fHillas = (MHillas*)pList->FindObject(fHillasInput, "MHillas");
     if (!fHillas)
     {
Index: trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h	(revision 1861)
+++ trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h	(revision 1862)
@@ -34,6 +34,7 @@
 
     MHillasSrcCalc(const char *src="MSrcPosCam", const char *hil="MHillasSrc",
-                   const char *name=NULL, const char *title=NULL,
-                   const char *hilinput="MHillas");
+                   const char *name=NULL, const char *title=NULL);
+
+    void SetInput(TSTring hilname) { fHillasName = hilname; }
 
     ClassDef(MHillasSrcCalc, 1) // task to calculate the source position depandant hillas parameters
Index: trunk/MagicSoft/Mars/mfilter/MFEventSelector.cc
===================================================================
--- trunk/MagicSoft/Mars/mfilter/MFEventSelector.cc	(revision 1861)
+++ trunk/MagicSoft/Mars/mfilter/MFEventSelector.cc	(revision 1862)
@@ -94,12 +94,9 @@
 // the class description above.
 //
-MFEventSelector::MFEventSelector(const char *name, const char *title,
-                                 const char *read)
+MFEventSelector::MFEventSelector(const char *name, const char *title)
 : fNumTotalEvts(-1), fNumSelectEvts(-1), fSelRatio(-1), fNumSelectedEvts(0)
 {
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
-
-    fRead = read;
 }
 
@@ -132,5 +129,6 @@
             return kFALSE;
         }
-        MRead *read = (MRead*)tlist->FindObject(fRead);
+
+        MRead *read = (MRead*)tlist->FindObject("MRead");
         if (!read)
         {
Index: trunk/MagicSoft/Mars/mfilter/MFEventSelector.h
===================================================================
--- trunk/MagicSoft/Mars/mfilter/MFEventSelector.h	(revision 1861)
+++ trunk/MagicSoft/Mars/mfilter/MFEventSelector.h	(revision 1862)
@@ -24,5 +24,4 @@
 
     Bool_t  fResult;
-    TString fRead;
 
     void StreamPrimitive(ofstream &out) const;
@@ -41,6 +40,5 @@
 public:
     // MFEventSelector();
-    MFEventSelector(const char *name=NULL, const char *title=NULL,
-                    const char *read="MRead");
+    MFEventSelector(const char *name=NULL, const char *title=NULL);
     ~MFEventSelector();