diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc index 55cead5cd02600357af25d8a12aae82e254a2a4a..56fdd30ab8713e6f9b0ae69e4b3ed49257bd6412 100644 --- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc +++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc @@ -18,6 +18,7 @@ FitParams2K2PiGam::FitParams2K2PiGam() _jpclsMap[paramEnum2K2PiGam::K_0_1430K_0_1430]=theStates.ChiTo2K_0_States(); _jpclsMap[paramEnum2K2PiGam::K_2_1430K_2_1430]=theStates.ChiTo2K_2_1430States(); _jpclsMap[paramEnum2K2PiGam::K_0_1430K_2_1430]=theStates.ChiToK0K2_States(); + _jpclsMap[paramEnum2K2PiGam::ChiToK_0_1430_K892]=theStates.ChiToKst0Kst1States(); _jpclsMap[paramEnum2K2PiGam::K_1_1410K_1_1410]=theStates.ChiTo2K892States(); _jpclsMap[paramEnum2K2PiGam::ChiToK_1_1410_K892]=theStates.ChiTo2K892States(); _jpclsMap[paramEnum2K2PiGam::ChiToK_1_1400K]=theStates.ChiToK1400ToK892piStates(); @@ -119,6 +120,7 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti else if (index==paramEnum2K2PiGam::K_0_1430K_0_1430) return params.ChiTo2K_0_1430; else if (index==paramEnum2K2PiGam::K_2_1430K_2_1430) return params.ChiTo2K_2_1430; else if (index==paramEnum2K2PiGam::K_0_1430K_2_1430) return params.ChiToK_0_1430_K_2_1430; + else if (index==paramEnum2K2PiGam::ChiToK_0_1430_K892) return params.ChiToK_0_1430_K892; else if (index==paramEnum2K2PiGam::K_1_1410K_1_1410) return params.ChiToK_1_1410_K_1_1410; else if (index==paramEnum2K2PiGam::ChiToK_1_1410_K892) return params.ChiToK_1_1410_K892; else if (index==paramEnum2K2PiGam::ChiToK_1_1400K) return params.ChiToK_1_1400K; diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh index 3539df71834b305ac85fa7b8aa633e1a3f86707e..b16525b7abfc6e8e907bdf66b3f8eb17a7ccabbb 100644 --- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh +++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh @@ -31,6 +31,7 @@ struct param2K2PiGam std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTo2K_2_1430; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTo2K_0_1430; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_0_1430_K_2_1430; + std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_0_1430_K892; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_1_1410_K_1_1410; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_1_1410_K892; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_1_1400K; @@ -146,7 +147,8 @@ struct param2K2PiGam }; struct paramEnum2K2PiGam{ - enum {ChiGam=0, K892K892, KappaKappa, K_0_1430K_0_1430, K_2_1430K_2_1430, K_0_1430K_2_1430, K_1_1410K_1_1410, ChiToK_1_1410_K892, + enum {ChiGam=0, K892K892, KappaKappa, K_0_1430K_0_1430, ChiToK_0_1430_K892, + K_2_1430K_2_1430, K_0_1430K_2_1430, K_1_1410K_1_1410, ChiToK_1_1410_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, @@ -173,7 +175,8 @@ struct paramEnum2K2PiGam{ static const std::string& name(unsigned int t) { static std::string fitName[paramEnum2K2PiGam::nPhaseSpace] - ={"ChiGam", "K892K892", "KappaKappa", "K_0_1430K_0_1430", "K_2_1430K_2_1430", "K_0_1430K_2_1430", "K_1_1410K_1_1410","ChiToK_1_1410_K892", + ={"ChiGam", "K892K892", "KappaKappa", "K_0_1430K_0_1430", "ChiToK_0_1430_K892", + "K_2_1430K_2_1430", "K_0_1430K_2_1430", "K_1_1410K_1_1410","ChiToK_1_1410_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", diff --git a/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc b/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc index 2041c431029317d3a6254b17cd6db6cfe2cda03e..fe162492ecf474a493bb851f1b429d75af43f2ef 100644 --- a/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc +++ b/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc @@ -12,6 +12,7 @@ Hyp1Lh::Hyp1Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const ,_K0_1430_K0_1430Hyp(true) ,_K2_1430_K2_1430Hyp(false) ,_K0_1430_K2_1430Hyp(false) + ,_K0_1430_K892Hyp1(true) ,_K1_1410_K1_1410Hyp(false) ,_K1_1410_K892Hyp1(true) ,_nFitParams(0) @@ -26,6 +27,7 @@ Hyp1Lh::Hyp1Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map ,_K0_1430_K0_1430Hyp(true) ,_K2_1430_K2_1430Hyp(false) ,_K0_1430_K2_1430Hyp(false) + ,_K0_1430_K892Hyp1(true) ,_K1_1410_K1_1410Hyp(false) ,_K1_1410_K892Hyp1(true) ,_nFitParams(0) @@ -81,7 +83,10 @@ complex<double> Hyp1Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2 if (_K0_1430_K0_1430Hyp) result+=chiTo2K_0_Amp(theData, ChiTo2K_0_1430, K_0_1430Mass, K_0_1430Width, K_0_1430Mass, K_0_1430Width); if (_K2_1430_K2_1430Hyp) result+=chiTo2K_2_Amp(theData, ChiTo2K_2_1430, K_2_1430Mass, K_2_1430Width); if (_K0_1430_K2_1430Hyp) result+=chiToK0K2Amp(theData, ChiToK_0_1430_K_2_1430, K_0_1430Mass, K_0_1430Width, K_2_1430Mass, K_2_1430Width); - + if(_K0_1430_K892Hyp1){ + std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_0_1430_K892=theParamVal.ChiToK_0_1430_K892; + result+=chiToK0K1Amp(theData, ChiToK_0_1430_K892, K_0_1430Mass, K_0_1430Width, K892Mass, K892Width); + } if (_K1_1410_K1_1410Hyp || _K1_1410_K892Hyp1){ double K_1_1410Mass=theParamVal.BwK_1_1410.first; double K_1_1410Width=theParamVal.BwK_1_1410.second; @@ -315,6 +320,17 @@ void Hyp1Lh::setUp(const std::map<const std::string, bool>& hypMap){ _hypMap[iter->first]= iter->second; Info<< "hypothesis " << iter->first << "\t" << _K0_1430_K2_1430Hyp <<endmsg; } + else Alert << "hypothesis K0_1430_K2_1430Hyp not set!!!" <<endmsg; + + + iter= hypMap.find("K0_1430_K892Hyp1"); + if (iter !=hypMap.end()){ + _K0_1430_K892Hyp1= iter->second; + _hypMap[iter->first]= iter->second; + Info<< "hypothesis " << iter->first << "\t" << _K0_1430_K892Hyp1 <<endmsg; + } + else Alert << "hypothesis K0_1430_K892Hyp1 not set!!!" <<endmsg; + iter= hypMap.find("K1_1410_K1_1410Hyp"); if (iter !=hypMap.end()){ @@ -351,6 +367,8 @@ void Hyp1Lh::setUp(const std::map<const std::string, bool>& hypMap){ if(_K2_1430_K2_1430Hyp) _ampVec.push_back(paramEnum2K2PiGam::K_2_1430K_2_1430); if(_K0_1430_K0_1430Hyp) _ampVec.push_back(paramEnum2K2PiGam::K_0_1430K_0_1430); if(_K0_1430_K2_1430Hyp) _ampVec.push_back(paramEnum2K2PiGam::K_0_1430K_2_1430); + if(_K0_1430_K892Hyp1) _ampVec.push_back(paramEnum2K2PiGam::ChiToK_0_1430_K892); + if(_K1_1410_K1_1410Hyp || _K1_1410_K892Hyp1){ _massVec.push_back(paramEnum2K2PiGam::K_1_1410); @@ -368,7 +386,7 @@ void Hyp1Lh::setUp(const std::map<const std::string, bool>& hypMap){ if(_K1_1270Hyp) _massVec.push_back(paramEnum2K2PiGam::K_1_1270); if(_K1_1400Hyp) _massVec.push_back(paramEnum2K2PiGam::K_1_1400); if(_K2_1430_K2_1430Hyp || _K0_1430_K2_1430Hyp) _massVec.push_back(paramEnum2K2PiGam::K_2_1430); - if(_K0_1430_K0_1430Hyp || _K0_1430_K2_1430Hyp || _K1_1270Hyp) _massVec.push_back(paramEnum2K2PiGam::K_0_1430); + if(_K0_1430_K0_1430Hyp || _K0_1430_K2_1430Hyp || _K1_1270Hyp || _K0_1430_K892Hyp1) _massVec.push_back(paramEnum2K2PiGam::K_0_1430); std::vector<unsigned int>::iterator ampIt; for (ampIt=_ampVec.begin(); ampIt!=_ampVec.end(); ++ampIt){ diff --git a/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh b/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh index 12ed038104dab0589645830ea8f664ca6aff3cbd..62c43ad428453e794a9aad874f396099fae50d7c 100644 --- a/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh +++ b/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh @@ -58,6 +58,7 @@ protected: bool _K0_1430_K0_1430Hyp; bool _K2_1430_K2_1430Hyp; bool _K0_1430_K2_1430Hyp; + bool _K0_1430_K892Hyp1; bool _K1_1410_K1_1410Hyp; bool _K1_1410_K892Hyp1; std::map<const std::string, bool> _hypMap; diff --git a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc index c11b660dd0ef9e21b5ec9ef125844999fe1108bc..eaae9af8b29428bb47629acff1908f41f0681967 100644 --- a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc +++ b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc @@ -147,6 +147,7 @@ int main(int __argc,char *__argv[]){ hypMap["K0_1430_K0_1430Hyp"]=true; hypMap["K2_1430_K2_1430Hyp"]=true; hypMap["K0_1430_K2_1430Hyp"]=true; + hypMap["K0_1430_K892Hyp1"]=true; hypMap["K1_1410_K1_1410Hyp"]=true; hypMap["K1_1410_K892Hyp1"]=true; hypMap["doHyp2"]=true;