Skip to content
Snippets Groups Projects
Commit d352ad6a authored by Bertram Kopf's avatar Bertram Kopf
Browse files

modified some parts for dependencies of fit parameters III

parent 1bfac92f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MinFunctions/AbsPawianMinimizer.cc
+ 1
− 1
View file @ d352ad6a
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
AbsPawianMinimizer::AbsPawianMinimizer(std::shared_ptr<AbsFcn> theAbsFcnPtr, std::shared_ptr<AbsPawianParameters> upar) : AbsPawianMinimizer::AbsPawianMinimizer(std::shared_ptr<AbsFcn> theAbsFcnPtr, std::shared_ptr<AbsPawianParameters> upar) :
_absFcn(theAbsFcnPtr) _absFcn(theAbsFcnPtr)
,_startPawianParams(upar) ,_startPawianParams(upar)
,_bestPawianParams(upar) ,_bestPawianParams(upar->Clone())
,_minimumReached(false) ,_minimumReached(false)
,_finalLh(10000000.) ,_finalLh(10000000.)
{ {
......
MinFunctions/MinuitMinimizer.cc
+ 4
− 2
View file @ d352ad6a
...@@ -60,7 +60,8 @@ void MinuitMinimizer::minimize(){ ...@@ -60,7 +60,8 @@ void MinuitMinimizer::minimize(){
// return funcMin; // return funcMin;
_minimumReached=true; _minimumReached=true;
_mnFunctionMinimumFinalPtr=std::shared_ptr<FunctionMinimum>(new FunctionMinimum(currentFunctionMinimum)); _mnFunctionMinimumFinalPtr=std::shared_ptr<FunctionMinimum>(new FunctionMinimum(currentFunctionMinimum));
_bestPawianParams=std::shared_ptr<AbsPawianParameters>(new MnPawianParameters(_mnFunctionMinimumFinalPtr->UserParameters())); // _bestPawianParams=std::shared_ptr<AbsPawianParameters>(new MnPawianParameters(_mnFunctionMinimumFinalPtr->UserParameters()));
_bestPawianParams->SetAllValues(_mnFunctionMinimumFinalPtr->UserParameters().Params());
ParamDepHandler::instance()->ApplyDependencies(_bestPawianParams); ParamDepHandler::instance()->ApplyDependencies(_bestPawianParams);
return; return;
} }
...@@ -100,7 +101,8 @@ void MinuitMinimizer::minimize(){ ...@@ -100,7 +101,8 @@ void MinuitMinimizer::minimize(){
} }
_minimumReached=true; _minimumReached=true;
_mnFunctionMinimumFinalPtr=std::shared_ptr<FunctionMinimum>(new FunctionMinimum(currentFunctionMinimum)); _mnFunctionMinimumFinalPtr=std::shared_ptr<FunctionMinimum>(new FunctionMinimum(currentFunctionMinimum));
_bestPawianParams=std::shared_ptr<AbsPawianParameters>(new MnPawianParameters(_mnFunctionMinimumFinalPtr->UserParameters())); // _bestPawianParams=std::shared_ptr<AbsPawianParameters>(new MnPawianParameters(_mnFunctionMinimumFinalPtr->UserParameters()));
_bestPawianParams->SetAllValues(_mnFunctionMinimumFinalPtr->UserParameters().Params());
ParamDepHandler::instance()->ApplyDependencies(_bestPawianParams); ParamDepHandler::instance()->ApplyDependencies(_bestPawianParams);
} }
......
Particle/pdtNew.table
+ 1
− 0
View file @ d352ad6a
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# #
# type name texName 3*Q 2*J P C G 2*I 2*I3 S C mass width dyn.f comment # type name texName 3*Q 2*J P C G 2*I 2*I3 S C mass width dyn.f comment
# #
Meson etaMatrix etaMatrix 0 0 -1 1 1 0 0 0 0 1. 0.1 relBW [PDG no idea]
Meson f2Matrix f_2Matrix 0 4 1 1 1 0 0 0 0 1. 0.1 relBW [PDG no idea] Meson f2Matrix f_2Matrix 0 4 1 1 1 0 0 0 0 1. 0.1 relBW [PDG no idea]
Meson h1Matrix h_1Matrix 0 2 1 -1 -1 0 0 0 0 1. 0.1 relBW [PDG no idea] Meson h1Matrix h_1Matrix 0 2 1 -1 -1 0 0 0 0 1. 0.1 relBW [PDG no idea]
Meson eta \eta 0 0 -1 1 1 0 0 0 0 0.547(+0.01-0.01) 0.0001 relBW [PDG nonett 1^1S_0] Meson eta \eta 0 0 -1 1 1 0 0 0 0 0.547(+0.01-0.01) 0.0001 relBW [PDG nonett 1^1S_0]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment