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

bug fixes in EvoMinimizer and MinuitMinimizer

parent 86278498
No related branches found
No related tags found
No related merge requests found
......@@ -97,10 +97,10 @@ serverPort = 25374
serverAddress = localhost
noOfClients = 2
noOfThreads = 2
evoIterations = 20
evoIterations = 50
evoPopulation = 160
calcContribution = eta(2225) withZeroAmp Tof2(1910)
calcContribution = f2(1910) withZeroAmp Toeta(2225)
contributionError = true
saveContributionHistos = true
\ No newline at end of file
saveContributionHistos = true
J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonMag 0.03221857758687463 1
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonMag 0.05154027847802761 0.5773502691896258
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.05559266877334981 0.5773502691896258
J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.07319688518749412 0.5773502691896258
J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonPhi 0.3 0.3
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonPhi 0.219361624941777 0.3
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonPhi 0.199228918763189 0.3
J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonPhi 0.1772108594845928 0.3
L1S1_eta(2225)Toomega1_omega2Mag 1 1
L0S2_f2(1910)Toomega1_omega2Mag 0.5 0.5
L2S0_f2(1910)Toomega1_omega2Mag 0.08162266655774181 0.5
L2S2_f2(1910)Toomega1_omega2Mag 0.08282620993352158 0.5
L4S2_f2(1910)Toomega1_omega2Mag 0.08884013531858953 0.5
L1S0_omega1Topion1+_pion1-_pion10Mag 1 1
L1S0_omega2Topion2+_pion2-_pion20Mag 1 1
L1S1_eta(2225)Toomega1_omega2Phi 0.3 0.3
L0S2_f2(1910)Toomega1_omega2Phi 0.3 0.3
L2S0_f2(1910)Toomega1_omega2Phi 0.265768489732713 0.3
L2S2_f2(1910)Toomega1_omega2Phi 0.2085823023640403 0.3
L4S2_f2(1910)Toomega1_omega2Phi 0.1754685877406709 0.3
L1S0_omega1Topion1+_pion1-_pion10Phi 0.3 0.3
L1S0_omega2Topion2+_pion2-_pion20Phi 0.3 0.3
eta(2225)Mass 0.002364808493733772 0.03
f2(1910)Mass 0.00518870543626726 0.03
eta(2225)Width 0.006651454977416843 0.03
f2(1910)Width 0.01393927501757786 0.034
channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScalingOther 0.01 0.01
J0P-1C1L0S0pbarpMag 4.824543398404711 0.5773502691896258
J1P1C1L1S1pbarpMag 0.6107824844471061 0.5773502691896258
J2P1C1L1S1pbarpMag 0.08533387192041107 0.5773502691896258
J0P-1C1L0S0pbarpPhi 0 0.3
J1P1C1L1S1pbarpPhi 0 0.3
J2P1C1L1S1pbarpPhi 5.00234618855102 0.3
L2S2_J0P-1C1Toa2(1320)0AB_pion0ABMag 1 1
L2S2_J0P-1C1Tof2(1270)_etaMag 7.799107296322962 1
L1S2_J1P1C1Toa2(1320)0AB_pion0ABMag 0.7071067811865475 0.7071067811865475
L3S2_J1P1C1Toa2(1320)0AB_pion0ABMag 7.87631810998643 0.7071067811865475
L1S2_J1P1C1Tof2(1270)_etaMag 11.04469742651748 0.7071067811865475
L3S2_J1P1C1Tof2(1270)_etaMag 0.2010901365976235 0.7071067811865475
L1S2_J2P1C1Toa2(1320)0AB_pion0ABMag 0.7071067811865475 0.7071067811865475
L3S2_J2P1C1Toa2(1320)0AB_pion0ABMag 0.556084552361552 0.7071067811865475
L1S2_J2P1C1Tof2(1270)_etaMag 4.01281252216795 0.7071067811865475
L3S2_J2P1C1Tof2(1270)_etaMag 1.909296656989275 0.7071067811865475
L2S0_a2(1320)0ABTopion0AB_etaMag 1 1
L2S0_f2(1270)Topion0A_pion0BMag 1 1
L2S2_J0P-1C1Toa2(1320)0AB_pion0ABPhi 0 0.3
L2S2_J0P-1C1Tof2(1270)_etaPhi -5.34588070395471 0.3
L1S2_J1P1C1Toa2(1320)0AB_pion0ABPhi 0 0.3
L3S2_J1P1C1Toa2(1320)0AB_pion0ABPhi 0.3757920167832215 0.3
L1S2_J1P1C1Tof2(1270)_etaPhi 1.503286443762582 0.3
L3S2_J1P1C1Tof2(1270)_etaPhi 5.261263959693275 0.3
L1S2_J2P1C1Toa2(1320)0AB_pion0ABPhi 0 0.3
L3S2_J2P1C1Toa2(1320)0AB_pion0ABPhi 2.506515585905944 0.3
L1S2_J2P1C1Tof2(1270)_etaPhi 4.037115409096568 0.3
L3S2_J2P1C1Tof2(1270)_etaPhi -0.649900549799784 0.3
L2S0_a2(1320)0ABTopion0AB_etaPhi 0 0.3
L2S0_f2(1270)Topion0A_pion0BPhi 0 0.3
a2(1320)0ABMass 1.318 0.03
f2(1270)Mass 1.275 0.03
a2(1320)0ABWidth 0.107 0.0214
f2(1270)Width 0.185 0.037
Iso1J0P-1C1Range01Other 0 0.5
Iso1J1P1C1Range01Other 0 0.5
Iso1J2P1C1Range01Other 0 0.5
channelType1Topion0Apion0BetachannelScalingOther 1 0.01
J0P-1C1L0S0pbarpMag 0.02503213194490062 0.5773502691896258
J1P1C1L1S1pbarpMag 0.0415382945014135 0.5773502691896258
J2P1C1L1S1pbarpMag 0.01869213486524718 0.5773502691896258
J0P-1C1L0S0pbarpPhi 0.3 0.3
J1P1C1L1S1pbarpPhi 0.3 0.3
J2P1C1L1S1pbarpPhi 0.06979763574021931 0.3
L2S2_J0P-1C1Toa2(1320)0AB_pion0ABMag 1 1
L2S2_J0P-1C1Tof2(1270)_etaMag 0.03800968272386318 1
L1S2_J1P1C1Toa2(1320)0AB_pion0ABMag 0.7071067811865475 0.7071067811865475
L3S2_J1P1C1Toa2(1320)0AB_pion0ABMag 0.0421517418557206 0.7071067811865475
L1S2_J1P1C1Tof2(1270)_etaMag 0.0615966500382536 0.7071067811865475
L3S2_J1P1C1Tof2(1270)_etaMag 0.1007204226549254 0.7071067811865475
L1S2_J2P1C1Toa2(1320)0AB_pion0ABMag 0.7071067811865475 0.7071067811865475
L3S2_J2P1C1Toa2(1320)0AB_pion0ABMag 0.05358098170310227 0.7071067811865475
L1S2_J2P1C1Tof2(1270)_etaMag 0.07537367621240354 0.7071067811865475
L3S2_J2P1C1Tof2(1270)_etaMag 0.07925225971933886 0.7071067811865475
L2S0_a2(1320)0ABTopion0AB_etaMag 1 1
L2S0_f2(1270)Topion0A_pion0BMag 1 1
L2S2_J0P-1C1Toa2(1320)0AB_pion0ABPhi 0.3 0.3
L2S2_J0P-1C1Tof2(1270)_etaPhi 0.1676137038664935 0.3
L1S2_J1P1C1Toa2(1320)0AB_pion0ABPhi 0.3 0.3
L3S2_J1P1C1Toa2(1320)0AB_pion0ABPhi 0.1793923104260443 0.3
L1S2_J1P1C1Tof2(1270)_etaPhi 0.1329193035197215 0.3
L3S2_J1P1C1Tof2(1270)_etaPhi 0.09648895267516837 0.3
L1S2_J2P1C1Toa2(1320)0AB_pion0ABPhi 0.3 0.3
L3S2_J2P1C1Toa2(1320)0AB_pion0ABPhi 0.04710894522891891 0.3
L1S2_J2P1C1Tof2(1270)_etaPhi 0.0465098129006352 0.3
L3S2_J2P1C1Tof2(1270)_etaPhi 0.05666104316648649 0.3
L2S0_a2(1320)0ABTopion0AB_etaPhi 0.3 0.3
L2S0_f2(1270)Topion0A_pion0BPhi 0.3 0.3
a2(1320)0ABMass 0.03 0.03
f2(1270)Mass 0.03 0.03
a2(1320)0ABWidth 0.0214 0.0214
f2(1270)Width 0.037 0.037
Iso1J0P-1C1Range01Other 0.5 0.5
Iso1J1P1C1Range01Other 0.5 0.5
Iso1J2P1C1Range01Other 0.5 0.5
channelType1Topion0Apion0BetachannelScalingOther 0.01 0.01
......@@ -33,7 +33,7 @@ serverPort = 50001
serverAddress = localhost
noOfClients = 2
noOfThreads = 2
evoIterations = 20
evoIterations = 50
evoPopulation = 160
......
......@@ -2,7 +2,7 @@
// //
// Copyright 2013 Bertram Kopf (bertram@ep1.rub.de) //
// Julian Pychy (julian@ep1.rub.de) //
// - Ruhr-Universität Bochum //
// - Ruhr-Universit??t Bochum //
// //
// This file is part of Pawian. //
// //
......@@ -73,7 +73,7 @@ void EvoMinimizer::minimize(){
for(int j = 0; j<_population; j++){
// Get iteration start parameters and shuffle them
_tmpParams = std::shared_ptr<AbsPawianParameters>(_bestPawianParams);
_tmpParams = std::shared_ptr<AbsPawianParameters>(_bestPawianParams->Clone());
ShuffleParams();
// Calc likelihood
......
......@@ -134,7 +134,7 @@ void MinuitMinimizer::dumpFitResult(){
fitParCol finalFitErrs=_absFcn->defaultFitErrParms();
std::vector<double> finalParamErrorVec=_bestPawianParams->Errors();
GlobalEnv::instance()->fitParColBase()->getFitParamVal(finalParamErrorVec, finalFitParams);
GlobalEnv::instance()->fitParColBase()->getFitParamVal(finalParamErrorVec, finalFitErrs);
std::ostringstream finalResultname;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment