diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc index c04ca59a82e02bd7ff4bd184fcbb1151ebfe22ce..a786f4561242556f131147d6f73c3e3bafdb9cf3 100644 --- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc +++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc @@ -65,6 +65,7 @@ FitParams2K2PiGam::FitParams2K2PiGam() _jpclsMap[paramEnum2K2PiGam::ChiToK_1_2400K]=theStates.ChiToK1400ToK892piStates(); _jpclsMap[paramEnum2K2PiGam::K_1_2400Tof980K]=theStates.K1pTof0KStates(); _jpclsMap[paramEnum2K2PiGam::K_1_2400Tof1710K]=theStates.K1pTof0KStates(); + _jpclsMap[paramEnum2K2PiGam::K_1_2400ToK_0_1430Pi]=theStates.K1ToK0PiStates(); _jpclsMap[paramEnum2K2PiGam::K892K_1_1680]=theStates.ChiTo2K892States(); _jpclsMap[paramEnum2K2PiGam::ChiToK1680K1680]=theStates.ChiTo2K892States(); _jpclsMap[paramEnum2K2PiGam::ChiToK1680K_0_1430]=theStates.ChiToKst0Kst1States(); @@ -170,6 +171,7 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti else if (index==paramEnum2K2PiGam::ChiToK_1_2400K) return params.ChiToK_1_2400K; else if (index==paramEnum2K2PiGam::K_1_2400Tof980K) return params.K_1_2400Tof980K; else if (index==paramEnum2K2PiGam::K_1_2400Tof1710K) return params.K_1_2400Tof1710K; + else if (index==paramEnum2K2PiGam::K_1_2400ToK_0_1430Pi) return params.K_1_2400ToK_0_1430Pi; else if (index==paramEnum2K2PiGam::K892K_1_1680) return params.ChiToK892K1680; else if (index==paramEnum2K2PiGam::ChiToK1680K1680) return params.ChiToK1680K1680; else if (index==paramEnum2K2PiGam::ChiToK1680K_0_1430) return params.ChiToK1680K_0_1430; diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh index 6b16abd01f5616adef6065a0b748e902ede0fc61..0875e680df73bb6b08f806217e3457ec60c97f0f 100644 --- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh +++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh @@ -43,6 +43,7 @@ struct param2K2PiGam std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_1_2400K; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_2400Tof980K; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_2400Tof1710K; + std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_2400ToK_0_1430Pi; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_pif1710_k; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf1710_pi; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof1710f1710; @@ -154,7 +155,7 @@ struct paramEnum2K2PiGam{ K_2_1430K_2_1430, K_0_1430K_2_1430, K_1_1410K_1_1410, ChiToK_1_1410_K892, ChiToK_2_1430_K892, ChiToK_1_1400K, K_1_1400ToK892Pi, ChiToK_1_1270_K, K_1_1270ToK892Pi, K_1_1270ToK_0_1430Pi, ChiToK_1_1650K, K_1_1650ToK892Pi, K_1_1650ToK_0_1430Pi, K_0_1430K_0_1950, KappaK_0_1950, ChiToKappaK_0_1430, - ChiToK_1_2400K, K_1_2400Tof980K, K_1_2400Tof1710K, + ChiToK_1_2400K, K_1_2400Tof980K, K_1_2400Tof1710K, K_1_2400ToK_0_1430Pi, f980_pif1710_k, f980_kf1710_pi, ChiTof1710f1710, f980f980, f980f2200, ChiTof980f_2_2300, ChiTof_2_2300sigma, f980_pif1370_k, f980_kf1370_pi, f980_pif1500_k, f980_kf1500_pi, f1710_pif1370_k, f1710_kf1370_pi, K_0_2400KToKf980, ChiToK_0_2400ToKf_0_1710, K892K_1_1680, ChiToK1680K1680, ChiToK1680K_0_1430, K892K_1_2300, @@ -182,7 +183,7 @@ struct paramEnum2K2PiGam{ "K_2_1430K_2_1430", "K_0_1430K_2_1430", "K_1_1410K_1_1410","ChiToK_1_1410_K892","ChiToK_2_1430_K892", "ChiToK_1_1400K", "K_1_1400ToK892Pi", "ChiToK_1_1270_K", "K_1_1270ToK892Pi", "K_1_1270ToK_0_1430Pi", "ChiToK_1_1650K", "K_1_1650ToK892Pi", "K_1_1650ToK_0_1430Pi","K_0_1430K_0_1950", "KappaK_0_1950","ChiToKappaK_0_1430", - "ChiToK_1_2400K", "K_1_2400Tof980K","K_1_2400Tof1710K", + "ChiToK_1_2400K", "K_1_2400Tof980K","K_1_2400Tof1710K", "K_1_2400ToK_0_1430Pi", "f980_pif1710_k", "f980_kf1710_pi", "ChiTof1710f1710", "f980f980", "f980f2200", "ChiTof980f_2_2300","ChiTof_2_2300sigma", "f980_pif1370_k", "f980_kf1370_pi", "f980_pif1500_k", "f980_kf1500_pi", "f1710_pif1370_k", "f1710_kf1370_pi", "K_0_2400KToKf980", "ChiToK_0_2400ToKf_0_1710", "K892K_1_1680", "ChiToK1680K1680", "ChiToK1680K_0_1430", "K892K_1_2300", diff --git a/Examples/Psi2STo2K2PiGam/Hyp5Lh.cc b/Examples/Psi2STo2K2PiGam/Hyp5Lh.cc index dc554036cb0b68d0b30dc62b7eda9c735c9456ad..f69336b54d4becd67a0a8b1695604652d57fd333 100644 --- a/Examples/Psi2STo2K2PiGam/Hyp5Lh.cc +++ b/Examples/Psi2STo2K2PiGam/Hyp5Lh.cc @@ -14,6 +14,7 @@ Hyp5Lh::Hyp5Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const ,_K_0_2400KTof_0_1710Hyp5(true) ,_K_1_2400KHyp5(true) ,_K_1_2400KTof_0_1710Hyp5(true) + ,_K_1_2400KToK_0_1430Hyp5(true) ,_ChiToK_0_1430KPiHyp5(true) ,_ChiToK892KPiHyp5(true) , _nFitParams(0) @@ -28,6 +29,7 @@ Hyp5Lh::Hyp5Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map ,_K_0_2400KTof_0_1710Hyp5(true) ,_K_1_2400KHyp5(true) ,_K_1_2400KTof_0_1710Hyp5(true) + ,_K_1_2400KToK_0_1430Hyp5(true) ,_ChiToK_0_1430KPiHyp5(true) ,_ChiToK892KPiHyp5(true) , _nFitParams(0) @@ -70,7 +72,7 @@ complex<double> Hyp5Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2 } - if (_K_1_2400KHyp5 || _K_1_2400KTof_0_1710Hyp5){ + if (_K_1_2400KHyp5 || _K_1_2400KTof_0_1710Hyp5 || _K_1_2400KToK_0_1430Hyp5){ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_1_2400K=theParamVal.ChiToK_1_2400K; double K_1_2400Mass=theParamVal.BwK_1_2400.first; double K_1_2400Width=theParamVal.BwK_1_2400.second; @@ -86,6 +88,13 @@ complex<double> Hyp5Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2 std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_2400Tof1710K=theParamVal.K_1_2400Tof1710K; result+=chiToK1Tof0_piKAmp(theData, ChiToK_1_2400K, K_1_2400Tof1710K, K_1_2400Mass, K_1_2400Width, f1710Mass, f1710Width); } + + if(_K_1_2400KToK_0_1430Hyp5){ + double K_0_1430Mass=theParamVal.BwK_0_1430.first; + double K_0_1430Width=theParamVal.BwK_0_1430.second; + std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_2400ToK_0_1430Pi=theParamVal.K_1_2400ToK_0_1430Pi; + result+=chiToK1ToK0piAmp(theData, ChiToK_1_2400K, K_1_2400ToK_0_1430Pi, K_1_2400Mass, K_1_2400Width, K_0_1430Mass, K_0_1430Width); + } } if(_ChiToK_0_1430KPiHyp5){ @@ -273,6 +282,14 @@ void Hyp5Lh::setUp(const std::map<const std::string, bool>& hypMap){ } else Alert << "hypothesis K_1_2400KTof_0_1710Hyp5 not set!!!" <<endmsg; + iter= hypMap.find("K_1_2400KToK_0_1430Hyp5"); + if (iter !=hypMap.end()){ + _K_1_2400KToK_0_1430Hyp5= iter->second; + Info<< "hypothesis " << iter->first << "\t" << _K_1_2400KToK_0_1430Hyp5 <<endmsg; + _hypMap[iter->first]= iter->second; + } + else Alert << "hypothesis K_1_2400KToK_0_1430Hyp5 not set!!!" <<endmsg; + iter= hypMap.find("K_0_2400KTof_0_1710Hyp5"); @@ -314,7 +331,7 @@ void Hyp5Lh::setUp(const std::map<const std::string, bool>& hypMap){ } - if(_K_1_2400KHyp5 || _K_1_2400KTof_0_1710Hyp5){ + if(_K_1_2400KHyp5 || _K_1_2400KTof_0_1710Hyp5 || _K_1_2400KToK_0_1430Hyp5){ _ampVec.push_back(paramEnum2K2PiGam::ChiToK_1_2400K); _massVec.push_back(paramEnum2K2PiGam::K_1_2400); if(_K_1_2400KHyp5){ @@ -323,6 +340,9 @@ void Hyp5Lh::setUp(const std::map<const std::string, bool>& hypMap){ if(_K_1_2400KTof_0_1710Hyp5){ _ampVec.push_back(paramEnum2K2PiGam::K_1_2400Tof1710K); } + if(_K_1_2400KToK_0_1430Hyp5){ + _ampVec.push_back(paramEnum2K2PiGam::K_1_2400ToK_0_1430Pi); + } } if(_ChiToK_0_1430KPiHyp5){ diff --git a/Examples/Psi2STo2K2PiGam/Hyp5Lh.hh b/Examples/Psi2STo2K2PiGam/Hyp5Lh.hh index 77c943153885eeaa679e6403cfaa3cbe17a14560..d5d43fc4ddb599019d3c69e417b9a4f66fb031ad 100644 --- a/Examples/Psi2STo2K2PiGam/Hyp5Lh.hh +++ b/Examples/Psi2STo2K2PiGam/Hyp5Lh.hh @@ -56,6 +56,7 @@ protected: bool _K_0_2400KTof_0_1710Hyp5; bool _K_1_2400KHyp5; bool _K_1_2400KTof_0_1710Hyp5; + bool _K_1_2400KToK_0_1430Hyp5; bool _ChiToK_0_1430KPiHyp5; bool _ChiToK892KPiHyp5; diff --git a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc index d31b19cd5607da04295f6eb9dc1440ad2068d4ee..bddb221723afd988481d4d87677c1bcbad343c47 100644 --- a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc +++ b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc @@ -172,6 +172,7 @@ int main(int __argc,char *__argv[]){ hypMap["K_0_2400KTof_0_1710Hyp5"]=true; hypMap["K_1_2400KHyp5"]=true; hypMap["K_1_2400KTof_0_1710Hyp5"]=true; + hypMap["K_1_2400KToK_0_1430Hyp5"]=true; hypMap["ChiToK_0_1430KPiHyp5"]=true; hypMap["ChiToK892KPiHyp5"]=true; hypMap["K_0_1430K_0_1950Hyp6"]=true;