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

Psi2STo2K2PiGam: added hyp f_2_1950

parent 34104278
No related branches found
No related tags found
No related merge requests found
......@@ -38,10 +38,14 @@ FitParams2K2PiGam::FitParams2K2PiGam()
_jpclsMap[paramEnum2K2PiGam::f1710_kf1370_pi]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980_pif_2_1430_k]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f980_kf_2_1430_pi]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f980_pif_2_1950_k]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f980_kf_2_1950_pi]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f1500_pif_2_1525_k]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f1500_kf_2_1525_pi]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f1710_pif_2_1430_k]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f1710_kf_2_1430_pi]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f1710_pif_2_1950_k]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f1710_kf_2_1950_pi]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::K_0_2400KToKf980]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::K892K_1_1680]=theStates.ChiTo2K892States();
_jpclsMap[paramEnum2K2PiGam::K892K_1_2300]=theStates.ChiTo2K892States();
......@@ -102,10 +106,14 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti
else if (index==paramEnum2K2PiGam::f980_kf_2_1430_pi) return params.f980_kf_2_1430_pi;
else if (index==paramEnum2K2PiGam::f980_pif_2_1525_k) return params.f980_pif_2_1525_k;
else if (index==paramEnum2K2PiGam::f980_kf_2_1525_pi) return params.f980_kf_2_1525_pi;
else if (index==paramEnum2K2PiGam::f980_pif_2_1950_k) return params.f980_pif_2_1950_k;
else if (index==paramEnum2K2PiGam::f980_kf_2_1950_pi) return params.f980_kf_2_1950_pi;
else if (index==paramEnum2K2PiGam::f1500_pif_2_1525_k) return params.f1500_pif_2_1525_k;
else if (index==paramEnum2K2PiGam::f1500_kf_2_1525_pi) return params.f1500_kf_2_1525_pi;
else if (index==paramEnum2K2PiGam::f1710_pif_2_1430_k) return params.f1710_pif_2_1430_k;
else if (index==paramEnum2K2PiGam::f1710_kf_2_1430_pi) return params.f1710_kf_2_1430_pi;
else if (index==paramEnum2K2PiGam::f1710_pif_2_1950_k) return params.f1710_pif_2_1950_k;
else if (index==paramEnum2K2PiGam::f1710_kf_2_1950_pi) return params.f1710_kf_2_1950_pi;
else if (index==paramEnum2K2PiGam::K_0_2400KToKf980) return params.ChiToK_0_2400ToKf980;
else if (index==paramEnum2K2PiGam::K892K_1_1680) return params.ChiToK892K1680;
else if (index==paramEnum2K2PiGam::K892K_1_2300) return params.ChiToK892K2300;
......@@ -144,6 +152,7 @@ pair<double, double>& FitParams2K2PiGam::massPair(param2K2PiGam& params, unsigne
else if (index==paramEnum2K2PiGam::f1370) return params.Bwf1370;
else if (index==paramEnum2K2PiGam::f_2_1430) return params.Bwf_2_1430;
else if (index==paramEnum2K2PiGam::f_2_1525) return params.Bwf_2_1525;
else if (index==paramEnum2K2PiGam::f_2_1950) return params.Bwf_2_1950;
else if (index==paramEnum2K2PiGam::K_0_2400) return params.BwK_0_2400;
else if (index==paramEnum2K2PiGam::K_0_1950) return params.BwK_0_1950;
else if (index==paramEnum2K2PiGam::K_1_1680) return params.BwK_1_1680;
......
......@@ -53,10 +53,14 @@ struct param2K2PiGam
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf_2_1430_pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_pif_2_1525_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf_2_1525_pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_pif_2_1950_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf_2_1950_pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1500_pif_2_1525_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1500_kf_2_1525_pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1710_pif_2_1430_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1710_kf_2_1430_pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1710_pif_2_1950_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1710_kf_2_1950_pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_0_2400ToKf980;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_0_1430K_0_1950;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToKappaK_0_1950;
......@@ -82,6 +86,7 @@ struct param2K2PiGam
pair<double, double> Bwf1370;
pair<double, double> Bwf_2_1430;
pair<double, double> Bwf_2_1525;
pair<double, double> Bwf_2_1950;
pair<double, double> BwK_0_2400;
pair<double, double> BwK_2_1950;
pair<double, double> BwK_0_1950;
......@@ -104,11 +109,12 @@ struct paramEnum2K2PiGam{
f980_pif1710_k, f980_kf1710_pi, f980f980, f980f2200, f980_pif1370_k, f980_kf1370_pi, f980_pif1500_k, f980_kf1500_pi, f1710_pif1370_k, f1710_kf1370_pi,
K_0_2400KToKf980, K892K_1_1680, K892K_1_2300,
sigmaf980, sigmaf1710, sigmaf2200, K_0_1460ToK892Pi, K_0_1460ToK_0_1430Pi, K_0_1830ToK892Pi, K_0_1830ToK_0_1430Pi,
f980_pif_2_1430_k, f980_kf_2_1430_pi, f980_pif_2_1525_k, f980_kf_2_1525_pi, f1500_pif_2_1525_k, f1500_kf_2_1525_pi, f1710_pif_2_1430_k, f1710_kf_2_1430_pi, nAmps,
f980_pif_2_1430_k, f980_kf_2_1430_pi, f980_pif_2_1525_k, f980_kf_2_1525_pi, f980_pif_2_1950_k, f980_kf_2_1950_pi,
f1500_pif_2_1525_k, f1500_kf_2_1525_pi, f1710_pif_2_1430_k, f1710_kf_2_1430_pi, f1710_pif_2_1950_k, f1710_kf_2_1950_pi, nAmps,
K892=nAmps,Kappa, K_0_1430, K_1_1400, K_2_1430, K_1_1270,K_1_1650,
f1500, f1710, f2200, sigma, f1370, K_0_2400, K_0_1950, K_1_1680, K_1_2300, K_0_1460, K_0_1830,
f_2_1430, f_2_1525, nMasses,
f_2_1430, f_2_1525, f_2_1950, nMasses,
f980=nMasses,f980gpipi, f980gKK, nFlatte,
......@@ -122,11 +128,12 @@ struct paramEnum2K2PiGam{
"f980_pif1710_k", "f980_kf1710_pi", "f980f980", "f980f2200", "f980_pif1370_k", "f980_kf1370_pi", "f980_pif1500_k", "f980_kf1500_pi", "f1710_pif1370_k", "f1710_kf1370_pi",
"K_0_2400KToKf980", "K892K_1_1680", "K892K_1_2300",
"sigmaf980", "sigmaf1710", "sigmaf2200", "K_0_1460ToK892Pi", "K_0_1460ToK_0_1430Pi","K_0_1830ToK892Pi", "K_0_1830ToK_0_1430Pi",
"f980_pif_2_1430_k", "f980_kf_2_1430_pi","f980_pif_2_1525_k", "f980_kf_2_1525_pi", "f1500_pif_2_1525_k", "f1500_kf_2_1525_pi", "f1710_pif_2_1430_k", "f1710_kf_2_1430_pi",
"f980_pif_2_1430_k", "f980_kf_2_1430_pi","f980_pif_2_1525_k", "f980_kf_2_1525_pi", "f980_pif_2_1950_k", "f980_kf_2_1950_pi",
"f1500_pif_2_1525_k", "f1500_kf_2_1525_pi", "f1710_pif_2_1430_k", "f1710_kf_2_1430_pi", "f1710_pif_2_1950_k", "f1710_kf_2_1950_pi",
"K892", "Kappa", "K_0_1430", "K_1_1400", "K_2_1430", "K_1_1270", "K_1_1650",
"f1500", "f1710", "f2200", "sigma", "f1370", "K_0_2400", "K_0_1950", "K_1_1680", "K_1_2300", "K_0_1460", "K_0_1830",
"f_2_1430", "f_2_1525",
"f_2_1430", "f_2_1525","f_2_1950",
"f980","f980gpipi", "f980gKK",
......
......@@ -13,8 +13,10 @@ Hyp4Lh::Hyp4Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const
,_f1710f1370Hyp4(true)
,_f980f_2_1430Hyp4(true)
,_f980f_2_1525Hyp4(true)
,_f980f_2_1950Hyp4(true)
,_f1500f_2_1525Hyp4(true)
,_f1710f_2_1430Hyp4(true)
,_f1710f_2_1950Hyp4(true)
,_doHyp4(true)
,_nFitParams(0)
{
......@@ -28,8 +30,10 @@ Hyp4Lh::Hyp4Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map
,_f1710f1370Hyp4(true)
,_f980f_2_1430Hyp4(true)
,_f980f_2_1525Hyp4(true)
,_f980f_2_1950Hyp4(true)
,_f1500f_2_1525Hyp4(true)
,_f1710f_2_1430Hyp4(true)
,_f1710f_2_1950Hyp4(true)
,_doHyp4(true)
,_nFitParams(0)
{
......@@ -57,6 +61,9 @@ complex<double> Hyp4Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
double f_2_1525Mass=theParamVal.Bwf_2_1525.first;
double f_2_1525Width=theParamVal.Bwf_2_1525.second;
double f_2_1950Mass=theParamVal.Bwf_2_1950.first;
double f_2_1950Width=theParamVal.Bwf_2_1950.second;
if (_f980f1370Hyp4){
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980_pif1370_k=theParamVal.f980_pif1370_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980_kf1370_pi=theParamVal.f980_kf1370_pi;
......@@ -117,6 +124,17 @@ complex<double> Hyp4Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
result+=chiTof980_kf2_piAmp(theData, ChiTof980_kf2_pi, f980_Mass, f980_gKK, f980_gPiPi, f_2_1525Mass, f_2_1525Width);
}
if (_f980f_2_1950Hyp4){
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980_pif2_k=theParamVal.f980_pif_2_1950_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980_kf2_pi=theParamVal.f980_kf_2_1950_pi;
double f980_Mass=theParamVal.Flatf980;
double f980_gPiPi=theParamVal.Flatf980gPiPi;
double f980_gKK=theParamVal.Flatf980gKK;
result+=chiTof980_pif2_kAmp(theData, ChiTof980_pif2_k, f980_Mass, f980_gPiPi, f980_gKK, f_2_1950Mass, f_2_1950Width);
result+=chiTof980_kf2_piAmp(theData, ChiTof980_kf2_pi, f980_Mass, f980_gKK, f980_gPiPi, f_2_1950Mass, f_2_1950Width);
}
if (_f1500f_2_1525Hyp4){
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof1500_pif2_k=theParamVal.f1500_pif_2_1525_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof1500_kf2_pi=theParamVal.f1500_kf_2_1525_pi;
......@@ -135,6 +153,17 @@ complex<double> Hyp4Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
result+=chiTof0_pif2_kAmp(theData, ChiTof1710_pif2_k, f1710Mass, f1710Width, f_2_1430Mass, f_2_1430Width);
result+=chiTof2_pif0_kAmp(theData, ChiTof1710_kf2_pi, f_2_1430Mass, f_2_1430Width, f1710Mass, f1710Width);
}
if (_f1710f_2_1950Hyp4){
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof1710_pif2_k=theParamVal.f1710_pif_2_1950_k;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof1710_kf2_pi=theParamVal.f1710_kf_2_1950_pi;
double f1710Mass=theParamVal.Bwf1710.first;
double f1710Width=theParamVal.Bwf1710.second;
result+=chiTof0_pif2_kAmp(theData, ChiTof1710_pif2_k, f1710Mass, f1710Width, f_2_1950Mass, f_2_1950Width);
result+=chiTof2_pif0_kAmp(theData, ChiTof1710_kf2_pi, f_2_1950Mass, f_2_1950Width, f1710Mass, f1710Width);
}
return result;
}
......@@ -318,6 +347,17 @@ void Hyp4Lh::setUp(const std::map<const std::string, bool>& hypMap){
exit(0);
}
iter= hypMap.find("f980f_2_1950Hyp4");
if (iter !=hypMap.end()){
_f980f_2_1950Hyp4= iter->second;
Info<< "hypothesis " << iter->first << "\t" << _f980f_2_1950Hyp4 <<endmsg;
_hypMap[iter->first]= iter->second;
}
else{
Alert << "hypothesis f980f_2_1950Hyp4 not set!!!" <<endmsg;
exit(0);
}
iter= hypMap.find("f980f1500Hyp4");
if (iter !=hypMap.end()){
......@@ -354,7 +394,20 @@ void Hyp4Lh::setUp(const std::map<const std::string, bool>& hypMap){
exit(0);
}
if(!_f980f1370Hyp4 && !_f1710f1370Hyp4 && !_f980f_2_1430Hyp4 && !_f1710f_2_1430Hyp4) _doHyp4=false;
iter= hypMap.find("f1710f_2_1950Hyp4");
if (iter !=hypMap.end()){
_f1710f_2_1950Hyp4= iter->second;
Info<< "hypothesis " << iter->first << "\t" << _f1710f_2_1950Hyp4 <<endmsg;
_hypMap[iter->first]= iter->second;
}
else{
Alert << "hypothesis f1710f_2_1950Hyp4 not set!!!" <<endmsg;
exit(0);
}
if(!_f980f1370Hyp4 && !_f1710f1370Hyp4 && !_f980f_2_1430Hyp4 && !_f1710f_2_1430Hyp4 && !_f980f_2_1950Hyp4 && !_f1710f_2_1950Hyp4) _doHyp4=false;
if (!_doHyp4) return;
......@@ -380,6 +433,10 @@ void Hyp4Lh::setUp(const std::map<const std::string, bool>& hypMap){
_ampVec.push_back(paramEnum2K2PiGam::f980_pif_2_1525_k);
_ampVec.push_back(paramEnum2K2PiGam::f980_kf_2_1525_pi);
}
if (_f980f_2_1950Hyp4){
_ampVec.push_back(paramEnum2K2PiGam::f980_pif_2_1950_k);
_ampVec.push_back(paramEnum2K2PiGam::f980_kf_2_1950_pi);
}
if (_f1500f_2_1525Hyp4){
_ampVec.push_back(paramEnum2K2PiGam::f1500_pif_2_1525_k);
_ampVec.push_back(paramEnum2K2PiGam::f1500_kf_2_1525_pi);
......@@ -388,10 +445,15 @@ void Hyp4Lh::setUp(const std::map<const std::string, bool>& hypMap){
_ampVec.push_back(paramEnum2K2PiGam::f1710_pif_2_1430_k);
_ampVec.push_back(paramEnum2K2PiGam::f1710_kf_2_1430_pi);
}
if (_f1710f_2_1950Hyp4){
_ampVec.push_back(paramEnum2K2PiGam::f1710_pif_2_1950_k);
_ampVec.push_back(paramEnum2K2PiGam::f1710_kf_2_1950_pi);
}
if (_f980f1370Hyp4 || _f1710f1370Hyp4) _massVec.push_back(paramEnum2K2PiGam::f1370);
if (_f980f1500Hyp4 || _f1500f_2_1525Hyp4) _massVec.push_back(paramEnum2K2PiGam::f1500);
if (_f980f_2_1430Hyp4 || _f1710f_2_1430Hyp4) _massVec.push_back(paramEnum2K2PiGam::f_2_1430);
if (_f980f_2_1950Hyp4 || _f1710f_2_1950Hyp4) _massVec.push_back(paramEnum2K2PiGam::f_2_1950);
if (_f980f_2_1525Hyp4 || _f1500f_2_1525Hyp4) _massVec.push_back(paramEnum2K2PiGam::f_2_1525);
std::vector<unsigned int>::iterator ampIt;
......
......@@ -55,8 +55,10 @@ protected:
bool _f1710f1370Hyp4;
bool _f980f_2_1430Hyp4;
bool _f980f_2_1525Hyp4;
bool _f980f_2_1950Hyp4;
bool _f1500f_2_1525Hyp4;
bool _f1710f_2_1430Hyp4;
bool _f1710f_2_1950Hyp4;
bool _doHyp4;
virtual complex<double> chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2PiGamData::Psi2STo2K2PiGamEvtData* theData);
......
......@@ -156,8 +156,10 @@ int main(int __argc,char *__argv[]){
hypMap["f1710f1370Hyp4"]=true;
hypMap["f980f_2_1430Hyp4"]=true;
hypMap["f980f_2_1525Hyp4"]=true;
hypMap["f980f_2_1950Hyp4"]=true;
hypMap["f1500f_2_1525Hyp4"]=true;
hypMap["f1710f_2_1430Hyp4"]=true;
hypMap["f1710f_2_1950Hyp4"]=true;
hypMap["doHyp5"]=true;
hypMap["K_0_1430K_0_1950Hyp6"]=true;
hypMap["KappaK_0_1950Hyp6"]=true;
......
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