Skip to content
Snippets Groups Projects
Commit 27753cd8 authored by Bertram Kopf's avatar Bertram Kopf
Browse files

Psi2STo2K2PiGam: added f980 f_2_2200 amp

parent 143c8d8e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc
+ 3
− 0
View file @ 27753cd8
...@@ -33,6 +33,7 @@ FitParams2K2PiGam::FitParams2K2PiGam() ...@@ -33,6 +33,7 @@ FitParams2K2PiGam::FitParams2K2PiGam()
_jpclsMap[paramEnum2K2PiGam::f980_kf1710_pi]=theStates.ChiTof0f0States(); _jpclsMap[paramEnum2K2PiGam::f980_kf1710_pi]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980f980]=theStates.ChiTof0f0States(); _jpclsMap[paramEnum2K2PiGam::f980f980]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980f2200]=theStates.ChiTof0f0States(); _jpclsMap[paramEnum2K2PiGam::f980f2200]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::ChiTof980f_2_2200]=theStates.ChiTof0f2States();
_jpclsMap[paramEnum2K2PiGam::f980_pif1370_k]=theStates.ChiTof0f0States(); _jpclsMap[paramEnum2K2PiGam::f980_pif1370_k]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980_kf1370_pi]=theStates.ChiTof0f0States(); _jpclsMap[paramEnum2K2PiGam::f980_kf1370_pi]=theStates.ChiTof0f0States();
_jpclsMap[paramEnum2K2PiGam::f980_pif1500_k]=theStates.ChiTof0f0States(); _jpclsMap[paramEnum2K2PiGam::f980_pif1500_k]=theStates.ChiTof0f0States();
...@@ -109,6 +110,7 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti ...@@ -109,6 +110,7 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti
else if (index==paramEnum2K2PiGam::f980_kf1710_pi) return params.f980_kf1710_pi; else if (index==paramEnum2K2PiGam::f980_kf1710_pi) return params.f980_kf1710_pi;
else if (index==paramEnum2K2PiGam::f980f980) return params.ChiTof980f980; else if (index==paramEnum2K2PiGam::f980f980) return params.ChiTof980f980;
else if (index==paramEnum2K2PiGam::f980f2200) return params.ChiTof980f2200; else if (index==paramEnum2K2PiGam::f980f2200) return params.ChiTof980f2200;
else if (index==paramEnum2K2PiGam::ChiTof980f_2_2200) return params.ChiTof980f_2_2200;
else if (index==paramEnum2K2PiGam::f980_pif1370_k) return params.f980_pif1370_k; else if (index==paramEnum2K2PiGam::f980_pif1370_k) return params.f980_pif1370_k;
else if (index==paramEnum2K2PiGam::f980_kf1370_pi) return params.f980_kf1370_pi; else if (index==paramEnum2K2PiGam::f980_kf1370_pi) return params.f980_kf1370_pi;
else if (index==paramEnum2K2PiGam::f980_pif1500_k) return params.f980_pif1500_k; else if (index==paramEnum2K2PiGam::f980_pif1500_k) return params.f980_pif1500_k;
...@@ -175,6 +177,7 @@ pair<double, double>& FitParams2K2PiGam::massPair(param2K2PiGam& params, unsigne ...@@ -175,6 +177,7 @@ pair<double, double>& FitParams2K2PiGam::massPair(param2K2PiGam& params, unsigne
else if (index==paramEnum2K2PiGam::f_2_1430) return params.Bwf_2_1430; else if (index==paramEnum2K2PiGam::f_2_1430) return params.Bwf_2_1430;
else if (index==paramEnum2K2PiGam::f_2_1525) return params.Bwf_2_1525; else if (index==paramEnum2K2PiGam::f_2_1525) return params.Bwf_2_1525;
else if (index==paramEnum2K2PiGam::f_2_1950) return params.Bwf_2_1950; else if (index==paramEnum2K2PiGam::f_2_1950) return params.Bwf_2_1950;
else if (index==paramEnum2K2PiGam::f_2_2200) return params.Bwf_2_2200;
else if (index==paramEnum2K2PiGam::K_0_2400) return params.BwK_0_2400; else if (index==paramEnum2K2PiGam::K_0_2400) return params.BwK_0_2400;
else if (index==paramEnum2K2PiGam::K_0_1950) return params.BwK_0_1950; else if (index==paramEnum2K2PiGam::K_0_1950) return params.BwK_0_1950;
else if (index==paramEnum2K2PiGam::K_1_1680) return params.BwK_1_1680; else if (index==paramEnum2K2PiGam::K_1_1680) return params.BwK_1_1680;
......
Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh
+ 8
− 4
View file @ 27753cd8
...@@ -41,6 +41,7 @@ struct param2K2PiGam ...@@ -41,6 +41,7 @@ struct param2K2PiGam
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 > f980_kf1710_pi;
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 > 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 > ChiTof980f2200;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980f_2_2200;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToSigmaf980; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToSigmaf980;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToSigmaf1710; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToSigmaf1710;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToSigmaf2200; std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiToSigmaf2200;
...@@ -98,6 +99,7 @@ struct param2K2PiGam ...@@ -98,6 +99,7 @@ struct param2K2PiGam
pair<double, double> Bwf_2_1430; pair<double, double> Bwf_2_1430;
pair<double, double> Bwf_2_1525; pair<double, double> Bwf_2_1525;
pair<double, double> Bwf_2_1950; pair<double, double> Bwf_2_1950;
pair<double, double> Bwf_2_2200;
pair<double, double> BwK_0_2400; pair<double, double> BwK_0_2400;
pair<double, double> BwK_2_1950; pair<double, double> BwK_2_1950;
pair<double, double> BwK_0_1950; pair<double, double> BwK_0_1950;
...@@ -121,7 +123,8 @@ struct paramEnum2K2PiGam{ ...@@ -121,7 +123,8 @@ struct paramEnum2K2PiGam{
enum {ChiGam=0, K892K892, KappaKappa, K_0_1430K_0_1430, K_2_1430K_2_1430, K_0_1430K_2_1430, K_1_1400K_1_1400, enum {ChiGam=0, K892K892, KappaKappa, K_0_1430K_0_1430, K_2_1430K_2_1430, K_0_1430K_2_1430, K_1_1400K_1_1400,
ChiToK_1_1400K, K_1_1400ToK892Pi, ChiToK_1_1270_K, K_1_1270ToK892Pi, K_1_1270ToK_0_1430Pi, 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, ChiToK_1_1650K, K_1_1650ToK892Pi, K_1_1650ToK_0_1430Pi, K_0_1430K_0_1950, KappaK_0_1950,
f980_pif1710_k, f980_kf1710_pi, f980f980, f980f2200, f980_pif1370_k, f980_kf1370_pi, f980_pif1500_k, f980_kf1500_pi, f1710_pif1370_k, f1710_kf1370_pi, f980_pif1710_k, f980_kf1710_pi, f980f980, f980f2200, ChiTof980f_2_2200,
f980_pif1370_k, f980_kf1370_pi, f980_pif1500_k, f980_kf1500_pi, f1710_pif1370_k, f1710_kf1370_pi,
K_0_2400KToKf980, K892K_1_1680, K892K_1_2300, K_0_2400KToKf980, K892K_1_1680, K892K_1_2300,
sigmaf980, sigmaf1710, sigmaf2200, K_0_1460ToK892Pi, K_0_1460ToK_0_1430Pi, K_0_1830ToK892Pi, K_0_1830ToK_0_1430Pi, sigmaf980, sigmaf1710, sigmaf2200, K_0_1460ToK892Pi, K_0_1460ToK_0_1430Pi, K_0_1830ToK892Pi, K_0_1830ToK_0_1430Pi,
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, 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,
...@@ -131,7 +134,7 @@ struct paramEnum2K2PiGam{ ...@@ -131,7 +134,7 @@ struct paramEnum2K2PiGam{
K892=nAmps,Kappa, K_0_1430, K_1_1400, K_2_1430, K_1_1270,K_1_1650, K892=nAmps,Kappa, K_0_1430, K_1_1400, K_2_1430, K_1_1270,K_1_1650,
f1500, f1710, f2200, sigma, f1360, f1370, K_0_2400, K_0_1950, K_1_1680, K_1_2300, K_0_1460, K_0_1830, f1500, f1710, f2200, sigma, f1360, f1370, K_0_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_1270, f_2_1430, f_2_1525, f_2_1950, f_2_2200,
Pi_2_1670, Pi1800, Pi_2_2285, nMasses, Pi_2_1670, Pi1800, Pi_2_2285, nMasses,
f980=nMasses,f980gpipi, f980gKK, nFlatte, f980=nMasses,f980gpipi, f980gKK, nFlatte,
...@@ -144,7 +147,8 @@ struct paramEnum2K2PiGam{ ...@@ -144,7 +147,8 @@ struct paramEnum2K2PiGam{
={"ChiGam", "K892K892", "KappaKappa", "K_0_1430K_0_1430", "K_2_1430K_2_1430", "K_0_1430K_2_1430", "K_1_1400K_1_1400", ={"ChiGam", "K892K892", "KappaKappa", "K_0_1430K_0_1430", "K_2_1430K_2_1430", "K_0_1430K_2_1430", "K_1_1400K_1_1400",
"ChiToK_1_1400K", "K_1_1400ToK892Pi", "ChiToK_1_1270_K", "K_1_1270ToK892Pi", "K_1_1270ToK_0_1430Pi", "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", "ChiToK_1_1650K", "K_1_1650ToK892Pi", "K_1_1650ToK_0_1430Pi","K_0_1430K_0_1950", "KappaK_0_1950",
"f980_pif1710_k", "f980_kf1710_pi", "f980f980", "f980f2200", "f980_pif1370_k", "f980_kf1370_pi", "f980_pif1500_k", "f980_kf1500_pi", "f1710_pif1370_k", "f1710_kf1370_pi", "f980_pif1710_k", "f980_kf1710_pi", "f980f980", "f980f2200", "ChiTof980f_2_2200",
"f980_pif1370_k", "f980_kf1370_pi", "f980_pif1500_k", "f980_kf1500_pi", "f1710_pif1370_k", "f1710_kf1370_pi",
"K_0_2400KToKf980", "K892K_1_1680", "K892K_1_2300", "K_0_2400KToKf980", "K892K_1_1680", "K892K_1_2300",
"sigmaf980", "sigmaf1710", "sigmaf2200", "K_0_1460ToK892Pi", "K_0_1460ToK_0_1430Pi","K_0_1830ToK892Pi", "K_0_1830ToK_0_1430Pi", "sigmaf980", "sigmaf1710", "sigmaf2200", "K_0_1460ToK892Pi", "K_0_1460ToK_0_1430Pi","K_0_1830ToK892Pi", "K_0_1830ToK_0_1430Pi",
"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", "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",
...@@ -154,7 +158,7 @@ struct paramEnum2K2PiGam{ ...@@ -154,7 +158,7 @@ struct paramEnum2K2PiGam{
"K892", "Kappa", "K_0_1430", "K_1_1400", "K_2_1430", "K_1_1270", "K_1_1650", "K892", "Kappa", "K_0_1430", "K_1_1400", "K_2_1430", "K_1_1270", "K_1_1650",
"f1500", "f1710", "f2200", "sigma", "f1360", "f1370", "K_0_2400", "K_0_1950", "K_1_1680", "K_1_2300", "K_0_1460", "K_0_1830", "f1500", "f1710", "f2200", "sigma", "f1360", "f1370", "K_0_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_1270", "f_2_1430", "f_2_1525","f_2_1950","f_2_2200",
"Pi_2_1670","Pi1800","Pi_2_2285", "Pi_2_1670","Pi1800","Pi_2_2285",
"f980","f980gpipi", "f980gKK", "f980","f980gpipi", "f980gKK",
......
Examples/Psi2STo2K2PiGam/Hyp9Lh.cc
+ 30
− 0
View file @ 27753cd8
...@@ -14,6 +14,7 @@ Hyp9Lh::Hyp9Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const ...@@ -14,6 +14,7 @@ Hyp9Lh::Hyp9Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const
,_Pi1800Tof980PiHyp9(true) ,_Pi1800Tof980PiHyp9(true)
,_Pi1800Tof1370PiHyp9(true) ,_Pi1800Tof1370PiHyp9(true)
,_Pi_2_2285Tof1710PiHyp9(true) ,_Pi_2_2285Tof1710PiHyp9(true)
,_f980f_2_2200Hyp9(true)
,_doHyp9(true) ,_doHyp9(true)
,_nFitParams(0) ,_nFitParams(0)
{ {
...@@ -27,6 +28,7 @@ Hyp9Lh::Hyp9Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map ...@@ -27,6 +28,7 @@ Hyp9Lh::Hyp9Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map
,_Pi1800Tof980PiHyp9(true) ,_Pi1800Tof980PiHyp9(true)
,_Pi1800Tof1370PiHyp9(true) ,_Pi1800Tof1370PiHyp9(true)
,_Pi_2_2285Tof1710PiHyp9(true) ,_Pi_2_2285Tof1710PiHyp9(true)
,_f980f_2_2200Hyp9(true)
,_doHyp9(true) ,_doHyp9(true)
,_nFitParams(0) ,_nFitParams(0)
{ {
...@@ -102,6 +104,17 @@ complex<double> Hyp9Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2 ...@@ -102,6 +104,17 @@ complex<double> Hyp9Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
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 (_f980f_2_2200Hyp9){
double f980Mass=theParamVal.Flatf980;
double f980gPiPi=theParamVal.Flatf980gPiPi;
double f980gKK=theParamVal.Flatf980gKK;
double f_2_2200Mass=theParamVal.Bwf_2_2200.first;
double f_2_2200Width=theParamVal.Bwf_2_2200.second;
std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980f_2_2200=theParamVal.ChiTof980f_2_2200;
result+=chiTof980_pif2_kAmp(theData, ChiTof980f_2_2200, f980Mass, f980gPiPi, f980gKK, f_2_2200Mass, f_2_2200Width);
}
return result; return result;
} }
...@@ -293,6 +306,17 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){ ...@@ -293,6 +306,17 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
exit(0); exit(0);
} }
iter= hypMap.find("f980f_2_2200Hyp9");
if (iter !=hypMap.end()){
_f980f_2_2200Hyp9= iter->second;
Info<< "hypothesis " << iter->first << "\t" << _f980f_2_2200Hyp9 <<endmsg;
_hypMap[iter->first]= iter->second;
}
else{
Alert << "f980f_2_2200Hyp9 not set!!!" <<endmsg;
exit(0);
}
if (_Pi_2_1670Tof_2_1270PiHyp9 || _Pi_2_1670ToK892KHyp9){ if (_Pi_2_1670Tof_2_1270PiHyp9 || _Pi_2_1670ToK892KHyp9){
_ampVec.push_back(paramEnum2K2PiGam::ChiToPi_2_1670Pi); _ampVec.push_back(paramEnum2K2PiGam::ChiToPi_2_1670Pi);
...@@ -324,6 +348,12 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){ ...@@ -324,6 +348,12 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
_massVec.push_back(paramEnum2K2PiGam::Pi_2_2285); _massVec.push_back(paramEnum2K2PiGam::Pi_2_2285);
} }
if (_f980f_2_2200Hyp9){
_ampVec.push_back(paramEnum2K2PiGam::ChiTof980f_2_2200);
_massVec.push_back(paramEnum2K2PiGam::f_2_2200);
}
std::vector<unsigned int>::iterator ampIt; std::vector<unsigned int>::iterator ampIt;
for (ampIt=_ampVec.begin(); ampIt!=_ampVec.end(); ++ampIt){ for (ampIt=_ampVec.begin(); ampIt!=_ampVec.end(); ++ampIt){
std::vector< boost::shared_ptr<const JPCLS> > JPCLSs=_fitParams2K2PiGam.jpclsVec(*ampIt); std::vector< boost::shared_ptr<const JPCLS> > JPCLSs=_fitParams2K2PiGam.jpclsVec(*ampIt);
......
Examples/Psi2STo2K2PiGam/Hyp9Lh.hh
+ 1
− 0
View file @ 27753cd8
...@@ -55,6 +55,7 @@ protected: ...@@ -55,6 +55,7 @@ protected:
bool _Pi1800Tof980PiHyp9; bool _Pi1800Tof980PiHyp9;
bool _Pi1800Tof1370PiHyp9; bool _Pi1800Tof1370PiHyp9;
bool _Pi_2_2285Tof1710PiHyp9; bool _Pi_2_2285Tof1710PiHyp9;
bool _f980f_2_2200Hyp9;
bool _doHyp9; bool _doHyp9;
virtual complex<double> chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2PiGamData::Psi2STo2K2PiGamEvtData* theData); virtual complex<double> chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2PiGamData::Psi2STo2K2PiGamEvtData* theData);
......
Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc
+ 1
− 0
View file @ 27753cd8
...@@ -175,6 +175,7 @@ int main(int __argc,char *__argv[]){ ...@@ -175,6 +175,7 @@ int main(int __argc,char *__argv[]){
hypMap["Pi1800Tof980PiHyp9"]=true; hypMap["Pi1800Tof980PiHyp9"]=true;
hypMap["Pi1800Tof1370PiHyp9"]=true; hypMap["Pi1800Tof1370PiHyp9"]=true;
hypMap["Pi_2_2285Tof1710PiHyp9"]=true; hypMap["Pi_2_2285Tof1710PiHyp9"]=true;
hypMap["f980f_2_2200Hyp9"]=true;
std::vector<std::string>::const_iterator itStr; std::vector<std::string>::const_iterator itStr;
for (itStr=disabledHyps.begin(); itStr!=disabledHyps.end(); ++itStr){ for (itStr=disabledHyps.begin(); itStr!=disabledHyps.end(); ++itStr){
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment