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

major changes, removed all dependencies of the obsolet parameter layer; be...

major changes, removed all dependencies of the obsolet parameter layer; be careful and check your results
parent f41d7229
No related branches found
No related tags found
No related merge requests found
Showing
with 2123 additions and 2765 deletions
......@@ -45,8 +45,7 @@
#include "PwaUtils/NetworkClient.hh"
#include "PwaUtils/EvtDataBaseList.hh"
#include "FitParams/FitParColBase.hh"
#include "FitParams/StreamFitParColBase.hh"
#include "FitParams/AbsPawianParamStreamer.hh"
#include "FitParams/PwaCovMatrix.hh"
#include "ConfigParser/ParserBase.hh"
......@@ -84,25 +83,18 @@ AppBase::~AppBase()
void AppBase::dumpDefaultParams(){
fitParCol paramVal = GlobalEnv::instance()->DefaultParamVal();
fitParCol paramErr = GlobalEnv::instance()->DefaultParamErr();
std::stringstream defaultparamsname;
defaultparamsname << "defaultparams" << GlobalEnv::instance()->outputFileNameSuffix() << ".dat";
std::ofstream theStreamDefault ( defaultparamsname.str().c_str() );
GlobalEnv::instance()->fitParColBase()->dumpParams(theStreamDefault, paramVal, paramErr);
std::stringstream defaultparamsnameNew;
defaultparamsnameNew << "defaultparams" << GlobalEnv::instance()->outputFileNameSuffix() << ".datNew";
std::shared_ptr<AbsPawianParameters> defaultParams=GlobalEnv::instance()->defaultPawianParams();
std::ofstream theStreamDefaultNew ( defaultparamsnameNew.str().c_str() );
defaultParams->print(theStreamDefaultNew);
defaultParams->print(theStreamDefault);
}
void AppBase::generate(fitParCol& theParams){
void AppBase::generate(std::shared_ptr<AbsPawianParameters> theParams){
std::shared_ptr<PwaGen> pwaGenPtr(new PwaGen());
GlobalEnv::instance()->fitParColBase()->printParams(theParams);
theParams->print(std::cout);
pwaGenPtr->generate(GlobalEnv::instance()->Channel()->Lh(), theParams);
}
......@@ -146,12 +138,12 @@ void AppBase::createLhObjects(){
}
// Generate the full parameter set using the likelihood list
GlobalEnv::instance()->CreateDefaultParameterSet();
// GlobalEnv::instance()->CreateDefaultParameterSet();
}
void AppBase::qaMode(fitParCol& theStartParams, double evtWeightSumData, int noOfFreeFitParams){
void AppBase::qaMode(std::shared_ptr<AbsPawianParameters> startParams, double evtWeightSumData, int noOfFreeFitParams){
double theLh=GlobalEnv::instance()->Channel()->Lh()->calcLogLh(theStartParams);
double theLh=GlobalEnv::instance()->Channel()->Lh()->calcLogLh(startParams);
double BICcriterion=2.*theLh+noOfFreeFitParams*log(evtWeightSumData);
double AICcriterion=2.*theLh+2.*noOfFreeFitParams;
double AICccriterion=AICcriterion+2.*noOfFreeFitParams*(noOfFreeFitParams+1)/(evtWeightSumData-noOfFreeFitParams-1);
......@@ -170,11 +162,11 @@ void AppBase::qaMode(fitParCol& theStartParams, double evtWeightSumData, int noO
std::shared_ptr<PwaCovMatrix> thePwaCovMatrix(new PwaCovMatrix);
boostInputArchive >> *thePwaCovMatrix;
theWaveContribution = std::shared_ptr<WaveContribution>
(new WaveContribution(GlobalEnv::instance()->Channel()->Lh(), theStartParams, thePwaCovMatrix));
(new WaveContribution(GlobalEnv::instance()->Channel()->Lh(), startParams, thePwaCovMatrix));
}
else{
theWaveContribution = std::shared_ptr<WaveContribution>
(new WaveContribution(GlobalEnv::instance()->Channel()->Lh(), theStartParams));
(new WaveContribution(GlobalEnv::instance()->Channel()->Lh(), startParams));
}
std::pair<double, double> contValue = theWaveContribution->CalcContribution();
std::vector<std::pair<std::string,std::pair<double,double>>> singleContValues = theWaveContribution->CalcSingleContributions();
......@@ -227,16 +219,16 @@ void AppBase::qaMode(fitParCol& theStartParams, double evtWeightSumData, int noO
theQaStream.close();
std::shared_ptr<AbsHist> histPtr = GlobalEnv::instance()->Channel()->CreateHistInstance();
histPtr->fillFromLhData(GlobalEnv::instance()->Channel()->Lh(), theStartParams);
histPtr->fillFromLhData(GlobalEnv::instance()->Channel()->Lh(), startParams);
}
void AppBase::qaModeSimple(EventList& dataEventList, EventList& mcEventList, fitParCol& theStartParams, std::shared_ptr<EvtDataBaseList> evtDataBaseList, int noOfFreeFitParams){
void AppBase::qaModeSimple(EventList& dataEventList, EventList& mcEventList, std::shared_ptr<AbsPawianParameters> startParams, std::shared_ptr<EvtDataBaseList> evtDataBaseList, int noOfFreeFitParams){
std::shared_ptr<AbsLh> absLh=GlobalEnv::instance()->Channel()->Lh();
LHData theLHData;
std::shared_ptr<WaveContribution> theWaveContribution(new WaveContribution(GlobalEnv::instance()->Channel()->Lh(), theStartParams));
std::shared_ptr<WaveContribution> theWaveContribution(new WaveContribution(GlobalEnv::instance()->Channel()->Lh(), startParams));
fitParCol currentParams = theStartParams;
std::shared_ptr<AbsPawianParameters> currentParams = std::shared_ptr<AbsPawianParameters>(startParams->Clone());
for(int i=-1; i<static_cast<int>(theWaveContribution->NoOfContributions());i++){
......@@ -244,8 +236,7 @@ void AppBase::qaModeSimple(EventList& dataEventList, EventList& mcEventList, fit
if(i!=-1){
contributionName = theWaveContribution->GetContributionName(i);
std::shared_ptr<AbsPawianParameters> uPar = theWaveContribution->GetParametersForContribution(i);
GlobalEnv::instance()->fitParColBase()->getFitParamVal(uPar->Params(), currentParams);
currentParams = theWaveContribution->GetParametersForContribution(i);
}
std::shared_ptr<AbsHist> histPtr = GlobalEnv::instance()->Channel()->CreateHistInstance(contributionName);
......@@ -376,17 +367,17 @@ void AppBase::plotMode(EventList& dataEventList, EventList& mcEventList, std::sh
histPtr->scaleFitHists(histScaleFactor);
}
void AppBase::streamParams(fitParCol& startparams, fitParCol& errparams){
std::shared_ptr<AbsPawianParameters> AppBase::streamPawianParams(){
std::string paramStreamerPath=GlobalEnv::instance()->parser()->fitParamFile();
StreamFitParmsBase theParamStreamer(paramStreamerPath);
startparams=theParamStreamer.getFitParamVal();
errparams=theParamStreamer.getFitParamErr();
AbsPawianParamStreamer thePawianStreamer(paramStreamerPath);
return thePawianStreamer.paramList();
}
void AppBase::fixParams(std::shared_ptr<AbsPawianParameters> upar, std::vector<std::string> fixedParams){
// Always fix the primary channel's scaling parameters
std::string fixedScaleParam = GlobalEnv::instance()->Channel()->Lh()->getChannelScaleParam() + "Other";
// std::string fixedScaleParam = GlobalEnv::instance()->Channel()->Lh()->getChannelScaleParam() + "Other";
std::string fixedScaleParam = GlobalEnv::instance()->Channel()->Lh()->getChannelScaleParam();
fixedParams.push_back(fixedScaleParam);
Info << "Fixing scaling parameter " << fixedScaleParam << endmsg;
......@@ -404,8 +395,8 @@ void AppBase::fixParams(std::shared_ptr<AbsPawianParameters> upar, std::vector<s
}
void AppBase::fixAllReleaseScaleParams(std::shared_ptr<AbsPawianParameters> upar){
std::string scaleParam = GlobalEnv::instance()->Channel()->Lh()->getChannelScaleParam() + "Other";
// std::string scaleParam = GlobalEnv::instance()->Channel()->Lh()->getChannelScaleParam() + "Other";
std::string scaleParam = GlobalEnv::instance()->Channel()->Lh()->getChannelScaleParam();
const std::vector<std::string> parNames=upar->ParamNames();
std::vector<std::string>::const_iterator itFix;
......@@ -416,14 +407,15 @@ void AppBase::fixAllReleaseScaleParams(std::shared_ptr<AbsPawianParameters> upar
}
bool AppBase::calcAndSendClientLh(NetworkClient& theClient, fitParCol& theStartparams, ChannelID channelID){
bool AppBase::calcAndSendClientLh(NetworkClient& theClient, std::shared_ptr<AbsPawianParameters> startParams, ChannelID channelID){
while(true){
if(!theClient.WaitForParams()) return false;
const std::vector<double> currentParamVec=theClient.GetParams();
fitParCol currentFitParams=theStartparams;
GlobalEnv::instance()->fitParColBase()->getFitParamVal(currentParamVec, currentFitParams);
std::shared_ptr<AbsPawianParameters> currentFitParams= std::shared_ptr<AbsPawianParameters>(startParams->Clone());
currentFitParams->SetAllValues(currentParamVec);
LHData theLHData;
GlobalEnv::instance()->Channel(channelID)->Lh()->calcLogLhDataClient(currentFitParams, theLHData);
......@@ -509,7 +501,7 @@ void AppBase::fitNonServerMode(std::shared_ptr<AbsPawianParameters> upar, double
absMinimizerPtr->dumpFitResult();
}
void AppBase::fitClientMode(fitParCol& theStartparams){
void AppBase::fitClientMode(std::shared_ptr<AbsPawianParameters> theStartparams){
std::ostringstream portStringStream;
portStringStream << GlobalEnv::instance()->parser()->serverPort();
......
......@@ -41,7 +41,6 @@
#include "MinFunctions/AbsFcn.hh"
#include "PwaUtils/AbsChannelEnv.hh"
class fitParCol;
class NetworkClient;
class EvtDataBaseList;
class AbsPawianParameters;
......@@ -55,19 +54,20 @@ public:
virtual ~AppBase();
virtual void dumpDefaultParams();
virtual void generate(fitParCol& theParams);
virtual void generate(std::shared_ptr<AbsPawianParameters> theParams);
virtual void readEvents(EventList& theEventList, std::vector<std::string>& fileNames, ChannelID channelID, bool withEvtWeight=false, int evtStart=0, int evtStop=1000000);
virtual void createLhObjects();
virtual void qaMode(fitParCol& theStartParams, double evtWeightSumData, int noOfFreeFitParams);
virtual void qaModeSimple(EventList& dataEventList, EventList& mcEventList, fitParCol& theStartParams, std::shared_ptr<EvtDataBaseList> evtDataBaseList, int noOfFreeFitParams);
virtual void qaMode(std::shared_ptr<AbsPawianParameters> startParams, double evtWeightSumData, int noOfFreeFitParams);
virtual void qaModeSimple(EventList& dataEventList, EventList& mcEventList, std::shared_ptr<AbsPawianParameters> startParams, std::shared_ptr<EvtDataBaseList> evtDataBaseList, int noOfFreeFitParams);
virtual void plotMode(EventList& dataEventList, EventList& mcEventList, std::shared_ptr<EvtDataBaseList> evtDataBaseList);
virtual void streamParams(fitParCol& startparams, fitParCol& errparams);
// virtual void streamParams(fitParCol& startparams, fitParCol& errparams);
virtual std::shared_ptr<AbsPawianParameters> streamPawianParams();
virtual void fixParams(std::shared_ptr<AbsPawianParameters> upar, std::vector<std::string> fixedParams);
virtual void fixAllReleaseScaleParams(std::shared_ptr<AbsPawianParameters> upar);
virtual bool calcAndSendClientLh(NetworkClient& theClient, fitParCol& theStartparams, ChannelID channelID);
virtual bool calcAndSendClientLh(NetworkClient& theClient, std::shared_ptr<AbsPawianParameters> startParams, ChannelID channelID);
virtual void fitServerMode(std::shared_ptr<AbsPawianParameters> upar);
virtual void fitNonServerMode(std::shared_ptr<AbsPawianParameters> upar, double evtWeightSumData);
virtual void fitClientMode(fitParCol& theStartparams);
virtual void fitClientMode(std::shared_ptr<AbsPawianParameters> theStartparams);
virtual void addChannelEnvs(int argcWoCfgFile, char** argvWoCfgFile);
virtual void loopChannelEnvFactory(int argcWCfgFile, char** argvWCfgFile, std::vector<std::string>& reactionCfgs, short channelType);
};
......
build-project pbarp ;
build-project epem ;
build-project gammap ;
# build-project pbarp ;
# build-project epem ;
# build-project gammap ;
build-project Tutorial ;
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/bin/singleChannelApp
INFO: --epemFiles
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg
INFO: --mode
INFO: client
INFO: !
INFO:
MMMMM
M8NO +M
......@@ -82,9 +88,98 @@ INFO:
//************************************************************************//
INFO: Compiled Feb 10 2015 13:41:47
INFO: Compiled Apr 24 2015 15:18:30
Running with the following options using /data/jollyj/bertram/NewPawian150113/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg:
Running with the following options using /data/jollyj/bertram/NewPawian150319/Pawian/ConfigParser/global.cfg:
Error log mode: 1
data file:
mc file:
chosen unit in input file: GEV
chosen order in file: Px Py Pz E
file with start parameters for fit or qa: ./defaultparams.dat
startHypo: base
mode: client
number of threads: 2
ratioMcToData: 100000
cache amplitudes: 1
use data event weight: 0
use Monte Carlo event weight: 0
use phase space hyp: 0
prefit with free scaling factor: 0
pdg table: /Particle/pdtNew.table
minimumTolerance: 0.1
epem channel configuration file: /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg
the final state particles are:
decay system:
decay dynamics:
replaced suffix for fit parameter name
replaced mass key
replaced prod key
production system:
production formalism: Cano
useProductionBarrier: 0
withProductionBarrier: false
fitqRProduction: 0
useProductionBarrier: 0
qRProduction: 0.1973
histograms inv mass for systems
histograms decay angles for systems
mass range cuts:
2Dhistogram decay angles for systems
random seed: 44123
generate with model: 1
number of generated events: 10000
number of data events: 1000000
INFO: numReactions: 1
INFO: __argv[0]: /data/jollyj/bertram/NewPawian150319/Pawian/bin/singleChannelApp
INFO: __argv[1]: --epemFiles
INFO: __argv[3]: --mode
INFO: __argv[4]: client
INFO: __argv[5]: !
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/bin/singleChannelApp
INFO: -c
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg
INFO: --mode
INFO: client
INFO: !
Running with the following options using /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg:
Error log mode: 1
......@@ -108,7 +203,9 @@ ratioMcToData: 6
cache amplitudes: 1
use event weight: 0
use data event weight: 0
use Monte Carlo event weight: 0
use phase space hyp: 0
......@@ -207,6 +304,7 @@ spin density matrix calculation for particles
productionTensorRadType: Default
INFO: Now replace the parser!!!
INFO: added decay omega1Topion1+_pion1-_pion10 to decay list
INFO: added decay omega2Topion2+_pion2-_pion20 to decay list
......@@ -413,6 +511,32 @@ suffix for fit parameter name: omega2Topion2+_pion2-_pion20
photon mass=0+0-0 width=0+0-0 3*q=0 2*J=2 P=-1 p=-2 C=-1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
eta(2225) mass=2.23+0-0 width=0.15+0-0 3*q=0 2*J=0 P=-1 p=-2 C=1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
JPClamlam amplitudes for decay I0G-1J1P-1C-1Tophoton_eta(2225):
suffix for fit parameter name: J1P-1C-1Tophoton_eta(2225)
JPC=1-- Lam1,Lam2=1,0 parityFactor=1
with further decay:
JPCLS amplitudes for decay eta(2225)Toomega1_omega2:
suffix for fit parameter name: eta(2225)Toomega1_omega2
JPC=0-+ L,S=1,1 preFactorLS=0
with further decay:
LS amplitudes for decay omega1Topion1+_pion1-_pion10:
suffix for fit parameter name: omega1Topion1+_pion1-_pion10
L,S=1,0
with further decay:
LS amplitudes for decay omega2Topion2+_pion2-_pion20:
suffix for fit parameter name: omega2Topion2+_pion2-_pion20
L,S=1,0
f2(1910) mass=1.941+0-0 width=0.17+0-0 3*q=0 2*J=4 P=1 p=-2 C=1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
photon mass=0+0-0 width=0+0-0 3*q=0 2*J=2 P=-1 p=-2 C=-1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
......@@ -544,60 +668,14 @@ suffix for fit parameter name: omega2Topion2+_pion2-_pion20
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Toeta(2225)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: add dynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Tof2(1910)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: add dynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: AmpName: eta(2225)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for eta(2225)Toomega1_omega2 with massSumDaughter1= 0.27914 and massSumDaughter2= 0.27914
INFO: add dynamics for eta(2225)Toomega1_omega2
INFO: AmpName: f2(1910)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for f2(1910)Toomega1_omega2 with massSumDaughter1= 0.27914 and massSumDaughter2= 0.27914
INFO: add dynamics for f2(1910)Toomega1_omega2
INFO: I0G-1J1P-1C-1Toeta(2225)_photon set decay level to 0
INFO: eta(2225)Toomega1_omega2 set decay level to 1
INFO: omega1Topion1+_pion1-_pion10 set decay level to 2
INFO: omega2Topion2+_pion2-_pion20 set decay level to 2
INFO: I0G-1J1P-1C-1Tof2(1910)_photon set decay level to 0
INFO: f2(1910)Toomega1_omega2 set decay level to 1
e+e- reaction
***** decay chains *******
JPCLS amplitudes for decay I0G-1J1P-1C-1Toeta(2225)_photon:
suffix for fit parameter name: J1P-1C-1Toeta(2225)_photon
JPC=1-- L,S=1,1 preFactorLS=0
with further decay:
JPCLS amplitudes for decay eta(2225)Toomega1_omega2:
suffix for fit parameter name: eta(2225)Toomega1_omega2
JPC=0-+ L,S=1,1 preFactorLS=0
with further decay:
LS amplitudes for decay omega1Topion1+_pion1-_pion10:
suffix for fit parameter name: omega1Topion1+_pion1-_pion10
L,S=1,0
with further decay:
LS amplitudes for decay omega2Topion2+_pion2-_pion20:
suffix for fit parameter name: omega2Topion2+_pion2-_pion20
L,S=1,0
photon mass=0+0-0 width=0+0-0 3*q=0 2*J=2 P=-1 p=-2 C=-1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
f2(1910) mass=1.941+0-0 width=0.17+0-0 3*q=0 2*J=4 P=1 p=-2 C=1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
JPCLS amplitudes for decay I0G-1J1P-1C-1Tof2(1910)_photon:
suffix for fit parameter name: J1P-1C-1Tof2(1910)_photon
JPC=1-- L,S=0,1 preFactorLS=0
JPC=1-- L,S=2,1 preFactorLS=0
JPC=1-- L,S=2,2 preFactorLS=0
JPC=1-- L,S=2,3 preFactorLS=0
JPC=1-- L,S=4,3 preFactorLS=0
JPClamlam amplitudes for decay I0G-1J1P-1C-1Tophoton_f2(1910):
suffix for fit parameter name: J1P-1C-1Tophoton_f2(1910)
JPC=1-- Lam1,Lam2=1,1 parityFactor=1
JPC=1-- Lam1,Lam2=1,0 parityFactor=1
JPC=1-- Lam1,Lam2=-1,-2 parityFactor=1
with further decay:
JPCLS amplitudes for decay f2(1910)Toomega1_omega2:
suffix for fit parameter name: f2(1910)Toomega1_omega2
......@@ -621,6 +699,24 @@ suffix for fit parameter name: omega2Topion2+_pion2-_pion20
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Toeta(2225)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: add dynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Tof2(1910)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: add dynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: AmpName: eta(2225)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for eta(2225)Toomega1_omega2 with mass key daughter1 pion1+pion1-pion10pion2+pion2-pion20pion1+pion1-pion10 and mass key daughter2 pion1+pion1-pion10pion2+pion2-pion20pion2+pion2-pion20
INFO: add dynamics for eta(2225)Toomega1_omega2
INFO: AmpName: f2(1910)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for f2(1910)Toomega1_omega2 with mass key daughter1 pion1+pion1-pion10pion2+pion2-pion20pion1+pion1-pion10 and mass key daughter2 pion1+pion1-pion10pion2+pion2-pion20pion2+pion2-pion20
INFO: add dynamics for f2(1910)Toomega1_omega2
INFO: I0G-1J1P-1C-1Toeta(2225)_photon set decay level to 0
INFO: eta(2225)Toomega1_omega2 set decay level to 1
INFO: omega1Topion1+_pion1-_pion10 set decay level to 2
INFO: omega2Topion2+_pion2-_pion20 set decay level to 2
INFO: I0G-1J1P-1C-1Tof2(1910)_photon set decay level to 0
INFO: f2(1910)Toomega1_omega2 set decay level to 1
INFO: Dynamics I0G-1J1P-1C-1Toeta(2225)_photon found!!!
INFO: Dynamics eta(2225)Toomega1_omega2 found!!!
WARN: /AbsXdecAmp.cc:77: no dynamics for omega1Topion1+_pion1-_pion10
......@@ -747,7 +843,7 @@ INFO: replace val by 1
INFO: replace err by 0.01
**************** Minuit Fit parameter **************************
**************** Fit parameter **************************
J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonMag 1 1
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonMag 0.57735 0.57735
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.57735 0.57735
......@@ -777,7 +873,7 @@ f2(1910)Width 0.16 0.034
channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScalingOther 1 0.01
INFO: Fixing scaling parameter channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScalingOther
INFO: ************* Client mode ****************
INFO: Connecting to server localhost:25374
INFO: Connecting to server localhost:50003
INFO: Received client id: 1
INFO: Received channel id: 0
INFO: Received data event range 2500 - 4999
......
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/bin/singleChannelApp
INFO: --epemFiles
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg
INFO: --mode
INFO: client
INFO: !
INFO:
MMMMM
M8NO +M
......@@ -82,9 +88,98 @@ INFO:
//************************************************************************//
INFO: Compiled Feb 10 2015 13:41:47
INFO: Compiled Apr 24 2015 15:18:30
Running with the following options using /data/jollyj/bertram/NewPawian150113/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg:
Running with the following options using /data/jollyj/bertram/NewPawian150319/Pawian/ConfigParser/global.cfg:
Error log mode: 1
data file:
mc file:
chosen unit in input file: GEV
chosen order in file: Px Py Pz E
file with start parameters for fit or qa: ./defaultparams.dat
startHypo: base
mode: client
number of threads: 2
ratioMcToData: 100000
cache amplitudes: 1
use data event weight: 0
use Monte Carlo event weight: 0
use phase space hyp: 0
prefit with free scaling factor: 0
pdg table: /Particle/pdtNew.table
minimumTolerance: 0.1
epem channel configuration file: /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg
the final state particles are:
decay system:
decay dynamics:
replaced suffix for fit parameter name
replaced mass key
replaced prod key
production system:
production formalism: Cano
useProductionBarrier: 0
withProductionBarrier: false
fitqRProduction: 0
useProductionBarrier: 0
qRProduction: 0.1973
histograms inv mass for systems
histograms decay angles for systems
mass range cuts:
2Dhistogram decay angles for systems
random seed: 44123
generate with model: 1
number of generated events: 10000
number of data events: 1000000
INFO: numReactions: 1
INFO: __argv[0]: /data/jollyj/bertram/NewPawian150319/Pawian/bin/singleChannelApp
INFO: __argv[1]: --epemFiles
INFO: __argv[3]: --mode
INFO: __argv[4]: client
INFO: __argv[5]: !
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/bin/singleChannelApp
INFO: -c
INFO: /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg
INFO: --mode
INFO: client
INFO: !
Running with the following options using /data/jollyj/bertram/NewPawian150319/Pawian/Examples/benchmark/epem/JpsiGamOmegaOmega.cfg:
Error log mode: 1
......@@ -108,7 +203,9 @@ ratioMcToData: 6
cache amplitudes: 1
use event weight: 0
use data event weight: 0
use Monte Carlo event weight: 0
use phase space hyp: 0
......@@ -207,6 +304,7 @@ spin density matrix calculation for particles
productionTensorRadType: Default
INFO: Now replace the parser!!!
INFO: added decay omega1Topion1+_pion1-_pion10 to decay list
INFO: added decay omega2Topion2+_pion2-_pion20 to decay list
......@@ -413,6 +511,32 @@ suffix for fit parameter name: omega2Topion2+_pion2-_pion20
photon mass=0+0-0 width=0+0-0 3*q=0 2*J=2 P=-1 p=-2 C=-1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
eta(2225) mass=2.23+0-0 width=0.15+0-0 3*q=0 2*J=0 P=-1 p=-2 C=1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
JPClamlam amplitudes for decay I0G-1J1P-1C-1Tophoton_eta(2225):
suffix for fit parameter name: J1P-1C-1Tophoton_eta(2225)
JPC=1-- Lam1,Lam2=1,0 parityFactor=1
with further decay:
JPCLS amplitudes for decay eta(2225)Toomega1_omega2:
suffix for fit parameter name: eta(2225)Toomega1_omega2
JPC=0-+ L,S=1,1 preFactorLS=0
with further decay:
LS amplitudes for decay omega1Topion1+_pion1-_pion10:
suffix for fit parameter name: omega1Topion1+_pion1-_pion10
L,S=1,0
with further decay:
LS amplitudes for decay omega2Topion2+_pion2-_pion20:
suffix for fit parameter name: omega2Topion2+_pion2-_pion20
L,S=1,0
f2(1910) mass=1.941+0-0 width=0.17+0-0 3*q=0 2*J=4 P=1 p=-2 C=1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
photon mass=0+0-0 width=0+0-0 3*q=0 2*J=2 P=-1 p=-2 C=-1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
......@@ -544,60 +668,14 @@ suffix for fit parameter name: omega2Topion2+_pion2-_pion20
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Toeta(2225)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: add dynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Tof2(1910)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: add dynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: AmpName: eta(2225)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for eta(2225)Toomega1_omega2 with massSumDaughter1= 0.27914 and massSumDaughter2= 0.27914
INFO: add dynamics for eta(2225)Toomega1_omega2
INFO: AmpName: f2(1910)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for f2(1910)Toomega1_omega2 with massSumDaughter1= 0.27914 and massSumDaughter2= 0.27914
INFO: add dynamics for f2(1910)Toomega1_omega2
INFO: I0G-1J1P-1C-1Toeta(2225)_photon set decay level to 0
INFO: eta(2225)Toomega1_omega2 set decay level to 1
INFO: omega1Topion1+_pion1-_pion10 set decay level to 2
INFO: omega2Topion2+_pion2-_pion20 set decay level to 2
INFO: I0G-1J1P-1C-1Tof2(1910)_photon set decay level to 0
INFO: f2(1910)Toomega1_omega2 set decay level to 1
e+e- reaction
***** decay chains *******
JPCLS amplitudes for decay I0G-1J1P-1C-1Toeta(2225)_photon:
suffix for fit parameter name: J1P-1C-1Toeta(2225)_photon
JPC=1-- L,S=1,1 preFactorLS=0
with further decay:
JPCLS amplitudes for decay eta(2225)Toomega1_omega2:
suffix for fit parameter name: eta(2225)Toomega1_omega2
JPC=0-+ L,S=1,1 preFactorLS=0
with further decay:
LS amplitudes for decay omega1Topion1+_pion1-_pion10:
suffix for fit parameter name: omega1Topion1+_pion1-_pion10
L,S=1,0
with further decay:
LS amplitudes for decay omega2Topion2+_pion2-_pion20:
suffix for fit parameter name: omega2Topion2+_pion2-_pion20
L,S=1,0
photon mass=0+0-0 width=0+0-0 3*q=0 2*J=2 P=-1 p=-2 C=-1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
f2(1910) mass=1.941+0-0 width=0.17+0-0 3*q=0 2*J=4 P=1 p=-2 C=1 c=-2 G=-2 theGParity=1 2*I=0 2*I3=0 charm=0 strange=0
JPCLS amplitudes for decay I0G-1J1P-1C-1Tof2(1910)_photon:
suffix for fit parameter name: J1P-1C-1Tof2(1910)_photon
JPC=1-- L,S=0,1 preFactorLS=0
JPC=1-- L,S=2,1 preFactorLS=0
JPC=1-- L,S=2,2 preFactorLS=0
JPC=1-- L,S=2,3 preFactorLS=0
JPC=1-- L,S=4,3 preFactorLS=0
JPClamlam amplitudes for decay I0G-1J1P-1C-1Tophoton_f2(1910):
suffix for fit parameter name: J1P-1C-1Tophoton_f2(1910)
JPC=1-- Lam1,Lam2=1,1 parityFactor=1
JPC=1-- Lam1,Lam2=1,0 parityFactor=1
JPC=1-- Lam1,Lam2=-1,-2 parityFactor=1
with further decay:
JPCLS amplitudes for decay f2(1910)Toomega1_omega2:
suffix for fit parameter name: f2(1910)Toomega1_omega2
......@@ -621,6 +699,24 @@ suffix for fit parameter name: omega2Topion2+_pion2-_pion20
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Toeta(2225)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: add dynamics for I0G-1J1P-1C-1Toeta(2225)_photon
INFO: Barrier factors for production amplitude I0G-1J1P-1C-1Tof2(1910)_photon enabled!
INFO: BlattWBarrierDynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: add dynamics for I0G-1J1P-1C-1Tof2(1910)_photon
INFO: AmpName: eta(2225)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for eta(2225)Toomega1_omega2 with mass key daughter1 pion1+pion1-pion10pion2+pion2-pion20pion1+pion1-pion10 and mass key daughter2 pion1+pion1-pion10pion2+pion2-pion20pion2+pion2-pion20
INFO: add dynamics for eta(2225)Toomega1_omega2
INFO: AmpName: f2(1910)Toomega1_omega2 radius for barrier factor qr= 0.1973
INFO: BreitWignerRelDynamics for f2(1910)Toomega1_omega2 with mass key daughter1 pion1+pion1-pion10pion2+pion2-pion20pion1+pion1-pion10 and mass key daughter2 pion1+pion1-pion10pion2+pion2-pion20pion2+pion2-pion20
INFO: add dynamics for f2(1910)Toomega1_omega2
INFO: I0G-1J1P-1C-1Toeta(2225)_photon set decay level to 0
INFO: eta(2225)Toomega1_omega2 set decay level to 1
INFO: omega1Topion1+_pion1-_pion10 set decay level to 2
INFO: omega2Topion2+_pion2-_pion20 set decay level to 2
INFO: I0G-1J1P-1C-1Tof2(1910)_photon set decay level to 0
INFO: f2(1910)Toomega1_omega2 set decay level to 1
INFO: Dynamics I0G-1J1P-1C-1Toeta(2225)_photon found!!!
INFO: Dynamics eta(2225)Toomega1_omega2 found!!!
WARN: /AbsXdecAmp.cc:77: no dynamics for omega1Topion1+_pion1-_pion10
......@@ -747,7 +843,7 @@ INFO: replace val by 1
INFO: replace err by 0.01
**************** Minuit Fit parameter **************************
**************** Fit parameter **************************
J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonMag 1 1
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonMag 0.57735 0.57735
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.57735 0.57735
......@@ -777,7 +873,7 @@ f2(1910)Width 0.16 0.034
channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScalingOther 1 0.01
INFO: Fixing scaling parameter channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScalingOther
INFO: ************* Client mode ****************
INFO: Connecting to server localhost:25374
INFO: Connecting to server localhost:50003
INFO: Received client id: 0
INFO: Received channel id: 0
INFO: Received data event range 0 - 2499
......
J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonMag 2.180578145577022 0.03221857758687463
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonMag 0.4568161430409153 0.05154027847802761
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.5074318671866733 0.05559266877334981
J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.6454276028903895 0.07319688518749412
J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonMag 2.164322753601351 0.03176007620647248
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonMag 0.5410096123706345 0.04765513026495444
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.6148258515621514 0.05135987698247002
J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonMag 0.7801671843218587 0.06302176451273545
J1P-1C-1Lama0Lamb-1_J1P-1C-1Toeta(2225)_photonPhi 0 0.3
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonPhi -0.5915173491343885 0.219361624941777
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonPhi 0.5831354590096399 0.199228918763189
J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonPhi -1.34428966909745 0.1772108594845928
J1P-1C-1Lama0Lamb-1_J1P-1C-1Tof2(1910)_photonPhi -0.374790761675668 0.2356991946759279
J1P-1C-1Lama1Lamb1_J1P-1C-1Tof2(1910)_photonPhi 0.7164505635054377 0.2058472822800993
J1P-1C-1Lama2Lamb1_J1P-1C-1Tof2(1910)_photonPhi -1.166214872213988 0.2005213558287118
L1S1_eta(2225)Toomega1_omega2Mag 1 1
L0S2_f2(1910)Toomega1_omega2Mag 0.5 0.5
L2S0_f2(1910)Toomega1_omega2Mag 0.5355936827261444 0.08162266655774181
L2S2_f2(1910)Toomega1_omega2Mag 0.5889680508441844 0.08282620993352158
L4S2_f2(1910)Toomega1_omega2Mag 0.7356085131946519 0.08884013531858953
L2S0_f2(1910)Toomega1_omega2Mag 0.4077469368507206 0.04938576483086371
L2S2_f2(1910)Toomega1_omega2Mag 0.4791313285756362 0.05387545858515957
L4S2_f2(1910)Toomega1_omega2Mag 0.5452940204944445 0.05542851782812575
L1S0_omega1Topion1+_pion1-_pion10Mag 1 1
L1S0_omega2Topion2+_pion2-_pion20Mag 1 1
L1S1_eta(2225)Toomega1_omega2Phi 0 0.3
L0S2_f2(1910)Toomega1_omega2Phi 0 0.3
L2S0_f2(1910)Toomega1_omega2Phi -0.3809519924699988 0.265768489732713
L2S2_f2(1910)Toomega1_omega2Phi 0.4136299099382698 0.2085823023640403
L4S2_f2(1910)Toomega1_omega2Phi -0.02160858067454495 0.1754685877406709
L2S0_f2(1910)Toomega1_omega2Phi -0.3804684907367308 0.2171123555623531
L2S2_f2(1910)Toomega1_omega2Phi 0.3180691419895234 0.2382696361209519
L4S2_f2(1910)Toomega1_omega2Phi 0.2439868700744058 0.2195029108040202
L1S0_omega1Topion1+_pion1-_pion10Phi 0 0.3
L1S0_omega2Topion2+_pion2-_pion20Phi 0 0.3
eta(2225)Mass 2.232234120390087 0.002364808493733772
f2(1910)Mass 1.931114147253748 0.00518870543626726
eta(2225)Width 0.1922307129928199 0.006651454977416843
f2(1910)Width 0.2398828701706201 0.01393927501757786
eta(2225)Mass 2.234856789120522 0.002347703667846091
f2(1910)Mass 1.942694061958088 0.005361927799951371
eta(2225)Width 0.1920447836882463 0.006692667741492034
f2(1910)Width 0.2846053742470246 0.02115501414060733
channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScalingOther 1 0.01
This diff is collapsed.
......@@ -24,4 +24,4 @@ eta(2225)Mass 2.15 0.03
f2(1910)Mass 1.97 0.03
eta(2225)Width 0.14 0.03
f2(1910)Width 0.16 0.034
channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScalingOther 1 0.01
channelType2Tophotonpion1+pion1-pion10pion2+pion2-pion20channelScaling 1 0.01
......@@ -23,12 +23,15 @@
#include <fstream>
#include "FitParams/AbsFitParColStreamer.hh"
#include "FitParams/AbsPawianParamStreamer.hh"
#include "ErrLogger/ErrLogger.hh"
#include "FitParams/AbsPawianParameters.hh"
#include "FitParams/ParamFactory.hh"
AbsFitParColStreamer::AbsFitParColStreamer(std::string& filePath)
AbsPawianParamStreamer::AbsPawianParamStreamer(std::string& filePath)
{
_pawianParams=ParamFactory::instance()->getParametersPointer("Minuit2");
std::ifstream ifs(filePath.c_str());
if(!ifs.good())
{
......@@ -36,93 +39,48 @@ AbsFitParColStreamer::AbsFitParColStreamer(std::string& filePath)
exit(1);
}
std::string strTmp, strState;
bool bError=false;
double dMag=0.0, dPhi=0.0;
while(!ifs.eof())
{
ifs >> strState;
if (ifs.eof()) break;
ifs >> strTmp;
dMag = atof(strTmp.c_str());
if (ifs.eof()) break;
ifs >> strTmp;
dPhi = atof(strTmp.c_str());
if (ifs.eof()) break;
if (!bError)
{
DebugMsg << "Start Parameter: " << strState << " Mag: " << dMag << " Phi: " << dPhi << " set.\n" << endmsg;
StringParameterMap(strState,dMag,dPhi);
}
for (std::string lineStr; std::getline(ifs, lineStr); ){
std::string paramName, strTmp;
double val, err, min, max;
min=0.;
max=-1.;
err=0.;
Info << lineStr << endmsg;
istringstream lineIss(lineStr);
lineIss >> paramName;
lineIss >> strTmp;
val=atof(strTmp.c_str());
if (!lineIss.eof()){
lineIss >> strTmp;
err=atof(strTmp.c_str());
}
}
AbsFitParColStreamer::~AbsFitParColStreamer(){;}
void AbsFitParColStreamer::StringParameterMap(const std::string &theName, const double firstVal, const double secondVal)
{
std::pair <double,double> thePair=make_pair(firstVal, secondVal);
_stringPairMap[theName]=thePair;
}
void AbsFitParColStreamer::fillParamMapAmps(std::vector< std::shared_ptr<const JPCLS> >& theJPCLSs, std::string& suffix, std::map< std::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess >& toFill){
std::vector< std::shared_ptr<const JPCLS> >::const_iterator itJPCLS;
StringPairMap::const_iterator stringPairIter;
for ( itJPCLS=theJPCLSs.begin(); itJPCLS!=theJPCLSs.end(); ++itJPCLS){
//now fill the fitParameterMap
std::string theKey=(*itJPCLS)->name()+suffix;
stringPairIter=_stringPairMap.find(theKey);
if ( stringPairIter != _stringPairMap.end() ){
std::pair<double, double> theValPair=_stringPairMap[theKey];
toFill[*itJPCLS]=theValPair;
DebugMsg << theKey << " filled with values: " << theValPair.first <<"\t" << theValPair.second << endmsg;
if (!lineIss.eof()){
lineIss >> strTmp;
min=atof(strTmp.c_str());
}
else{
Warning << theKey <<" not available in fitVal input file!!!!" << endmsg;
std::pair <double,double> theValPair=make_pair(-10000., -10000.);
toFill[*itJPCLS]=theValPair;
if (!lineIss.eof()){
lineIss >> strTmp;
max=atof(strTmp.c_str());
}
Info << "paramName: "<< paramName << "\tval: " << val << "\terr:" << err << "\tmin:" << min << "\tmax:" << max << endmsg;
fillDefault(paramName, val, err, min, max);
}
std::cout << "\n\n parameters in pawianParams are: \n\n";
_pawianParams->print(std::cout);
}
void AbsFitParColStreamer::fillParamMapMass(std::string& name, pair<double, double>& toFill){
StringPairMap::const_iterator stringPairIter;
stringPairIter=_stringPairMap.find(name);
if ( stringPairIter != _stringPairMap.end() ){
std::pair<double, double> theValPair=_stringPairMap[name];
toFill=theValPair;
DebugMsg << name << " filled with values: " << theValPair.first <<"\t" << theValPair.second << endmsg;
}
else{
Warning << name <<" not available in fitVal input file!!!!" << endmsg;
std::pair <double,double> theValPair=make_pair(-10000., -10000.);
toFill=theValPair;
}
AbsPawianParamStreamer::~AbsPawianParamStreamer(){;}
void AbsPawianParamStreamer::fillDefault(const std::string &theName, double val, double err, double min, double max){
_pawianParams->Add(theName, val, err);
if(min<max) _pawianParams->SetLimits(theName, min, max);
return;
}
void AbsFitParColStreamer::fillParamFlatte(std::string& name, double& toFill){
StringPairMap::const_iterator stringPairIter;
stringPairIter=_stringPairMap.find(name);
if ( stringPairIter != _stringPairMap.end() ){
std::pair<double, double> theValPair=_stringPairMap[name];
toFill=theValPair.first;
DebugMsg << name << " filled with value: " << theValPair.first <<"\t" << endmsg;
}
else{
Warning << name <<" not available in fitVal input file!!!!" << endmsg;
toFill=-10000.;
}
}
......@@ -25,28 +25,21 @@
#include <iostream>
#include <vector>
#include <map>
#include <string>
#include <memory>
#include "Utils/PawianCollectionUtils.hh"
#include "PwaUtils/DataUtils.hh"
typedef map<std::string, pair<double, double> > StringPairMap;
class AbsPawianParameters;
class AbsFitParColStreamer {
class AbsPawianParamStreamer {
public:
AbsFitParColStreamer(std::string& filePath);
virtual ~AbsFitParColStreamer();
AbsPawianParamStreamer(std::string& filePath);
virtual ~AbsPawianParamStreamer();
std::shared_ptr<AbsPawianParameters> paramList() {return _pawianParams;}
protected:
StringPairMap _stringPairMap;
virtual void fillParamMap() = 0;
virtual void StringParameterMap(const std::string &theName, const double firstVal,
const double secondVal);
virtual void fillParamMapAmps(std::vector< std::shared_ptr<const JPCLS> >& theJPCLSs,
std::string& suffix, std::map< std::shared_ptr<const JPCLS>,
pair<double, double>,
pawian::Collection::SharedPtrLess >& toFill);
virtual void fillParamMapMass(std::string& name, pair<double, double>& toFill);
virtual void fillParamFlatte(std::string& name, double& toFill);
virtual void fillDefault(const std::string &theName, double val, double err, double min, double max);
std::shared_ptr<AbsPawianParameters> _pawianParams;
};
......@@ -122,7 +122,7 @@ public:
virtual void SetPrecision(double eps)=0;
virtual void print(std::ostream& os);
virtual void SetAllValues(const std::vector<double>& values);
private:
// MnUserTransformation fTransformation;
......
This diff is collapsed.
This diff is collapsed.
......@@ -40,8 +40,7 @@ PwaCovMatrix::PwaCovMatrix(){
PwaCovMatrix::PwaCovMatrix(ROOT::Minuit2::MnUserCovariance &theMinuitCovMatrix,
const ROOT::Minuit2::MnUserParameters &theMinuitParameters,
fitParCol &theFitParams)
const ROOT::Minuit2::MnUserParameters &theMinuitParameters)
{
DiagonalIsValid(theMinuitCovMatrix);
......
......@@ -49,8 +49,7 @@ class PwaCovMatrix
public:
PwaCovMatrix();
PwaCovMatrix(ROOT::Minuit2::MnUserCovariance &theMinuitCovMatrix,
const ROOT::Minuit2::MnUserParameters &theMinuitParameters,
fitParCol &theFitParams);
const ROOT::Minuit2::MnUserParameters &theMinuitParameters);
double GetElement(std::string parameter1, std::string parameter2);
static bool DiagonalIsValid(const ROOT::Minuit2::MnUserCovariance &theMinuitCovMatrix);
......
This diff is collapsed.
......@@ -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. //
// //
......@@ -21,46 +21,32 @@
// //
//************************************************************************//
#pragma once
#include <iostream>
#include <string>
#include <cstdlib>
#include <vector>
#include <map>
#include <string>
#include <tuple>
#include <iterator>
#include <memory>
#include "FitParams/AbsFitParColStreamer.hh"
#include "FitParams/FitParColBase.hh"
class StreamFitParmsBase : public AbsFitParColStreamer {
#include "FitParams/AbsPawianParamStreamer.hh"
#include "ConfigParser/globalParser.hh"
#include "Utils/ErrLogUtils.hh"
#include "ErrLogger/ErrLogger.hh"
public:
StreamFitParmsBase(std::string&);
virtual ~StreamFitParmsBase();
fitParCol getFitParamVal() { return _paramVal;}
fitParCol getFitParamErr() { return _paramErr;}
int main(int __argc,char *__argv[]){
for (int i=0; i<__argc ; ++i) Info << __argv[i] << endmsg;
Info << "Compiled " << __DATE__ << " " << __TIME__ << endmsg;
virtual void fillParamMap() {return;}
// Parse the command line
globalParser* globalAppParams=new globalParser(__argc, __argv);
std::string paramFilePath=globalAppParams->fitParamFile();
AbsPawianParamStreamer theStreamer(paramFilePath);
protected:
virtual void fillParams();
return 1;
}
virtual void fillJPCAmps(mapStrJPC& valMap, mapStrJPC& errMap,
const std::string& suffix);
virtual void fillLSAmps(mapStrLS& valMap, mapStrLS& errMap,
const std::string& suffix);
virtual void fillJPCLamLamAmps(mapStrJPCLamLam& valMap, mapStrJPCLamLam& errMap,
const std::string& suffix);
virtual void fillJPCLSAmps(mapStrJPCLS& valMap, mapStrJPCLS& errMap,
const std::string& suffix);
virtual void fillDoubles(mapStrDouble& valMap, mapStrDouble& errMap,
const std::string& suffix);
private:
fitParCol _paramVal;
fitParCol _paramErr;
void fillParameter(std::map<int, double>& theValMap, std::map<int, double>& theErrMap,
std::string& suffix, int index);
};
......@@ -61,8 +61,8 @@ build-project MinFunctions ;
build-project AppUtils ;
build-project pbarpUtils ;
build-project epemUtils ;
build-project resUtils ;
build-project gammapUtils ;
#build-project resUtils ;
#build-project gammapUtils ;
build-project Particle ;
build-project Event ;
build-project PspGen ;
......
This diff is collapsed.
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