Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1102)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1103)
@@ -6,7 +6,12 @@
      - Changed MPARCONTAINER_H to MARS_MParContainer
 
-   * meventdisp/MGCamDisplay.cc, mmain/MAnalysis.cc:
+   * meventdisp/MGCamDisplay.cc:
      - added MMcPedestalCopy to task list
      - added MMcPedestalNSB  to task list
+
+   * mmain/MAnalysis.cc:
+     - added MMcPedestalCopy to task list
+     - added MMcPedestalNSB  to task list
+     - changed reader from MReadTree to MReadMarsFile
 
    * meventdisp/MGEvtDisplay.cc:
Index: trunk/MagicSoft/Mars/macros/MagicHillas.C
===================================================================
--- trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 1102)
+++ trunk/MagicSoft/Mars/macros/MagicHillas.C	(revision 1103)
@@ -65,15 +65,14 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree read("Events", filename);
-    MReadMarsFile  readhead("Events",filename);
+    MReadMarsFile  read("Events",filename);
     // read.AddFile("data/cer000019.root");
 
-    MMcPedestalCopy pedestals;
-    MMcPedestalNSB pedNSB;
-    MCerPhotCalc ncalc;
-    MImgCleanStd clean;
-    MHillasCalc  hcalc;
-    MFillH       hfill("MHillas", "MHHillas");
-    MFillH       sfill("MHillas", "MHStarMap");
+    MMcPedestalCopy pcopy;
+    MMcPedestalNSB  pnsb;
+    MCerPhotCalc    ncalc;
+    MImgCleanStd    clean;
+    MHillasCalc     hcalc;
+    MFillH          hfill("MHillas", "MHHillas");
+    MFillH          sfill("MHillas", "MHStarMap");
 
     //
@@ -85,7 +84,6 @@
 
     tlist.AddToList(&read);
-    tlist.AddToList(&readhead);
-    tlist.AddToList(&pedestals);
-    tlist.AddToList(&pedNSB);
+    tlist.AddToList(&pcopy);
+    tlist.AddToList(&pnsb);
     tlist.AddToList(&ncalc);
     tlist.AddToList(&clean);
Index: trunk/MagicSoft/Mars/macros/readMagic.C
===================================================================
--- trunk/MagicSoft/Mars/macros/readMagic.C	(revision 1102)
+++ trunk/MagicSoft/Mars/macros/readMagic.C	(revision 1103)
@@ -38,17 +38,15 @@
     plist.AddToList(&tlist);
 
-    MReadTree    read("Events", "~/data/camera.root");
-    MReadMarsFile    readhead("Events", "~/data/camera.root");
-    MMcPedestalCopy pedestals;
-    MMcPedestalNSB pedNSB;
-    MCerPhotCalc ncalc;
-    MClone       clone("MCerPhotEvt");
-    MImgCleanStd clean;
-    MHillasCalc  hcalc;
+    MReadMarsFile   read("Events", "~/data/camera.root");
+    MMcPedestalCopy pcopy;
+    MMcPedestalNSB  pnsb;
+    MCerPhotCalc    ncalc;
+    MClone          clone("MCerPhotEvt");
+    MImgCleanStd    clean;
+    MHillasCalc     hcalc;
 
     tlist.AddToList(&read);
-    tlist.AddToList(&readhead);
-    tlist.AddToList(&pedestals);
-    tlist.AddToList(&pedNSB);
+    tlist.AddToList(&pcopy);
+    tlist.AddToList(&pnsb);
     tlist.AddToList(&ncalc);
     tlist.AddToList(&clone);
Index: trunk/MagicSoft/Mars/mmain/MAnalysis.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 1102)
+++ trunk/MagicSoft/Mars/mmain/MAnalysis.cc	(revision 1103)
@@ -125,5 +125,5 @@
 #include "MHHillas.h"
 #include "MHStarMap.h"
-#include "MReadTree.h"
+#include "MReadMarsFile.h"
 #include "MMcPedestalCopy.h"  // MMcPedestalCopy
 #include "MMcPedestalNSB.h"   // MMcPedestalNSB
@@ -179,5 +179,5 @@
     //   CalEvents:  Calibration Events
     //
-    MReadTree read("Events", fInputFile);
+    MReadMarsFile read("Events", fInputFile);
 
     MMcPedestalCopy pcopy;