diff --git a/Tests/Rivet/EE/EE-10.6.in b/Tests/Rivet/EE/EE-10.6.in --- a/Tests/Rivet/EE/EE-10.6.in +++ b/Tests/Rivet/EE/EE-10.6.in @@ -1,26 +1,44 @@ # -*- ThePEG-repository -*- create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.3*GeV set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.3*GeV set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.50 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity # BELLE Lambda polarization insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2019_I1687566 # BELLE charmonium insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2002_I563840 # CLEO Xi'_c production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I478217 +# CLEO Xi_c production +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I404590 +# CLEO Xi_c1 production +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I501417 # CLEO D_s1 production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1993_I352823 +# ARGUS D_s1 production +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1989_I282570 +# BABAR D_s1 production +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2011_I892421 # CLEO Lambda_c* production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I381696 # ARGUS Lambda_c* production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1997_I440304 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_I357132 # CLEO Xi_c*0 production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1995_I397770 # CLEO Xi_c*+ production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1996_I416471 +# CLEO D_1+, D_2+ production +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I378319 +# CLEO D_10, D_20 production +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1994_I372349 +# ARGUS D_s2 +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1995_I397794 +# CLEO Sigma_c* +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I424575 +# CLEO Lambda_c +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1990_I298611 \ No newline at end of file diff --git a/Tests/Rivet/EE/EE-Psi2S.in b/Tests/Rivet/EE/EE-Psi2S.in --- a/Tests/Rivet/EE/EE-Psi2S.in +++ b/Tests/Rivet/EE/EE-Psi2S.in @@ -1,23 +1,25 @@ # -*- ThePEG-repository -*- # e+ e- -> psi(2S) create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEPsi2S HwMELepton.so set /Herwig/MatrixElements/MEPsi2S:VectorMeson /Herwig/Particles/psi(2S) set /Herwig/MatrixElements/MEPsi2S:Coupling 19.25684 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi2S set EventGenerator:EventHandler:LuminosityFunction:Energy 3.686097 set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF do /Herwig/Particles/psi(2S):SelectDecayModes /Herwig/Particles/psi(2S)/psi(2S)->n0,nbar0; /Herwig/Particles/psi(2S)/psi(2S)->p+,pbar-; /Herwig/Particles/psi(2S)/psi(2S)->Sigma0,Sigmabar0; /Herwig/Particles/psi(2S)/psi(2S)->Lambda0,Lambdabar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*-,Sigma*bar+; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*+,Sigma*bar-; /Herwig/Particles/psi(2S)/psi(2S)->Xi-,Xibar+; /Herwig/Particles/psi(2S)/psi(2S)->Xi0,Xibar0; /Herwig/Particles/psi(2S)/psi(2S)->Sigma*0,Sigma*bar0; /Herwig/Particles/psi(2S)/psi(2S)->Xi*-,Xi*bar+; /Herwig/Particles/psi(2S)/psi(2S)->Jpsi,pi+,pi-; # psi(2S) -> lambda anti-lambda and sigma anti-sigma insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563 # psi(2S) -> p pbar and n nbar insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1658762 # psi(2S) -> xi- and Sigma+/- insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780 # psi(2S) -> xi0 and Sigma*0 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414 # psi(2S) -> xi*- insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1747092 # MARKII psi(2s) -> J/Psi pi+pi- insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1979_I144382 +# BES psi(2s) -> J/Psi pi+pi- +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I507637 diff --git a/Tests/Rivet/EE/EE-Upsilon4.in b/Tests/Rivet/EE/EE-Upsilon4.in --- a/Tests/Rivet/EE/EE-Upsilon4.in +++ b/Tests/Rivet/EE/EE-Upsilon4.in @@ -1,61 +1,65 @@ # -*- ThePEG-repository -*- create ThePEG::LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxA 5.2897*GeV set /Herwig/EventHandlers/BFactoryLuminosity:BeamEMaxB 5.2897*GeV set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 10.5792 set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction /Herwig/EventHandlers/BFactoryLuminosity create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEUpsilon HwMELepton.so set /Herwig/MatrixElements/MEUpsilon:VectorMeson /Herwig/Particles/Upsilon(4S) set /Herwig/MatrixElements/MEUpsilon:Coupling 96.72794 set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEUpsilon # ARGUS pi,K, proton insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2653028 # ARGUS K*, rho, omega insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1993_S2789213 # various semileptonic decays insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2013_I1116411 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2015_I1334693 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2011_I878990 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2013_I1238273 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1397632 # BELLE b->s gamma insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2015_I1330289 # BES D -> K, pi semi-leptonic insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2015_I1391138 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1519425 # multiplicities insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_Upsilon_4S_HADRON_MULTIPLICITIES # BES multiplicty in eta_c decays insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1724880 # kaons in b decays insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1994_I354224 # charm hadrons in b decays insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I719111 # phi spectrum insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2007_I728872 # D_s spectrum insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2005_I1649168 # # MC analyses based on old internal ones insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Meson_Meson_Leptons_Decay insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_D_Dalitz insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Onium_PiPi_Decay insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Semi_Leptonic_Decay insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1992_I319102 # ARGUS charm hadron production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ARGUS_1991_I315059 # BELLE B0 -> D* semi-leptonic insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2017_I1512299 # BABAR D0 -> K- semi-leptonic insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2007_I1091435 # BES-III D0 -> pi semi-leptonic insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1655158 # BABAR e- spectrum insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2017_I1498564 # CLEO multiplicty in Upsilon(4S) decays insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1999_I504672 # BELLE Upsilon(4S) -> pi+pi- Upsilon(1S) decays insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BELLE_2009_I810744 +# BABAR Upsilon(4S) -> pi+pi- Upsilon(1,2S) decays +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BABAR_2006_I714448 # CLEO Xi_c spectrum -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I442910 \ No newline at end of file +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOII_1997_I442910 +# CLEO baryon spectra +insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_1992_I315181