Index: trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 6924)
+++ trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 6932)
@@ -12,5 +12,4 @@
 #pragma link C++ class MMultiDimDistCalc+;
 
-#pragma link C++ class MEnergyEst+;
 #pragma link C++ class MEnergyEstimate+;
 
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 6924)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 6932)
@@ -47,5 +47,5 @@
 
 #include "MDataChain.h"
-#include "MEnergyEst.h"
+#include "MParameters.h"
 
 #include "MLog.h"
@@ -107,5 +107,5 @@
 Int_t MEnergyEstimate::PreProcess(MParList *plist)
 {
-    fEnergy = (MEnergyEst*)plist->FindCreateObj("MEnergyEst");
+    fEnergy = (MParameterD*)plist->FindCreateObj("MParameterD", "MEnergyEst");
     if (!fEnergy)
         return kFALSE;
@@ -130,7 +130,20 @@
         return kCONTINUE;
 
-    fEnergy->SetEnergy(val);
+    fEnergy->SetVal(val);
     fEnergy->SetReadyToSave();
     return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Print the rule used for energy estimation
+//
+void MEnergyEstimate::Print(Option_t *o) const
+{
+    *fLog << all << GetDescriptor() << ":";
+    if (!fData)
+        *fLog << " <n/a>" << endl;
+    else
+        *fLog << endl << fData->GetRule() << endl;
 }
 
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.h	(revision 6924)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.h	(revision 6932)
@@ -7,11 +7,11 @@
 
 class MData;
-class MEnergyEst;
+class MParameterD;
 
 class MEnergyEstimate : public MTask
 {
 private:
-    MData      *fData;    //->
-    MEnergyEst *fEnergy;
+    MData       *fData;    //->
+    MParameterD *fEnergy;  //!
 
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print=kFALSE);
@@ -28,5 +28,7 @@
     void SetVariables(const TArrayD &);
 
-    ClassDef(MEnergyEstimate, 0) // Task to estimate the energy by a rule
+    void Print(Option_t *o="") const;
+
+    ClassDef(MEnergyEstimate, 1) // Task to estimate the energy by a rule
 };
 
Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 6924)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 6932)
@@ -28,5 +28,4 @@
 SRCFILES = MGeomApply.cc \
            MCameraData.cc \
-           MEnergyEst.cc \
            MEnergyEstimate.cc \
            MMatrixLoop.cc \