diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
index 701ac49a4a181da16de48c480e2bf3745577c416..d859ace82991507bb8d1542b8f7f426877dab178 100644
--- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
+++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
@@ -79,6 +79,7 @@ FitParams2K2PiGam::FitParams2K2PiGam()
_jpclsMap[paramEnum2K2PiGam::ChiToPi1800Pi0ToK892K]=theStates.Pi0pToKstKStates();
_jpclsMap[paramEnum2K2PiGam::ChiToPi_2_2285Pi]=theStates.ChiToPi_2PiStates();
_jpclsMap[paramEnum2K2PiGam::Pi_2_2285Tof1700Pi]=theStates.Pi_2Tof0PiStates();
+ _jpclsMap[paramEnum2K2PiGam::Pi_2_2285ToK892KPi]=theStates.Pi_2ToKst1KStates();
_jpclsMap[paramEnum2K2PiGam::ChiToK_2_1770K]=theStates.ChiToK2mK0mStates();
_jpclsMap[paramEnum2K2PiGam::K_2_1770ToK_2_1430Pi]=theStates.K2mToK2pPiStates();
_jpclsMap[paramEnum2K2PiGam::ChiToK_0_1430KPi]=theStates.ChiTo2K_0_States();
@@ -171,6 +172,7 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti
else if (index==paramEnum2K2PiGam::ChiToPi1800Pi0ToK892K) return params.ChiToPi1800Pi0ToK892K;
else if (index==paramEnum2K2PiGam::ChiToPi_2_2285Pi) return params.ChiToPi_2_2285Pi;
else if (index==paramEnum2K2PiGam::Pi_2_2285Tof1700Pi) return params.Pi_2_2285Tof1700Pi;
+ else if (index==paramEnum2K2PiGam::Pi_2_2285ToK892KPi) return params.Pi_2_2285ToK892KPi;
else if (index==paramEnum2K2PiGam::ChiToK_2_1770K) return params.ChiToK_2_1770K;
else if (index==paramEnum2K2PiGam::K_2_1770ToK_2_1430Pi) return params.K_2_1770ToK_2_1430Pi;
else if (index==paramEnum2K2PiGam::ChiToK_0_1430KPi) return params.ChiToK_0_1430KPi;
diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
index 4ef2bdfdc24d39e8c83b5d63b6a05c61b19a5a37..801506bfef1d4093b8258a55644163f42bc473a5 100644
--- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
+++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
@@ -92,6 +92,7 @@ struct param2K2PiGam
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi1800Pi0ToK892K;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi_2_2285Pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_2285Tof1700Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_2285ToK892KPi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_2_1770K;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_2_1770ToK_2_1430Pi;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_0_1430KPi;
@@ -147,7 +148,7 @@ struct paramEnum2K2PiGam{
f980_pif_2_1270_k, f980_kf_2_1270_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,
ChiToPi_2_1670Pi, Pi_2_1670Tof_2_1270Pi, Pi_2_1670ToK892K, ChiToPi1800Pi0Tof980, ChiToPi1800Pi0Tof1370, ChiToPi1800Pi0ToKappa, ChiToPi1800Pi0ToK892K,
- ChiToPi_2_2285Pi,Pi_2_2285Tof1700Pi, ChiToK_2_1770K, K_2_1770ToK_2_1430Pi, ChiToK_0_1430KPi, nAmps,
+ ChiToPi_2_2285Pi,Pi_2_2285Tof1700Pi, Pi_2_2285ToK892KPi, ChiToK_2_1770K, K_2_1770ToK_2_1430Pi, ChiToK_0_1430KPi, nAmps,
K892=nAmps,Kappa, K_0_1430, K_1_1400, K_1_1410, K_2_1430, K_1_1270,K_1_1650,
f1500, f1710, f2200, sigma, f1360, f1370, K_0_2400, K_1_2400, K_0_1950, K_1_1680, K_1_2300, K_0_1460, K_0_1830,
@@ -172,7 +173,7 @@ struct paramEnum2K2PiGam{
"f980_pif_2_1270_k", "f980_kf_2_1270_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",
"ChiToPi_2_1670Pi","Pi_2_1670Tof_2_1270Pi","Pi_2_1670ToK892K","ChiToPi1800Pi0Tof980","ChiToPi1800Pi0Tof1370","ChiToPi1800Pi0ToKappa","ChiToPi1800Pi0ToK892K",
- "ChiToPi_2_2285Pi","Pi_2_2285Tof1700Pi","ChiToK_2_1770K","K_2_1770ToK_2_1430Pi","ChiToK_0_1430KPi",
+ "ChiToPi_2_2285Pi","Pi_2_2285Tof1700Pi","Pi_2_2285ToK892KPi","ChiToK_2_1770K","K_2_1770ToK_2_1430Pi","ChiToK_0_1430KPi",
"K892", "Kappa", "K_0_1430", "K_1_1400", "K_1_1410", "K_2_1430", "K_1_1270", "K_1_1650",
"f1500", "f1710", "f2200", "sigma", "f1360", "f1370", "K_0_2400", "K_1_2400", "K_0_1950", "K_1_1680", "K_1_2300", "K_0_1460", "K_0_1830",
diff --git a/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc b/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc
index 04bfe72685881c348e429b86943c66ffec62942e..109e29fcf1c5c2f12ff7957d07de00f1f95cd116 100644
--- a/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc
+++ b/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc
@@ -16,6 +16,7 @@ Hyp9Lh::Hyp9Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const
,_Pi1800ToKappaKHyp9(true)
,_Pi1800Pi0ToK892KHyp9(true)
,_Pi_2_2285Tof1710PiHyp9(true)
+ ,_Pi_2_2285ToK892KHyp9(true)
,_f980f_2_2300Hyp9(true)
,_f_2_2300sigmaHyp9(true)
,_K_2_1770ToK_2_1430PiHyp9(true)
@@ -34,6 +35,7 @@ Hyp9Lh::Hyp9Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map
,_Pi1800ToKappaKHyp9(true)
,_Pi1800Pi0ToK892KHyp9(true)
,_Pi_2_2285Tof1710PiHyp9(true)
+ ,_Pi_2_2285ToK892KHyp9(true)
,_f980f_2_2300Hyp9(true)
,_f_2_2300sigmaHyp9(true)
,_K_2_1770ToK_2_1430PiHyp9(true)
@@ -123,15 +125,26 @@ complex<double> Hyp9Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
}
- if (_Pi_2_2285Tof1710PiHyp9){
+ if (_Pi_2_2285Tof1710PiHyp9 || _Pi_2_2285ToK892KHyp9){
double Pi_2_2285Mass=theParamVal.BwPi_2_2285.first;
double Pi_2_2285Width=theParamVal.BwPi_2_2285.second;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi_2_2285Pi=theParamVal.ChiToPi_2_2285Pi;
+std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi_2_2285Pi=theParamVal.ChiToPi_2_2285Pi;
+ if(_Pi_2_2285Tof1710PiHyp9){
+
double f1710Mass=theParamVal.Bwf1710.first;
double f1710Width=theParamVal.Bwf1710.second;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_2285Tof1700Pi=theParamVal.Pi_2_2285Tof1700Pi;
- result+=chiToPi2Pi0Tof0PiAmp(theData, ChiToPi_2_2285Pi, Pi_2_2285Tof1700Pi, Pi_2_2285Mass, Pi_2_2285Width, f1710Mass, f1710Width);
+ result+=chiToPi2Pi0Tof0PiAmp(theData, ChiToPi_2_2285Pi, Pi_2_2285Tof1700Pi, Pi_2_2285Mass, Pi_2_2285Width, f1710Mass, f1710Width);
+ }
+
+ if(_Pi_2_2285ToK892KHyp9){
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_2285ToK892KPi=theParamVal.Pi_2_2285ToK892KPi;
+ double K892Mass=theParamVal.BwK892.first;
+ double K892Width=theParamVal.BwK892.second;
+
+ result+=chiToPi2Pi0ToKstarKAmp(theData, ChiToPi_2_2285Pi, Pi_2_2285ToK892KPi, Pi_2_2285Mass, Pi_2_2285Width, K892Mass, K892Width);
+ }
}
if (_f980f_2_2300Hyp9 || _f_2_2300sigmaHyp9){
@@ -382,6 +395,20 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
exit(0);
}
+
+ iter= hypMap.find("Pi_2_2285ToK892KHyp9");
+
+ if (iter !=hypMap.end()){
+ _Pi_2_2285ToK892KHyp9= iter->second;
+ Info<< "hypothesis " << iter->first << "\t" << _Pi_2_2285ToK892KHyp9 <<endmsg;
+ _hypMap[iter->first]= iter->second;
+ }
+ else{
+ Alert << "Pi_2_2285ToK892KHyp9 not set!!!" <<endmsg;
+ exit(0);
+ }
+
+
iter= hypMap.find("f980f_2_2300Hyp9");
if (iter !=hypMap.end()){
@@ -461,10 +488,17 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
}
- if (_Pi_2_2285Tof1710PiHyp9){
+ if (_Pi_2_2285Tof1710PiHyp9 || _Pi_2_2285ToK892KHyp9){
_ampVec.push_back(paramEnum2K2PiGam::ChiToPi_2_2285Pi);
- _ampVec.push_back(paramEnum2K2PiGam::Pi_2_2285Tof1700Pi);
_massVec.push_back(paramEnum2K2PiGam::Pi_2_2285);
+
+ if (_Pi_2_2285Tof1710PiHyp9){
+ _ampVec.push_back(paramEnum2K2PiGam::Pi_2_2285Tof1700Pi);
+ }
+
+ if (_Pi_2_2285ToK892KHyp9){
+ _ampVec.push_back(paramEnum2K2PiGam::Pi_2_2285ToK892KPi);
+ }
}
if (_f980f_2_2300Hyp9 || _f_2_2300sigmaHyp9){
diff --git a/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh b/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh
index e3d9f10892ee091cd2944a48e88763ac7f2b139b..94358e5ce9560139943d757636b8febdd62081fc 100644
--- a/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh
+++ b/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh
@@ -57,6 +57,7 @@ protected:
bool _Pi1800ToKappaKHyp9;
bool _Pi1800Pi0ToK892KHyp9;
bool _Pi_2_2285Tof1710PiHyp9;
+ bool _Pi_2_2285ToK892KHyp9;
bool _f980f_2_2300Hyp9;
bool _f_2_2300sigmaHyp9;
bool _K_2_1770ToK_2_1430PiHyp9;
diff --git a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
index 8fc47458bfacfb0c119c7b0cd6ee734608a46911..56d321199f72dca5b1626f5d76719f2a3273fd7f 100644
--- a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
+++ b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
@@ -182,6 +182,7 @@ int main(int __argc,char *__argv[]){
hypMap["Pi1800Tof980PiHyp9"]=true;
hypMap["Pi1800Tof1370PiHyp9"]=true;
hypMap["Pi_2_2285Tof1710PiHyp9"]=true;
+ hypMap["Pi_2_2285ToK892KHyp9"]=true;
hypMap["Pi1800Pi0ToK892KHyp9"]=true;
hypMap["f980f_2_2300Hyp9"]=true;
hypMap["f_2_2300sigmaHyp9"]=true;
diff --git a/Jamroot b/Jamroot
index be07238cb8e8eb7871f921b9c523eb859da78b67..c0ef61e5cefa421e41835b2ffc35f09e208364cc 100644
--- a/Jamroot
+++ b/Jamroot
@@ -5,10 +5,11 @@ BOOSTLIBS = -lboost_date_time -lboost_filesystem -lboost_program_options -lboos
project :
requirements <include>./
-# <include>$(extern)/log4cpp/include
+ <include>$(extern)/log4cpp/include
<include>$(extern)/include
<include>$(ROOTSYS)/include
<include>$(GENEVA)/include
+ <include>$(HEPMC)/include
<link>static
<cxxflags>-pthread
<linkflags>$(ROOTLIBS)
@@ -30,7 +31,7 @@ lib Geneva : : <file>$(GENEVA)/lib/libgemfony-common.so
<file>$(GENEVA)/lib/libgemfony-hap.so
<file>$(GENEVA)/lib/libgemfony-geneva-individuals.so
: : ;
-lib HepMc : : <file>$(extern)/lib/libHepMC.so : : ;
+lib HepMc : : <file>$(HEPMC)/lib/libHepMC.so : : ;
build-project qft++ ;
build-project Utils ;