diff --git a/Examples/Psi2STo2K2PiGam/AbsPsi2STo2K2PiGamLh.cc b/Examples/Psi2STo2K2PiGam/AbsPsi2STo2K2PiGamLh.cc
index fa341074a75d3399cbf11cf18bccdc356d4487fa..ff7373024eea7ba89a5372b150980fabf504a4e5 100644
--- a/Examples/Psi2STo2K2PiGam/AbsPsi2STo2K2PiGamLh.cc
+++ b/Examples/Psi2STo2K2PiGam/AbsPsi2STo2K2PiGamLh.cc
@@ -1217,7 +1217,7 @@ complex<double> AbsPsi2STo2K2PiGamLh::chiToPi2Pi0ToKstarKAmp(Psi2STo2K2PiGamDat
if( fabs(lamKstar)>theDecState->J || fabs(lamKstar)>theDecState->S) continue;
- tmpDec+=sqrt(2.*theDecState->L+1)*Clebsch(theDecState->L, 0., theDecState->S, lamKstar, theDecState->J, lamKstar)*Clebsch(Kstar_Spin,lamKstar, 0, 0, theDecState->S, lamKstar)*sqrt(2.*L_KstarDec+1.)
+ tmpDec+=sqrt(2.*theDecState->L+1)*Clebsch(theDecState->L, 0, theDecState->S, lamKstar, theDecState->J, lamKstar)*Clebsch(Kstar_Spin,lamKstar, 0, 0, theDecState->S, lamKstar)*sqrt(2.*L_KstarDec+1.)
*(( BreitWigner(KKPi0, Pi_2_Mass, Pi_2_Width)
*( BreitWignerBlattW(Kstarp_pi0, 0.493677, 0.1349766, Kstar_Mass, Kstar_Width,L_KstarDec)
*theData->DfPi2ToKstarpK_pi0[theDecState->J][lamPi2][lamKstar]*theData->DfKst1pToKpPi0ViaKKPi0[Kstar_Spin][lamKstar][0]
diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
index dbe295df688064f41dbb59fa500cf09a9bb810db..95e6024753002f0f7395342a3770f25796d80557 100644
--- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
+++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
@@ -77,9 +77,12 @@ FitParams2K2PiGam::FitParams2K2PiGam()
_jpclsMap[paramEnum2K2PiGam::ChiToPi1800Pi0Tof1370]=theStates.ChiToPi0Pi0States();
_jpclsMap[paramEnum2K2PiGam::ChiToPi1800Pi0ToKappa]=theStates.ChiToPi0Pi0States();
_jpclsMap[paramEnum2K2PiGam::ChiToPi1800Pi0ToK892K]=theStates.Pi0pToKstKStates();
+ _jpclsMap[paramEnum2K2PiGam::ChiToPi3000Pi0ToK892K]=theStates.Pi0pToKstKStates();
+ _jpclsMap[paramEnum2K2PiGam::ChiToPi3000Pi0ToK_0_1950K]=theStates.ChiToPi0Pi0States();
_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::Pi_2_2285ToK_0_1430K]=theStates.Pi_2ToKst0KStates();
_jpclsMap[paramEnum2K2PiGam::Pi_2_2285ToK_2_1430K]=theStates.Pi_2ToKst2KStates();
_jpclsMap[paramEnum2K2PiGam::ChiToK_2_1770K]=theStates.ChiToK2mK0mStates();
_jpclsMap[paramEnum2K2PiGam::K_2_1770ToK_2_1430Pi]=theStates.K2mToK2pPiStates();
@@ -171,9 +174,12 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti
else if (index==paramEnum2K2PiGam::ChiToPi1800Pi0Tof1370) return params.ChiToPi1800Pi0Tof1370;
else if (index==paramEnum2K2PiGam::ChiToPi1800Pi0ToKappa) return params.ChiToPi1800Pi0ToKappa;
else if (index==paramEnum2K2PiGam::ChiToPi1800Pi0ToK892K) return params.ChiToPi1800Pi0ToK892K;
+ else if (index==paramEnum2K2PiGam::ChiToPi3000Pi0ToK892K) return params.ChiToPi3000Pi0ToK892K;
+ else if (index==paramEnum2K2PiGam::ChiToPi3000Pi0ToK_0_1950K) return params.ChiToPi3000Pi0ToK_0_1950K;
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::Pi_2_2285ToK_0_1430K) return params.Pi_2_2285ToK_0_1430K;
else if (index==paramEnum2K2PiGam::Pi_2_2285ToK_2_1430K) return params.Pi_2_2285ToK_2_1430K;
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;
@@ -220,6 +226,7 @@ pair<double, double>& FitParams2K2PiGam::massPair(param2K2PiGam& params, unsigne
else if (index==paramEnum2K2PiGam::K_0_1830) return params.BwK_0_1830;
else if (index==paramEnum2K2PiGam::Pi_2_1670) return params.BwPi_2_1670;
else if (index==paramEnum2K2PiGam::Pi1800) return params.BwPi1800;
+ else if (index==paramEnum2K2PiGam::Pi3000) return params.BwPi3000;
else if (index==paramEnum2K2PiGam::Pi_2_2285) return params.BwPi_2_2285;
else if (index==paramEnum2K2PiGam::K_2_1770) return params.BwK_2_1770;
else{ Alert << "index " << index << " not supported !!!" << endmsg;
diff --git a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
index 70d6076f7d9bc84865ebc8bae829ba6be5f7c189..06ee1d39e6c2a7ade6012f9a9e50bb5d3df2da3d 100644
--- a/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
+++ b/Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
@@ -72,27 +72,30 @@ struct param2K2PiGam
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_2400ToKf_0_1710;
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_1430;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToKappaK_0_1950;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK892K1680;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK892K2300;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1460ToK892Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1460ToK_0_1430Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1830ToK892Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1830ToK_0_1430Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_1_1650K;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_1650ToK892Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_1650ToK_0_1430Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi_2_1670Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_1670Tof_2_1270Pi;
- std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_1670ToK892K;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToKappaK_0_1430;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToKappaK_0_1950;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK892K1680;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK892K2300;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1460ToK892Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1460ToK_0_1430Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1830ToK892Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_0_1830ToK_0_1430Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToK_1_1650K;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_1650ToK892Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > K_1_1650ToK_0_1430Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi_2_1670Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_1670Tof_2_1270Pi;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_1670ToK892K;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi1800Pi0Tof980;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi1800Pi0Tof1370;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi1800Pi0ToKappa;
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 > ChiToPi3000Pi0ToK892K;
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi3000Pi0ToK_0_1950K;
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 > Pi_2_2285ToK_0_1430K;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_2285ToK_2_1430K;
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;
@@ -127,6 +130,7 @@ struct param2K2PiGam
pair<double, double> BwK_1_1650;
pair<double, double> BwPi_2_1670;
pair<double, double> BwPi1800;
+ pair<double, double> BwPi3000;
pair<double, double> BwPi_2_2285;
pair<double, double> BwK_2_1770;
@@ -148,14 +152,15 @@ struct paramEnum2K2PiGam{
sigmaf980, ChiToSigmaf1370, sigmaf1710, sigmaf2200, K_0_1460ToK892Pi, K_0_1460ToK_0_1430Pi, K_0_1830ToK892Pi, K_0_1830ToK_0_1430Pi,
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, Pi_2_2285ToK892KPi, Pi_2_2285ToK_2_1430K,
+ ChiToPi_2_1670Pi, Pi_2_1670Tof_2_1270Pi, Pi_2_1670ToK892K,
+ ChiToPi1800Pi0Tof980, ChiToPi1800Pi0Tof1370, ChiToPi1800Pi0ToKappa, ChiToPi1800Pi0ToK892K, ChiToPi3000Pi0ToK892K, ChiToPi3000Pi0ToK_0_1950K,
+ ChiToPi_2_2285Pi,Pi_2_2285Tof1700Pi, Pi_2_2285ToK892KPi, Pi_2_2285ToK_0_1430K, Pi_2_2285ToK_2_1430K,
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,
f_2_1270, f_2_1430, f_2_1525, f_2_1950, f_2_2300,
- Pi_2_1670, Pi1800, Pi_2_2285, K_2_1770, nMasses,
+ Pi_2_1670, Pi1800, Pi3000, Pi_2_2285, K_2_1770, nMasses,
f980=nMasses,f980gpipi, f980gKK, nFlatte,
@@ -174,14 +179,15 @@ struct paramEnum2K2PiGam{
"sigmaf980", "ChiToSigmaf1370", "sigmaf1710", "sigmaf2200", "K_0_1460ToK892Pi", "K_0_1460ToK_0_1430Pi","K_0_1830ToK892Pi", "K_0_1830ToK_0_1430Pi",
"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","Pi_2_2285ToK892KPi","Pi_2_2285ToK_2_1430K",
+ "ChiToPi_2_1670Pi","Pi_2_1670Tof_2_1270Pi","Pi_2_1670ToK892K",
+ "ChiToPi1800Pi0Tof980","ChiToPi1800Pi0Tof1370","ChiToPi1800Pi0ToKappa","ChiToPi1800Pi0ToK892K","ChiToPi3000Pi0ToK892K","ChiToPi3000Pi0ToK_0_1950K",
+ "ChiToPi_2_2285Pi","Pi_2_2285Tof1700Pi","Pi_2_2285ToK892KPi","Pi_2_2285ToK_0_1430K","Pi_2_2285ToK_2_1430K",
"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",
"f_2_1270", "f_2_1430", "f_2_1525","f_2_1950","f_2_2300",
- "Pi_2_1670","Pi1800","Pi_2_2285","K_2_1770",
+ "Pi_2_1670","Pi1800","Pi3000","Pi_2_2285","K_2_1770",
"f980","f980gpipi", "f980gKK",
diff --git a/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc b/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc
index c6493fb9d9ea5537ee399727571c3e4199f69d15..161887efbd61c693a687f68d8d1fa0e5ec165c79 100644
--- a/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc
+++ b/Examples/Psi2STo2K2PiGam/Hyp9Lh.cc
@@ -15,8 +15,11 @@ Hyp9Lh::Hyp9Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const
,_Pi1800Tof1370PiHyp9(true)
,_Pi1800ToKappaKHyp9(true)
,_Pi1800Pi0ToK892KHyp9(true)
+ ,_Pi3000Pi0ToK892KHyp9(true)
+ ,_Pi3000Pi0ToK_0_1950KHyp9(true)
,_Pi_2_2285Tof1710PiHyp9(true)
,_Pi_2_2285ToK892KHyp9(true)
+ ,_Pi_2_2285ToK_0_1430KHyp9(true)
,_Pi_2_2285ToK_2_1430KHyp9(true)
,_f980f_2_2300Hyp9(true)
,_f_2_2300sigmaHyp9(true)
@@ -35,8 +38,11 @@ Hyp9Lh::Hyp9Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map
,_Pi1800Tof1370PiHyp9(true)
,_Pi1800ToKappaKHyp9(true)
,_Pi1800Pi0ToK892KHyp9(true)
+ ,_Pi3000Pi0ToK892KHyp9(true)
+ ,_Pi3000Pi0ToK_0_1950KHyp9(true)
,_Pi_2_2285Tof1710PiHyp9(true)
,_Pi_2_2285ToK892KHyp9(true)
+ ,_Pi_2_2285ToK_0_1430KHyp9(true)
,_Pi_2_2285ToK_2_1430KHyp9(true)
,_f980f_2_2300Hyp9(true)
,_f_2_2300sigmaHyp9(true)
@@ -126,8 +132,28 @@ complex<double> Hyp9Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
}
+ if(_Pi3000Pi0ToK892KHyp9){
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi3000Pi0ToK892K=theParamVal.ChiToPi3000Pi0ToK892K;
+ double Pi3000Mass=theParamVal.BwPi3000.first;
+ double Pi3000Width=theParamVal.BwPi3000.second;
+ double K892Mass=theParamVal.BwK892.first;
+ double K892Width=theParamVal.BwK892.second;
+
+ result+=chiToPi0PiToKstarKAmp(theData, ChiToPi3000Pi0ToK892K, Pi3000Mass, Pi3000Width, K892Mass, K892Width);
+
+ }
- if (_Pi_2_2285Tof1710PiHyp9 || _Pi_2_2285ToK892KHyp9 || _Pi_2_2285ToK_2_1430KHyp9){
+ if(_Pi3000Pi0ToK_0_1950KHyp9){
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToPi3000Pi0ToK_0_1950K=theParamVal.ChiToPi3000Pi0ToK_0_1950K;
+ double Pi3000Mass=theParamVal.BwPi3000.first;
+ double Pi3000Width=theParamVal.BwPi3000.second;
+ double K_0_1950Mass=theParamVal.BwK_0_1950.first;
+ double K_0_1950Width=theParamVal.BwK_0_1950.second;
+
+ result+=chiToPi0Pi0ToK0KAmp(theData, ChiToPi3000Pi0ToK_0_1950K, Pi3000Mass, Pi3000Width, K_0_1950Mass, K_0_1950Width);
+ }
+
+ if (_Pi_2_2285Tof1710PiHyp9 || _Pi_2_2285ToK892KHyp9 || _Pi_2_2285ToK_0_1430KHyp9 || _Pi_2_2285ToK_2_1430KHyp9){
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;
@@ -148,6 +174,13 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti
result+=chiToPi2Pi0ToKstarKAmp(theData, ChiToPi_2_2285Pi, Pi_2_2285ToK892KPi, Pi_2_2285Mass, Pi_2_2285Width, K892Mass, K892Width);
}
+ if(_Pi_2_2285ToK_0_1430KHyp9){
+ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_2285ToK_0_1430K=theParamVal.Pi_2_2285ToK_0_1430K;
+ double K_0_1430Mass=theParamVal.BwK_0_1430.first;
+ double K_0_1430Width=theParamVal.BwK_0_1430.second;
+
+ result+=chiToPi2Pi0ToKstarKAmp(theData, ChiToPi_2_2285Pi, Pi_2_2285ToK_0_1430K, Pi_2_2285Mass, Pi_2_2285Width, K_0_1430Mass, K_0_1430Width,0 );
+ }
if(_Pi_2_2285ToK_2_1430KHyp9){
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > Pi_2_2285ToK_2_1430K=theParamVal.Pi_2_2285ToK_2_1430K;
@@ -393,6 +426,27 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
exit(0);
}
+ iter= hypMap.find("Pi3000Pi0ToK892KHyp9");
+ if (iter !=hypMap.end()){
+ _Pi3000Pi0ToK892KHyp9= iter->second;
+ Info<< "hypothesis " << iter->first << "\t" << _Pi3000Pi0ToK892KHyp9 <<endmsg;
+ _hypMap[iter->first]= iter->second;
+ }
+ else{
+ Alert << "Pi30000Pi0ToK892KHyp9 not set!!!" <<endmsg;
+ exit(0);
+ }
+
+ iter= hypMap.find("Pi3000Pi0ToK_0_1950KHyp9");
+ if (iter !=hypMap.end()){
+ _Pi3000Pi0ToK_0_1950KHyp9= iter->second;
+ Info<< "hypothesis " << iter->first << "\t" << _Pi3000Pi0ToK892KHyp9 <<endmsg;
+ _hypMap[iter->first]= iter->second;
+ }
+ else{
+ Alert << "Pi3000Pi0ToK_0_1950KHyp9 not set!!!" <<endmsg;
+ exit(0);
+ }
iter= hypMap.find("Pi_2_2285Tof1710PiHyp9");
@@ -419,6 +473,21 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
exit(0);
}
+ iter= hypMap.find("Pi_2_2285ToK_0_1430KHyp9");
+
+ if (iter !=hypMap.end()){
+ _Pi_2_2285ToK_0_1430KHyp9= iter->second;
+ Info<< "hypothesis " << iter->first << "\t" << _Pi_2_2285ToK_0_1430KHyp9 <<endmsg;
+ _hypMap[iter->first]= iter->second;
+ }
+ else{
+ Alert << "Pi_2_2285ToK_0_1430KHyp9 not set!!!" <<endmsg;
+ exit(0);
+ }
+
+
+
+
iter= hypMap.find("Pi_2_2285ToK_2_1430KHyp9");
if (iter !=hypMap.end()){
@@ -511,8 +580,21 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
}
+ if (_Pi3000Pi0ToK892KHyp9 || _Pi3000Pi0ToK_0_1950KHyp9){
+ _massVec.push_back(paramEnum2K2PiGam::Pi3000);
+
+ if (_Pi3000Pi0ToK892KHyp9){
+ _ampVec.push_back(paramEnum2K2PiGam::ChiToPi3000Pi0ToK892K);
+ }
+ if (_Pi3000Pi0ToK_0_1950KHyp9){
+ _ampVec.push_back(paramEnum2K2PiGam::ChiToPi3000Pi0ToK_0_1950K);
+ if(!_K_0_1430K_0_1950Hyp6 && !_KappaK_0_1950Hyp6){
+ _massVec.push_back(paramEnum2K2PiGam::K_0_1950);
+ }
+ }
+ }
- if (_Pi_2_2285Tof1710PiHyp9 || _Pi_2_2285ToK892KHyp9 || _Pi_2_2285ToK_2_1430KHyp9){
+ if (_Pi_2_2285Tof1710PiHyp9 || _Pi_2_2285ToK892KHyp9 || _Pi_2_2285ToK_0_1430KHyp9 || _Pi_2_2285ToK_2_1430KHyp9){
_ampVec.push_back(paramEnum2K2PiGam::ChiToPi_2_2285Pi);
_massVec.push_back(paramEnum2K2PiGam::Pi_2_2285);
@@ -524,6 +606,10 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
_ampVec.push_back(paramEnum2K2PiGam::Pi_2_2285ToK892KPi);
}
+ if(_Pi_2_2285ToK_0_1430KHyp9){
+ _ampVec.push_back(paramEnum2K2PiGam::Pi_2_2285ToK_0_1430K);
+ }
+
if(_Pi_2_2285ToK_2_1430KHyp9){
_ampVec.push_back(paramEnum2K2PiGam::Pi_2_2285ToK_2_1430K);
if(!_K2_1430_K2_1430Hyp && !_K0_1430_K2_1430Hyp) _massVec.push_back(paramEnum2K2PiGam::K_2_1430);
diff --git a/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh b/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh
index e79b1cca3f447147c9c401b28fc82200562d0224..ada7c0efd9036f8355f35f848c724070d6f29b61 100644
--- a/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh
+++ b/Examples/Psi2STo2K2PiGam/Hyp9Lh.hh
@@ -56,8 +56,11 @@ protected:
bool _Pi1800Tof1370PiHyp9;
bool _Pi1800ToKappaKHyp9;
bool _Pi1800Pi0ToK892KHyp9;
+ bool _Pi3000Pi0ToK892KHyp9;
+ bool _Pi3000Pi0ToK_0_1950KHyp9;
bool _Pi_2_2285Tof1710PiHyp9;
bool _Pi_2_2285ToK892KHyp9;
+ bool _Pi_2_2285ToK_0_1430KHyp9;
bool _Pi_2_2285ToK_2_1430KHyp9;
bool _f980f_2_2300Hyp9;
bool _f_2_2300sigmaHyp9;
diff --git a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
index 9100b8bacdcd1812d9e4952443959a8cd8fcd3fe..dcf3584844e4457417fdfe3550d76aeb941c61cb 100644
--- a/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
+++ b/Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
@@ -184,6 +184,9 @@ int main(int __argc,char *__argv[]){
hypMap["Pi_2_2285Tof1710PiHyp9"]=true;
hypMap["Pi_2_2285ToK892KHyp9"]=true;
hypMap["Pi1800Pi0ToK892KHyp9"]=true;
+ hypMap["Pi3000Pi0ToK892KHyp9"]=true;
+ hypMap["Pi3000Pi0ToK_0_1950KHyp9"]=true;
+ hypMap["Pi_2_2285ToK_0_1430KHyp9"]=true;
hypMap["Pi_2_2285ToK_2_1430KHyp9"]=true;
hypMap["f980f_2_2300Hyp9"]=true;
hypMap["f_2_2300sigmaHyp9"]=true;
diff --git a/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamEvtList.cc b/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamEvtList.cc
index 267c13d4f0ee16d52ac0eb0259c9faff48db4481..621734fa315d117d057d3b578feb21cd995f41ec 100644
--- a/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamEvtList.cc
+++ b/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamEvtList.cc
@@ -271,8 +271,8 @@ Psi2STo2K2PiGamEvtData* Psi2STo2K2PiGamEvtList::fillEvtData(Event* anEvent, int
}
-
- // calculate and store WignerD functions for K*1+->K+ pi0, K*1+->K+ pi1+ cc Via K+ K- pi0
+
+// calculate and store WignerD functions for K*1+->K+ pi0, K*1+->K+ pi1+ cc Via K+ K- pi0
for (Spin M=-1; M<=1; M++){
for (Spin lam2=-1; lam2<=1; lam2++){
thePsi2STo2K2PiGamEvtData->DfKst1pToKpPi0ViaKKPi0[jKst892][M][lam2]=Wigner_D(Kp_HeliKpPi0_ViaKKPi0_4V.Phi(), Kp_HeliKpPi0_ViaKKPi0_4V.Theta(),0,jKst892,M,lam2);
@@ -296,7 +296,12 @@ Psi2STo2K2PiGamEvtData* Psi2STo2K2PiGamEvtList::fillEvtData(Event* anEvent, int
}
}
+ // calculate and store WignerD functions for K*0+->K+ pi0, K*0+->K+ pi1+ cc Via K+ K- pi0
+ thePsi2STo2K2PiGamEvtData->DfKst1pToKpPi0ViaKKPi0[0][0][0]=Wigner_D(Kp_HeliKpPi0_ViaKKPi0_4V.Phi(), Kp_HeliKpPi0_ViaKKPi0_4V.Theta(),0,0,0,0);
+ thePsi2STo2K2PiGamEvtData->DfKst1pToKpPi1ViaKKPi1[0][0][0]=Wigner_D(Kp_HeliKpPi1_ViaKKPi1_4V.Phi(),Kp_HeliKpPi1_ViaKKPi1_4V.Theta(),0,0,0,0);
+ thePsi2STo2K2PiGamEvtData->DfKst1mToKmPi0ViaKKPi0[0][0][0]=Wigner_D(Km_HeliKmPi0_ViaKKPi0_4V.Phi(),Km_HeliKmPi0_ViaKKPi0_4V.Theta(),0,0,0,0);
+ thePsi2STo2K2PiGamEvtData->DfKst1mToKmPi1ViaKKPi1[0][0][0]=Wigner_D(Km_HeliKmPi1_ViaKKPi1_4V.Phi(),Km_HeliKmPi1_ViaKKPi1_4V.Theta(),0,0,0,0);
for (Spin lam1=-1; lam1<=1; lam1++){
for (Spin lam2=-1; lam2<=1; lam2++){
diff --git a/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.cc b/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.cc
index 6b3117912349908abb4b51f5b23048358d29dc53..6f90d3383d7d8129d2178ec19b6168368a5cb331 100644
--- a/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.cc
+++ b/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.cc
@@ -68,6 +68,9 @@ Psi2STo2K2PiGamStates::Psi2STo2K2PiGamStates() :
//LS combinations for the pi_2 decay to f2 Pi
fillJPCLS(_pi2JPC, _pi0JPC, _f2JPC, _Pi_2Tof_2PiJPCLS);
+ //LS combinations for the pi_2 decay to K*0 K
+ fillJPCLS(_pi2JPC, _kJPC, _Kst0JPC,_Pi_2ToKst0KJPCLS);
+
//LS combinations for the pi_2 decay to K*1 K
fillJPCLS(_pi2JPC, _kJPC, _Kst1JPC,_Pi_2ToKst1KJPCLS);
@@ -219,6 +222,12 @@ void Psi2STo2K2PiGamStates::print(std::ostream& os) const
os << "\n" << std::endl;
}
+ os << "\n *** pi2: LS combinations for the pi2 decay to K*0 K *** "<< std::endl;
+ for ( itJPCLS=_Pi_2ToKst0KJPCLS.begin(); itJPCLS!=_Pi_2ToKst0KJPCLS.end(); ++itJPCLS){
+ (*itJPCLS)->print(os);
+ os << "\n" << std::endl;
+ }
+
os << "\n *** pi2: LS combinations for the pi2 decay to K*1 K *** "<< std::endl;
for ( itJPCLS=_Pi_2ToKst1KJPCLS.begin(); itJPCLS!=_Pi_2ToKst1KJPCLS.end(); ++itJPCLS){
(*itJPCLS)->print(os);
diff --git a/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.hh b/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.hh
index ef7cdee7bb048504830a6500d9544114a8c26210..b85172d2ae17b33f4d83c0012b66c871ae0a309c 100644
--- a/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.hh
+++ b/Examples/Psi2STo2K2PiGam/Psi2STo2K2PiGamStates.hh
@@ -38,6 +38,7 @@ public:
std::vector< boost::shared_ptr<const JPCLS> > K1ToK0PiStates() const {return _K1ToK0PiJPCLS;}
std::vector< boost::shared_ptr<const JPCLS> > ChiToPi_2PiStates() const {return _ChiToPi_2PiJPCLS;}
std::vector< boost::shared_ptr<const JPCLS> > Pi_2Tof_2PiStates() const {return _Pi_2Tof_2PiJPCLS;}
+ std::vector< boost::shared_ptr<const JPCLS> > Pi_2ToKst0KStates() const {return _Pi_2ToKst0KJPCLS;}
std::vector< boost::shared_ptr<const JPCLS> > Pi_2ToKst1KStates() const {return _Pi_2ToKst1KJPCLS;}
std::vector< boost::shared_ptr<const JPCLS> > Pi_2ToKst2KStates() const {return _Pi_2ToKst2KJPCLS;}
std::vector< boost::shared_ptr<const JPCLS> > ChiToPi0Pi0States() const {return _ChiToPi0Pi0JPCLS;}
@@ -80,6 +81,7 @@ private:
std::vector< boost::shared_ptr<const JPCLS> > _K1400ToKst1PiJPCLS;
std::vector< boost::shared_ptr<const JPCLS> > _ChiToPi_2PiJPCLS;
std::vector< boost::shared_ptr<const JPCLS> > _Pi_2Tof_2PiJPCLS;
+ std::vector< boost::shared_ptr<const JPCLS> > _Pi_2ToKst0KJPCLS;
std::vector< boost::shared_ptr<const JPCLS> > _Pi_2ToKst1KJPCLS;
std::vector< boost::shared_ptr<const JPCLS> > _Pi_2ToKst2KJPCLS;
std::vector< boost::shared_ptr<const JPCLS> > _ChiToPi0Pi0JPCLS;
diff --git a/Examples/Psi2STo2K2PiGam/qaMixedSampleCacheApp.cc b/Examples/Psi2STo2K2PiGam/qaMixedSampleCacheApp.cc
index b06397e225603b5620f0ebf3c2b0be4a8743ee2c..23a983ee2a0cd2b5386205b2b3924c6fc909d9de 100644
--- a/Examples/Psi2STo2K2PiGam/qaMixedSampleCacheApp.cc
+++ b/Examples/Psi2STo2K2PiGam/qaMixedSampleCacheApp.cc
@@ -133,9 +133,11 @@ bool Compare(const nextneighbours a, const nextneighbours b);
int main(){
- TString fileData="./Psi2STo2K2PiGamPWA_data.root";
+ //TString fileData="./Psi2STo2K2PiGamPWA_data.root";
//TString fileData="./Psi2STo2K2PiGamPWA_pwamc__FitParamHyp8_base_K0K2_newflatte__10000events.root";
- TString filePwaMc="./Psi2STo2K2PiGamPWA_pwamc__FitParamHyp8_base_K0K2_newflatte__10000events.root";
+ //TString filePwaMc="./Psi2STo2K2PiGamPWA_pwamc__FitParamHyp8_base_K0K2_newflatte__10000events.root";
+ TString fileData="./Psi2STo2K2PiGamPWA_pwamc_FitParamHyp9_43791events.root";
+ TString filePwaMc="./Psi2STo2K2PiGamPWA_pwamc_FitParamHyp9_43791events.root";
TString option="mixedsample,pwamc,nodraw,silent";
cout << "--- ENTERING QAMIXEDSAMPLE" << endl;
@@ -316,12 +318,12 @@ void mixed_sample() {
if(!silent) cout << "Entering mixed-sample method" << endl;
if(!silent) cout << endl;
- unsigned int limit_runs_lower = 0;
- unsigned int limit_runs_upper = 3;
+ unsigned int limit_runs_lower = 1;
+ unsigned int limit_runs_upper = 8;
cout << "Performing " << limit_runs_upper - limit_runs_lower << " runs." << endl;
std::vector<float> fpullvector;
- unsigned int limit_data = 2874; // numOfEntriesData;
- unsigned int limit_pwamc = 2874; // numOfEntriesPwaMc;
+ unsigned int limit_data = 1000; // numOfEntriesData;
+ unsigned int limit_pwamc = 5000; // numOfEntriesPwaMc;
unsigned int numberofneighbours = 10;