Psi2STo2K2PiGam: added f980 f_2_1270 amp

Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.cc

@@ -41,6 +41,8 @@ FitParams2K2PiGam::FitParams2K2PiGam()
   _jpclsMap[paramEnum2K2PiGam::f980_kf1500_pi]=theStates.ChiTof0f0States();
   _jpclsMap[paramEnum2K2PiGam::f1710_pif1370_k]=theStates.ChiTof0f0States();
   _jpclsMap[paramEnum2K2PiGam::f1710_kf1370_pi]=theStates.ChiTof0f0States();
+  _jpclsMap[paramEnum2K2PiGam::f980_pif_2_1270_k]=theStates.ChiTof0f2States();
+  _jpclsMap[paramEnum2K2PiGam::f980_kf_2_1270_pi]=theStates.ChiTof0f2States();
   _jpclsMap[paramEnum2K2PiGam::f980_pif_2_1430_k]=theStates.ChiTof0f2States();
   _jpclsMap[paramEnum2K2PiGam::f980_kf_2_1430_pi]=theStates.ChiTof0f2States();
   _jpclsMap[paramEnum2K2PiGam::f980_pif_2_1950_k]=theStates.ChiTof0f2States();
@@ -123,6 +125,8 @@ std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collecti
   else if (index==paramEnum2K2PiGam::f980_kf1500_pi) return params.f980_kf1500_pi;
   else if (index==paramEnum2K2PiGam::f1710_pif1370_k) return params.f1710_pif1370_k;
   else if (index==paramEnum2K2PiGam::f1710_kf1370_pi) return params.f1710_kf1370_pi;
+  else if (index==paramEnum2K2PiGam::f980_pif_2_1270_k) return params.f980_pif_2_1270_k;
+  else if (index==paramEnum2K2PiGam::f980_kf_2_1270_pi) return params.f980_kf_2_1270_pi;
   else if (index==paramEnum2K2PiGam::f980_pif_2_1430_k) return params.f980_pif_2_1430_k;
   else if (index==paramEnum2K2PiGam::f980_kf_2_1430_pi) return params.f980_kf_2_1430_pi;
   else if (index==paramEnum2K2PiGam::f980_pif_2_1525_k) return params.f980_pif_2_1525_k;

Examples/Psi2STo2K2PiGam/FitParams2K2PiGam.hh

