Index: trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.cc
===================================================================
--- trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.cc	(revision 8671)
+++ trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.cc	(revision 8679)
@@ -178,5 +178,7 @@
 
     MChisqEval eval;
-    eval.SetY1("sqrt(ThetaSquared.fVal)");
+    eval.SetY1(fUseThetaSq?"ThetaSquared.fVal":"sqrt(ThetaSquared.fVal)");
+    if (weights)
+        eval.SetNameWeight();
 
     MMatrixLoop loop(&m);
Index: trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.h
===================================================================
--- trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.h	(revision 8671)
+++ trunk/MagicSoft/Mars/mjoptim/MJOptimizeDisp.h	(revision 8679)
@@ -10,6 +10,11 @@
 class MJOptimizeDisp : public MJOptimize
 {
+private:
+    Bool_t fUseThetaSq;
+
 public:
-    MJOptimizeDisp() : MJOptimize() { }
+    MJOptimizeDisp() : MJOptimize(), fUseThetaSq(kFALSE) { }
+
+    void EnableThetaSq(Bool_t b=kTRUE) { fUseThetaSq=b; }
 
     // Special optimizing routines
Index: trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.cc
===================================================================
--- trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.cc	(revision 8671)
+++ trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.cc	(revision 8679)
@@ -66,4 +66,5 @@
 // histograms
 #include "../mhflux/MHEnergyEst.h"
+#include "../mtools/MChisqEval.h"
 
 // tasks
@@ -108,4 +109,5 @@
     MHMatrix m("M");
     AddRulesToMatrix(m);
+    const Int_t map = m.AddColumn("MMcEvt.fEnergy");
     parlist.AddToList(&m);
 
@@ -136,4 +138,9 @@
         fill.SetWeight();
 
+    MChisqEval eval;
+    eval.SetY1(fOptimLog?Form("log10(MEnergyEst.fVal/M[%d])", map):Form("MEnergyEst.fVal-M[%d]", map));
+    if (weights)
+        eval.SetNameWeight();
+
     MMatrixLoop loop(&m);
 
@@ -143,4 +150,5 @@
         tasklist.AddToList(weights);
     tasklist.AddToList(&fill);
+    tasklist.AddToList(&eval);
 
     // Optimize with the tasklist in this parameterlist
Index: trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.h
===================================================================
--- trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.h	(revision 8671)
+++ trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.h	(revision 8679)
@@ -10,6 +10,11 @@
 class MJOptimizeEnergy : public MJOptimize
 {
+private:
+    Bool_t fOptimLog;
+
 public:
-    MJOptimizeEnergy() : MJOptimize() { }
+    MJOptimizeEnergy() : MJOptimize(), fOptimLog(kFALSE) { }
+
+    void EnableOptimLog(Bool_t b=kTRUE) { fOptimLog=b; }
 
     // Special optimizing routines