diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
index 56fdd30ab8713e6f9b0ae69e4b3ed49257bd6412..8ded6267cc00380c8d1c6c838a6691000f08f472 100644
--- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
+++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
@@ -34,6 +34,7 @@ FitParams2K2PiGam::FitParams2K2PiGam()
_jpclsMap[paramEnum2K2PiGam::KappaK_0_1950]=theStates.ChiTo2K_0_States();
_jpclsMap[paramEnum2K2PiGam::f980_pif1710_k]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980_kf1710_pi]=theStates.ChiTof0f0States();
+ _jpclsMap[paramEnum2K2PiGam::ChiTof1710f1710]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980f980]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980f2200]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::ChiTof980f_2_2300]=theStates.ChiTof0f2States();
@@ -136,6 +137,7 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti
else if (index==paramEnum2K2PiGam::KappaK_0_1950) return params.ChiToKappaK_0_1950;
else if (index==paramEnum2K2PiGam::f980_pif1710_k) return params.f980_pif1710_k;
else if (index==paramEnum2K2PiGam::f980_kf1710_pi) return params.f980_kf1710_pi;
+ else if (index==paramEnum2K2PiGam::ChiTof1710f1710) return params.ChiTof1710f1710;
else if (index==paramEnum2K2PiGam::f980f980) return params.ChiTof980f980;
else if (index==paramEnum2K2PiGam::f980f2200) return params.ChiTof980f2200;
else if (index==paramEnum2K2PiGam::ChiTof980f_2_2300) return params.ChiTof980f_2_2300;
diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
index b16525b7abfc6e8e907bdf66b3f8eb17a7ccabbb..a040a54172636d1851451a55fa091a51b402ebb4 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 > K_1_2400Tof980K;
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;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980f980;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980f2200;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980f_2_2300;
@@ -152,7 +153,7 @@ struct paramEnum2K2PiGam{
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,
- f980_pif1710_k, f980_kf1710_pi, f980f980, f980f2200, ChiTof980f_2_2300, ChiTof_2_2300sigma,
+ 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,
sigmaf980, ChiToSigmaf1370, sigmaf1710, sigmaf2200, K_0_1460ToK892Pi, K_0_1460ToK_0_1430Pi, K_0_1830ToK892Pi, K_0_1830ToK_0_1430Pi,
@@ -180,7 +181,7 @@ struct paramEnum2K2PiGam{
"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",
- "f980_pif1710_k", "f980_kf1710_pi", "f980f980", "f980f2200", "ChiTof980f_2_2300","ChiTof_2_2300sigma",
+ "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",
"sigmaf980", "ChiToSigmaf1370", "sigmaf1710", "sigmaf2200", "K_0_1460ToK892Pi", "K_0_1460ToK_0_1430Pi","K_0_1830ToK892Pi", "K_0_1830ToK_0_1430Pi",
diff --git a/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc b/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc
index fe162492ecf474a493bb851f1b429d75af43f2ef..59fbc5f00d018a8404d4b3dd1ef7f489b4c87c25 100644
--- a/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc
+++ b/Examples/Psi2STo2K2PiGam/Hyp1Lh.cc
@@ -15,6 +15,7 @@ Hyp1Lh::Hyp1Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const
,_K0_1430_K892Hyp1(true)
,_K1_1410_K1_1410Hyp(false)
,_K1_1410_K892Hyp1(true)
+ ,_f1710_f1710Hyp1(true)
,_nFitParams(0)
{
setUp(hypMap);
@@ -30,6 +31,7 @@ Hyp1Lh::Hyp1Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map
,_K0_1430_K892Hyp1(true)
,_K1_1410_K1_1410Hyp(false)
,_K1_1410_K892Hyp1(true)
+ ,_f1710_f1710Hyp1(true)
,_nFitParams(0)
{
setUp(hypMap);
@@ -129,6 +131,11 @@ complex<double> Hyp1Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
//Chi_c0 decay to f0(980) f0(980) -> (pi0 pi0) (K K)
result+=chiTof980f980Amp(theData, ChiTof980f980, f980_Mass, f980_gPiPi, f980_gKK);
+ if(_f1710_f1710Hyp1){
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof1710f1710=theParamVal.ChiTof1710f1710;
+ result+=chiTof0_pif0_kAmp(theData, ChiTof1710f1710, f1710Mass, f1710Width, f1710Mass, f1710Width);
+ }
+
return result;
}
@@ -348,6 +355,14 @@ void Hyp1Lh::setUp(const std::map<const std::string, bool>& hypMap){
}
else Alert << "hypothesis K1_1410_K892Hyp1 not set!!!" <<endmsg;
+ iter= hypMap.find("f1710_f1710Hyp1");
+ if (iter !=hypMap.end()){
+ _f1710_f1710Hyp1= iter->second;
+ _hypMap[iter->first]= iter->second;
+ Info<< "hypothesis " << iter->first << "\t" << _f1710_f1710Hyp1 <<endmsg;
+ }
+ else Alert << "hypothesis f1710_f1710Hyp1 not set!!!" <<endmsg;
+
_ampVec.push_back(paramEnum2K2PiGam::ChiGam);
_ampVec.push_back(paramEnum2K2PiGam::K892K892);
@@ -381,6 +396,8 @@ void Hyp1Lh::setUp(const std::map<const std::string, bool>& hypMap){
}
}
+ if(_f1710_f1710Hyp1) _ampVec.push_back(paramEnum2K2PiGam::ChiTof1710f1710);
+
_massVec.push_back(paramEnum2K2PiGam::K892);
_massVec.push_back(paramEnum2K2PiGam::f1710);
if(_K1_1270Hyp) _massVec.push_back(paramEnum2K2PiGam::K_1_1270);
@@ -388,6 +405,8 @@ void Hyp1Lh::setUp(const std::map<const std::string, bool>& hypMap){
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 || _K0_1430_K892Hyp1) _massVec.push_back(paramEnum2K2PiGam::K_0_1430);
+
+
std::vector<unsigned int>::iterator ampIt;
for (ampIt=_ampVec.begin(); ampIt!=_ampVec.end(); ++ampIt){
std::vector< boost::shared_ptr<const JPCLS> > JPCLSs=_fitParams2K2PiGam.jpclsVec(*ampIt);
diff --git a/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh b/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh
index 62c43ad428453e794a9aad874f396099fae50d7c..d131592af72d78c9fefb39dbd654330193d6f512 100644
--- a/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh
+++ b/Examples/Psi2STo2K2PiGam/Hyp1Lh.hh
@@ -61,6 +61,7 @@ protected:
bool _K0_1430_K892Hyp1;
bool _K1_1410_K1_1410Hyp;
bool _K1_1410_K892Hyp1;
+ bool _f1710_f1710Hyp1;
std::map<const std::string, bool> _hypMap;
virtual complex<double> chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2PiGamData::Psi2STo2K2PiGamEvtData* theData);
diff --git a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
index eaae9af8b29428bb47629acff1908f41f0681967..ba037679f4b09b50ce8be560df792a57003827ab 100644
--- a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
+++ b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
@@ -150,6 +150,7 @@ int main(int __argc,char *__argv[]){
hypMap["K0_1430_K892Hyp1"]=true;
hypMap["K1_1410_K1_1410Hyp"]=true;
hypMap["K1_1410_K892Hyp1"]=true;
+ hypMap["f1710_f1710Hyp1"]=true;
hypMap["doHyp2"]=true;
hypMap["sigmaf980Hyp3"]=true;
hypMap["sigmaf1710Hyp3"]=true;