@@ -53,6 +53,8 @@ struct param2K2PiGam
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf1500_pi;
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1710_pif1370_k;
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f1710_kf1370_pi;
+    std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_pif_2_1270_k;
+    std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf_2_1270_pi;
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_pif_2_1430_k;
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf_2_1430_pi;
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_pif_2_1525_k;
@@ -133,7 +135,7 @@ struct paramEnum2K2PiGam{
 	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, 
 	sigmaf980, ChiToSigmaf1370, 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_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, 
 	ChiToPi_2_2285Pi,Pi_2_2285Tof1700Pi, ChiToK_2_1770K, K_2_1770ToK_2_1430Pi, nAmps,         
@@ -157,7 +159,7 @@ struct paramEnum2K2PiGam{
 	"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", 
 	"sigmaf980", "ChiToSigmaf1370", "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_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",
 	"ChiToPi_2_2285Pi","Pi_2_2285Tof1700Pi","ChiToK_2_1770K","K_2_1770ToK_2_1430Pi",

Examples/Psi2STo2K2PiGam/Hyp4Lh.cc

@@ -12,6 +12,7 @@ Hyp4Lh::Hyp4Lh(boost::shared_ptr<const Psi2STo2K2PiGamEvtList> theEvtList, const
   ,_f980f1500Hyp4(true)
   ,_sigmaf1370Hyp4(true)
   ,_f1710f1370Hyp4(true)
+  ,_f980f_2_1270Hyp4(true)
   ,_f980f_2_1430Hyp4(true)
   ,_f980f_2_1525Hyp4(true)
   ,_f980f_2_1950Hyp4(true)
@@ -30,6 +31,7 @@ Hyp4Lh::Hyp4Lh( boost::shared_ptr<AbsPsi2STo2K2PiGamLh> theLhPtr, const std::map
   ,_f980f1500Hyp4(true)
   ,_sigmaf1370Hyp4(true)
   ,_f1710f1370Hyp4(true)
+  ,_f980f_2_1270Hyp4(true)
   ,_f980f_2_1430Hyp4(true)
   ,_f980f_2_1525Hyp4(true)
   ,_f980f_2_1950Hyp4(true)
@@ -104,6 +106,19 @@ complex<double> Hyp4Lh::chi0DecAmps(const param2K2PiGam& theParamVal, Psi2STo2K2
     result+=chiTof0_pif0_kAmp(theData, ChiTof1710_kf1370_pi, f1370Mass, f1370Width,  f1710Mass, f1710Width);
   }
 
+  if(_f980f_2_1270Hyp4){
+    std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_pif_2_1270_k=theParamVal.f980_pif_2_1270_k;
+    std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > f980_kf_2_1270_pi=theParamVal.f980_kf_2_1270_pi;
+
+    double f980_Mass=theParamVal.Flatf980;
+    double f980_gPiPi=theParamVal.Flatf980gPiPi;
+    double f980_gKK=theParamVal.Flatf980gKK;
+    double f_2_1270Mass=theParamVal.Bwf_2_1270.first;
+    double f_2_1270Width=theParamVal.Bwf_2_1270.second;
+    result+=chiTof980_pif2_kAmp(theData, f980_pif_2_1270_k, f980_Mass, f980_gPiPi, f980_gKK, f_2_1270Mass, f_2_1270Width);
+    result+=chiTof980_kf2_piAmp(theData, f980_kf_2_1270_pi, f980_Mass, f980_gKK, f980_gPiPi, f_2_1270Mass, f_2_1270Width);
+  }
+
   if (_f980f_2_1430Hyp4){
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980_pif2_k=theParamVal.f980_pif_2_1430_k;
     std::map< boost::shared_ptr<const JPCLS>, pair<double, double>, pawian::Collection::SharedPtrLess > ChiTof980_kf2_pi=theParamVal.f980_kf_2_1430_pi;
@@ -336,6 +351,20 @@ void Hyp4Lh::setUp(const std::map<const std::string, bool>& hypMap){
     exit(0);
   }
 
+
+  iter= hypMap.find("f980f_2_1270Hyp4");
+
+  if (iter !=hypMap.end()){
+    _f980f_2_1270Hyp4= iter->second;
+    Info<< "hypothesis " << iter->first << "\t" << _f980f_2_1270Hyp4 <<endmsg;
+    _hypMap[iter->first]= iter->second;
+  }
+  else{
+    Alert << "hypothesis f980f_2_1270Hyp4 not set!!!" <<endmsg;
+    exit(0);
+  }
+
+
   iter= hypMap.find("f980f_2_1430Hyp4");
 
   if (iter !=hypMap.end()){
@@ -448,6 +477,11 @@ void Hyp4Lh::setUp(const std::map<const std::string, bool>& hypMap){
     _ampVec.push_back(paramEnum2K2PiGam::f1710_pif1370_k);
     _ampVec.push_back(paramEnum2K2PiGam::f1710_kf1370_pi);
   }
+  if(_f980f_2_1270Hyp4){
+    _ampVec.push_back(paramEnum2K2PiGam::f980_pif_2_1270_k);
+    _ampVec.push_back(paramEnum2K2PiGam::f980_kf_2_1270_pi);
+    _massVec.push_back(paramEnum2K2PiGam::f_2_1270);
+  }
   if (_f980f_2_1430Hyp4){
     _ampVec.push_back(paramEnum2K2PiGam::f980_pif_2_1430_k);
     _ampVec.push_back(paramEnum2K2PiGam::f980_kf_2_1430_pi);

Examples/Psi2STo2K2PiGam/Hyp4Lh.hh

@@ -54,6 +54,7 @@ protected:
   bool _f980f1500Hyp4;
   bool _sigmaf1370Hyp4;
   bool _f1710f1370Hyp4;
+  bool _f980f_2_1270Hyp4;
   bool _f980f_2_1430Hyp4;
   bool _f980f_2_1525Hyp4;
   bool _f980f_2_1950Hyp4;

Examples/Psi2STo2K2PiGam/Hyp9Lh.cc

@@ -399,7 +399,7 @@ void Hyp9Lh::setUp(const std::map<const std::string, bool>& hypMap){
     
     if (_Pi_2_1670Tof_2_1270PiHyp9){
       _ampVec.push_back(paramEnum2K2PiGam::Pi_2_1670Tof_2_1270Pi);
-      _massVec.push_back(paramEnum2K2PiGam::f_2_1270);
+      //       _massVec.push_back(paramEnum2K2PiGam::f_2_1270);
     }
     
     if (_Pi_2_1670ToK892KHyp9){

Examples/Psi2STo2K2PiGam/Mpsi2STo2K2PiGamTestApp.cc

@@ -155,6 +155,7 @@ int main(int __argc,char *__argv[]){
   hypMap["f980f1370Hyp4"]=true;
   hypMap["f980f1500Hyp4"]=true;
   hypMap["f1710f1370Hyp4"]=true;
+  hypMap["f980f_2_1270Hyp4"]=true;
   hypMap["f980f_2_1430Hyp4"]=true;
   hypMap["f980f_2_1525Hyp4"]=true;
   hypMap["f980f_2_1950Hyp4"]=true;