Index: trunk/MagicSoft/Mars/mhflux/MHAlpha.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHAlpha.cc	(revision 6926)
+++ trunk/MagicSoft/Mars/mhflux/MHAlpha.cc	(revision 6932)
@@ -57,5 +57,4 @@
 #include "MSrcPosCam.h"
 #include "MHillasSrc.h"
-#include "MEnergyEst.h"
 #include "MTime.h"
 #include "MObservatory.h"
@@ -116,5 +115,5 @@
     fHEnergy.UseCurrentStyle();
 
-    fHTheta.SetName("Theta");
+    fHTheta.SetName("ExcessTheta");
     fHTheta.SetTitle(" N_{exc} vs. \\Theta ");
     fHTheta.SetXTitle("\\Theta [\\circ]");
@@ -124,5 +123,5 @@
 
     // effective on time versus time
-    fHTime.SetName("Time");
+    fHTime.SetName("ExcessTime");
     fHTime.SetTitle(" N_{exc} vs. Time ");
     fHTime.SetXTitle("Time");
@@ -268,5 +267,5 @@
     }
     */
-    fEnergy = (MEnergyEst*)pl->FindObject("MEnergyEst");
+    fEnergy = (MParameterD*)pl->FindObject("MEnergyEst", "MParameterD");
     if (!fEnergy)
     { /*
@@ -277,5 +276,5 @@
         } */
 
-        *fLog << warn << "MEnergyEst not found... " << flush;
+        *fLog << warn << "MEnergyEst [MParameterD] not found... " << flush;
 
         if (!fHillas)
@@ -286,5 +285,5 @@
             *fLog << "ignored." << endl;
 
-        fHEnergy.SetName("Size");
+        fHEnergy.SetName("ExcessSize");
         fHEnergy.SetTitle(" N_{exc} vs. Size ");
         fHEnergy.SetXTitle("Size [\\gamma]");
@@ -292,5 +291,5 @@
     else
     {
-        fHEnergy.SetName("Energy");
+        fHEnergy.SetName("ExcessEnergy");
         fHEnergy.SetTitle(" N_{exc} vs. E_{est} ");
         fHEnergy.SetXTitle("E_{est} [GeV]");
@@ -488,5 +487,5 @@
         if (fHillas)
             size = fHillas->GetSize();
-        energy = fEnergy   ? fEnergy->GetEnergy() : (fHillas?fHillas->GetSize():1000);
+        energy = fEnergy   ? fEnergy->GetVal() : (fHillas?fHillas->GetSize():1000);
         theta  = fPointPos ? fPointPos->GetZd()   : 0;
     }
@@ -715,4 +714,6 @@
         pad->cd(2);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         fHEnergy.Draw();
 
@@ -737,4 +738,6 @@
         pad->cd(3);
         gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
         fHTime.Draw();
         AppendPad("time");
@@ -746,4 +749,6 @@
     {
         pad->cd(4);
+        gPad->SetGridx();
+        gPad->SetGridy();
         gPad->SetBorderMode(0);
         fHTheta.Draw();
@@ -910,5 +915,5 @@
         if (type==0)
         {
-            fMap[1] = fMatrix->AddColumn("MEnergyEst.fEnergy");
+            fMap[1] = fMatrix->AddColumn("MEnergyEst.fVal");
             fMap[2] = -1;
         }
Index: trunk/MagicSoft/Mars/mhflux/MHAlpha.h
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHAlpha.h	(revision 6926)
+++ trunk/MagicSoft/Mars/mhflux/MHAlpha.h	(revision 6932)
@@ -20,5 +20,4 @@
 class MParList;
 class MParameterD;
-class MEnergyEst;
 class MHillas;
 class MHMatrix;
@@ -96,5 +95,5 @@
 
     MParameterD  *fResult;      //!
-    MEnergyEst   *fEnergy;      //!
+    MParameterD  *fEnergy;      //!
     MHillas      *fHillas;      //!
     MPointingPos *fPointPos;    //!
Index: trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 6926)
+++ trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc	(revision 6932)
@@ -120,8 +120,8 @@
     }
 
-    fEnergy = (MEnergyEst*)plist->FindObject("MEnergyEst");
+    fEnergy = (MParameterD*)plist->FindObject("MEnergyEst", "MParameterD");
     if (!fEnergy)
     {
-        *fLog << err << "MEnergyEst not found... aborting." << endl;
+        *fLog << err << "MEnergyEst [MParameterD] not found... aborting." << endl;
         return kFALSE;
     }
@@ -160,5 +160,5 @@
 Bool_t MHEnergyEst::Fill(const MParContainer *par, const Stat_t w)
 {
-    const Double_t eest  = fEnergy->GetEnergy();
+    const Double_t eest  = fEnergy->GetVal();
     const Double_t etru  = fMatrix ? GetVal(0) : fMcEvt->GetEnergy();
     const Double_t imp   = fMatrix ? GetVal(1) : fMcEvt->GetImpact()/100;
@@ -185,8 +185,14 @@
     fResult->SetVal(sigma);
 
-    *fLog << all << "Mean log10(Energy) Resoltion: " << Form("%.1f%%", TMath::Sqrt(fChisq-fBias*fBias)*100) << endl;
-    *fLog << all << "Mean log10(Energy) Bias:      " << Form("%.1f%%", fBias*100) << endl;
+    Print();
 
     return kTRUE;
+}
+
+void MHEnergyEst::Print(Option_t *o) const
+{
+    *fLog << all;
+    *fLog << "Mean log10(Energy) Resoltion: " << Form("%5.2f%%", TMath::Sqrt(fChisq-fBias*fBias)) << endl;
+    *fLog << "Mean log10(Energy) Bias:      " << Form("%5.2f%%", fBias) << endl;
 }
 
@@ -298,4 +304,5 @@
     gPad->SetGridy();
 
+    // Results in crashes....
     //gROOT->GetListOfCleanups()->Add(gPad); // WHY?
 
@@ -315,6 +322,6 @@
 
     h2->Draw("");
-    h1->Draw("E3same");
-    h1->Draw("Chistsame");
+    h1->Draw("E3 hist C same");
+//    h1->Draw("Chistsame");
 
     return h1;
Index: trunk/MagicSoft/Mars/mhflux/MHEnergyEst.h
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHEnergyEst.h	(revision 6926)
+++ trunk/MagicSoft/Mars/mhflux/MHEnergyEst.h	(revision 6932)
@@ -15,5 +15,4 @@
 
 class MMcEvt;
-class MEnergyEst;
 class MParList;
 class MParameterD;
@@ -24,5 +23,5 @@
 private:
     MMcEvt      *fMcEvt;  //!
-    MEnergyEst  *fEnergy; //!
+    MParameterD *fEnergy; //!
     MParameterD *fResult; //!
 
@@ -54,4 +53,5 @@
     void Paint(Option_t *opt="");
     void Draw(Option_t *option="");
+    void Print(Option_t *o="") const;
 
     ClassDef(MHEnergyEst, 1) //