Changeset 2744 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

12/22/03 20:35:39 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.cc

@@ -60 +60 @@
 #include "MLog.h"
 #include "MLogManip.h"
+#include "MParameters.h"
 
 ClassImp(MMcEnergyEst);
@@ -71 +72 @@
 static void fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag)
 {
-  MEvtLoop *evtloop = (MEvtLoop*)gMinuit->GetObjectFit();
- 
-  MTaskList *tlist  = (MTaskList*)evtloop->GetParList()->FindObject("MTaskList"); // GetTaskList();
-
-  MChisqEval      *eval = (MChisqEval*)     tlist->FindObject("MChisqEval");
-  MEnergyEstParam *eest = (MEnergyEstParam*)tlist->FindObject("MEnergyEstParam");
-
-  eest->SetCoeff(TArrayD(eest->GetNumCoeff(), par));
-
-  evtloop->Eventloop();
-
-  f = eval->GetChisq();
+    MEvtLoop *evtloop = (MEvtLoop*)gMinuit->GetObjectFit();
+
+    MParList  *plist  = evtloop->GetParList();
+    MTaskList *tlist  = evtloop->GetTaskList();
+
+    MParameterD     *eval = (MParameterD*)    plist->FindObject("MFitResult", "MParameterD");
+    MEnergyEstParam *eest = (MEnergyEstParam*)tlist->FindObject("MEnergyEstParam");
+
+    eest->SetCoeff(TArrayD(eest->GetNumCoeff(), par));
+
+    evtloop->Eventloop();
+
+    f = eval->GetVal();
 }
 
@@ -340 +342 @@
 
 }
-
-