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

modified pdt-table; removed dynamic key

parent 0e9a7a3e
No related branches found
No related tags found
No related merge requests found
build-project DfuncClebschG ;
build-project MinuitFit ;
# build-project FitIF ;
# build-project FitIF2 ;
build-project FitIF ;
build-project FitIF2 ;
build-project LineShapes ;
......@@ -111,14 +111,16 @@ Meson K* K^\ast 0 2 -1 0 0 0 0 0 0 0.89116 0.0508 relBW [PDG non
Meson K*+ K^{\ast+} 0 2 -1 0 0 0 0 0 +1 0.8955 0.0508 relBW [PDG nonett 1^3S_1]
Meson K*- K^{\ast-} 0 2 -1 0 0 0 0 0 -1 0.8955 0.0505 relBW [PDG nonett 1^3S_1]
Meson K1(1270) K_1(1270) 0 2 1 0 0 0 0 0 0 1.273 0.090 relBW [PDG nonett 2^1P_1]
Meson K1(1400) K_1(1400) 0 2 1 0 0 0 0 0 0 1.402 0.174 relBW [PDG nonett 2^3P_1]
Meson K*1(1410) K_1^\ast(1410) 0 2 1 0 0 0 0 0 0 1.412 0.227 relBW [PDG no idea]
Meson K1(1400) K_1(1400) 0 2 -1 0 0 0 0 0 0 1.402 0.174 relBW [PDG nonett 2^3P_1]
Meson K*1(1410) K_1^\ast(1410) 0 2 -1 0 0 1 0 1 0 1.412 0.227 relBW [PDG no idea]
Meson K*1(1410)+ K_1^\ast(1410)^+ 3 2 -1 0 0 1 1 1 0 1.412 0.227 relBW [PDG no idea]
Meson K*1(1410)- K_1^\ast(1410)^- -3 2 -1 0 0 1 -1 -1 0 1.412 0.227 relBW [PDG no idea]
Meson K*0(1430) K_0(1430) 0 0 1 0 0 1 0 1 0 1.43 0.250 relBW [PDG nonett 2^3P_0]
Meson K*0(1430)+ K_0(1430)^+ 0 0 1 0 0 1 1 1 0 1.43 0.250 relBW [PDG nonett 2^3P_0]
Meson K*0(1430)- K_0(1430)^- 0 0 1 0 0 1 -1 -1 0 1.43 0.250 relBW [PDG nonett 2^3P_0]
Meson K*0(1430)+ K_0(1430)^+ 3 0 1 0 0 1 1 1 0 1.43 0.250 relBW [PDG nonett 2^3P_0]
Meson K*0(1430)- K_0(1430)^- -3 0 1 0 0 1 -1 -1 0 1.43 0.250 relBW [PDG nonett 2^3P_0]
Meson K*2(1430) K_2^\ast(1430) 0 4 1 0 0 1 0 1 0 1.430 0.100 relBW [PDG nonett 3^3D_2]
Meson K*2(1430)+ K_2^\ast(1430)^+ 0 4 1 0 0 1 1 1 0 1.430 0.100 relBW [PDG nonett 3^3D_2]
Meson K*2(1430)- K_2^\ast(1430)^- 0 4 1 0 0 1 -1 -1 0 1.430 0.100 relBW [PDG nonett 3^3D_2]
Meson K*2(1430)+ K_2^\ast(1430)^+ 3 4 1 0 0 1 1 1 0 1.430 0.100 relBW [PDG nonett 3^3D_2]
Meson K*2(1430)- K_2^\ast(1430)^- -3 4 1 0 0 1 -1 -1 0 1.430 0.100 relBW [PDG nonett 3^3D_2]
Meson K(1460) K(1460) 0 0 -1 0 0 0 0 0 0 1.460 0.250 relBW [PDG nonett 2^1S_0]
Meson K2(1580) K_2(1580) 0 4 -1 0 0 0 0 0 0 1.580 0.110 relBW [PDG no idea]
Meson K1(1650) K_1(1650) 0 2 1 0 0 0 0 0 0 1.650 0.150 relBW [PDG no idea]
......
......@@ -34,7 +34,7 @@ AbsDecay::AbsDecay(Particle* mother, Particle* daughter1, Particle* daughter2, A
,_fitParamSuffix(_name)
,_massParamKey(_mother->name())
,_dynType("WoDynamics")
,_dynKey(mother->name())
// ,_dynKey(mother->name())
,_decPair1stChannel(make_pair(daughter1, daughter2))
,_env(theEnv)
{
......@@ -80,9 +80,9 @@ AbsDecay::AbsDecay(boost::shared_ptr<const jpcRes> motherJPCPtr, Particle* daugh
,_daughter2JPCPtr(getJPCPtr(daughter2))
,_name(motherName+"To"+daughter1->name()+"_"+daughter2->name())
,_fitParamSuffix(_name)
,_massParamKey("WoDynamics")
,_massParamKey(motherJPCPtr->name())
,_dynType("WoDynamics")
,_dynKey(motherJPCPtr->name())
// ,_dynKey(motherJPCPtr->name())
,_decPair1stChannel(make_pair(daughter1, daughter2))
,_env(theEnv)
{
......
......@@ -54,7 +54,7 @@ public:
Particle* daughter2Part() {return _daughter2;}
virtual std::string dynType() {return _dynType;}
virtual std::string& dynKey() {return _dynKey;}
// virtual std::string& dynKey() {return _dynKey;}
virtual std::pair<Particle*, Particle*>& firstDecayChannel() { return _decPair1stChannel;}
virtual std::pair<Particle*, Particle*>& secondDecayChannel() { return _decPair2ndChannel;}
virtual boost::shared_ptr<AbsDecay> absDecPtr() {return shared_from_this();}
......@@ -78,7 +78,7 @@ protected:
std::string _massParamKey;
std::string _wignerDKey;
std::string _dynType;
std::string _dynKey;
// std::string _dynKey;
std::vector< boost::shared_ptr<const JPCLS> > _JPCLSDecAmps;
......
......@@ -31,7 +31,8 @@ complex<double> result(0.,0.);
int evtNo=theData->evtNo;
std::string currentKey="default";
if(0!=grandmaAmp) currentKey=_massKey+grandmaAmp->absDec()->dynKey();
// if(0!=grandmaAmp) currentKey=_massKey+grandmaAmp->absDec()->dynKey();
if(0!=grandmaAmp) currentKey=_massKey+grandmaAmp->absDec()->massParKey();
if ( _cacheAmps && !_recalcMap[currentKey]){
result=_cachedStringMap[evtNo][currentKey];
......@@ -201,7 +202,9 @@ void KPiSWaveDynamics::addGrandMa(boost::shared_ptr<AbsDecay> theDec){
}
// std::string theName=_massKey+theDec->motherJPC()->name();
std::string theName=_massKey+theDec->dynKey();
// std::string theName=_massKey+theDec->dynKey();
std::string theName=_massKey+theDec->massParKey();
std::cout << "addGrandMa:\t" << theName << std::endl;
std::map<std::string, boost::shared_ptr<FVector> >::iterator it = _fVecMap.find(theName);
......@@ -244,5 +247,6 @@ void KPiSWaveDynamics::addGrandMa(boost::shared_ptr<AbsDecay> theDec){
const std::string& KPiSWaveDynamics::grandMaKey(AbsXdecAmp* grandmaAmp){
if(0==grandmaAmp) return _grandmaKey;
return grandmaAmp->absDec()->dynKey();
// return grandmaAmp->absDec()->dynKey();
return grandmaAmp->absDec()->massParKey();
}
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