Changeset 8679 for trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.cc

Timestamp:

08/19/07 22:40:04 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mjoptim/MJOptimizeEnergy.cc

@@ -66 +66 @@
 // histograms
 #include "../mhflux/MHEnergyEst.h"
+#include "../mtools/MChisqEval.h"
 
 // tasks
@@ -108 +109 @@
     MHMatrix m("M");
     AddRulesToMatrix(m);
+    const Int_t map = m.AddColumn("MMcEvt.fEnergy");
     parlist.AddToList(&m);
 
@@ -136 +138 @@
         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 +150 @@
         tasklist.AddToList(weights);
     tasklist.AddToList(&fill);
+    tasklist.AddToList(&eval);
 
     // Optimize with the tasklist in this parameterlist