Index: trunk/MagicSoft/Mars/macros/dohtml.C
===================================================================
--- trunk/MagicSoft/Mars/macros/dohtml.C	(revision 2717)
+++ trunk/MagicSoft/Mars/macros/dohtml.C	(revision 2744)
@@ -38,4 +38,5 @@
     sourcedir += "manalysis:";
     sourcedir += "mbase:";
+    sourcedir += "mcalib:";
     sourcedir += "mdata:";
     sourcedir += "mfileio:";
@@ -43,4 +44,5 @@
     sourcedir += "mgeom:";
     sourcedir += "mgui:";
+    sourcedir += "mhbase:";
     sourcedir += "mhist:";
     sourcedir += "mhistmc:";
Index: trunk/MagicSoft/Mars/macros/estfit.C
===================================================================
--- trunk/MagicSoft/Mars/macros/estfit.C	(revision 2717)
+++ trunk/MagicSoft/Mars/macros/estfit.C	(revision 2744)
@@ -10,4 +10,5 @@
 #include "MChisqEval.h"
 #include "MMatrixLoop.h"
+#include "MParameterD.h"
 #include "MDataMember.h"
 #include "MDataElement.h"
@@ -20,7 +21,8 @@
     MEvtLoop *evtloop = (MEvtLoop*)gMinuit->GetObjectFit();
 
-    MTaskList *tlist  = (MTaskList*)evtloop->GetParList()->FindObject("MTaskList"); //GetTaskList();
-
-    MChisqEval      *eval = (MChisqEval*)     tlist->FindObject("MChisqEval");
+    MParList  *plist  = evtloop->GetParList();
+    MTaskList *tlist  = evtloop->GetTaskList();
+
+    MChisqEval      *eval = (MChisqEval*)     plist->FindObject("MFitResult", "MParameterD");
     MEnergyEstParam *eest = (MEnergyEstParam*)tlist->FindObject("MEnergyEstParam");
 
@@ -29,5 +31,5 @@
     evtloop->Eventloop();
 
-    f = eval->GetChisq();
+    f = eval->GetVal();
 }
 
Index: trunk/MagicSoft/Mars/macros/rootlogon.C
===================================================================
--- trunk/MagicSoft/Mars/macros/rootlogon.C	(revision 2717)
+++ trunk/MagicSoft/Mars/macros/rootlogon.C	(revision 2744)
@@ -100,4 +100,5 @@
     gInterpreter->AddIncludePath(dir+"manalysis");
     gInterpreter->AddIncludePath(dir+"mbase");
+    gInterpreter->AddIncludePath(dir+"mcalib");
     gInterpreter->AddIncludePath(dir+"mdata");
     gInterpreter->AddIncludePath(dir+"mfileio");
@@ -105,4 +106,5 @@
     gInterpreter->AddIncludePath(dir+"mgeom");
     gInterpreter->AddIncludePath(dir+"mgui");
+    gInterpreter->AddIncludePath(dir+"mhbase");
     gInterpreter->AddIncludePath(dir+"mhist");
     gInterpreter->AddIncludePath(dir+"mhistmc");