Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc	(revision 1847)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc	(revision 1852)
@@ -177,5 +177,5 @@
 // --------------------------------------------------------------------------
 //
-// Set the four coefficients for the estimation of the impact parameter.
+// Set the five coefficients for the estimation of the impact parameter.
 // Argument must ba a TArrayD of size 5.
 //
@@ -193,5 +193,5 @@
 // --------------------------------------------------------------------------
 //
-// Set the four coefficients for the estimation of the energy.
+// Set the seven coefficients for the estimation of the energy.
 // Argument must ba a TArrayD of size 7.
 //
@@ -209,5 +209,5 @@
 // --------------------------------------------------------------------------
 //
-// Set the four coefficients for the estimation of impact and energy.
+// Set the twelve coefficients for the estimation of impact and energy.
 // Argument must ba a TArrayD of size 12.
 //
@@ -261,4 +261,12 @@
 }
 
+void MEnergyEstParam::StopMapping()
+{
+    fMatrix = NULL; 
+    fPairs->Clear();
+    fHillasSrc->Clear();
+    fEnergy->Clear();
+}
+
 // --------------------------------------------------------------------------
 //
@@ -272,4 +280,12 @@
 
     AddToBranchList(hillas+".fDist");
+}
+
+void MEnergyEstParam::Print(Option_t *opt)
+{
+    for (int i=0; i<fA.GetSize(); i++)
+      *fLog << all << "fA[" << i << "]=" << fA[i] << endl;
+    for (int i=0; i<fB.GetSize(); i++)
+      *fLog << all << "fB[" << i << "]=" << fB[i] << endl;
 }
 
@@ -295,10 +311,10 @@
 
     /* MY PARAM */
-    const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*width;
-    const Double_t e2 = fB[2] + fB[5]*size*width;
+    //const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*width;
+    //const Double_t e2 = fB[2] + fB[5]*size*width;
 
     /* MARCOS */
-    //const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*length;
-    //const Double_t e2 = fB[2] + fB[5]*length;
+    const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*length;
+    const Double_t e2 = fB[2] + fB[5]*length;
 
     TIter NextH(fHillasSrc);
@@ -317,11 +333,11 @@
 
         /* MARCOS */
-        //const Double_t ir = i0 * (i1 + fA[1]*dist); // [cm]
-        /*const*/// Double_t er = e0 * (e1 + e2*ir);      // [GeV]
+        const Double_t ir = i0 * (i1 + fA[1]*dist); // [cm]
+        /*const*/ Double_t er = e0 * (e1 + e2*0/*ir*/);      // [GeV]
 
         /* MY PARAM */
         // if (width==0) return kCONTINUE;
-        const Double_t ir = i0 * (i1 + dist*(fA[1]/width + fA[4]/log10(size))); // [cm]
-        Double_t er = e0 * (e1 + e2*ir);      // [GeV]
+        //const Double_t ir = i0 * (i1 + dist*(fA[1]/width + fA[4]/log10(size))); // [cm]
+        //Double_t er = e0 * (e1 + e2*ir);      // [GeV]
 
         /* MKA */
@@ -339,5 +355,5 @@
         }
 
-        est->SetEnergy(er);
+	est->SetEnergy(er);
         est->SetImpact(ir);
         est->SetReadyToSave();
Index: trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h	(revision 1847)
+++ trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h	(revision 1852)
@@ -50,4 +50,5 @@
 
     void InitMapping(MHMatrix *mat);
+    void StopMapping();
 
     Int_t GetNumCoeff() const { return fA.GetSize()+fB.GetSize(); }
@@ -57,4 +58,6 @@
     void SetCoeffB(const TArrayD &arr);
 
+    void Print(Option_t *o=NULL);
+
     ClassDef(MEnergyEstParam, 0) // Task to estimate the energy
 };