diff --git a/Tests/Rivet/EE/EE-91.in b/Tests/Rivet/EE/EE-91.in --- a/Tests/Rivet/EE/EE-91.in +++ b/Tests/Rivet/EE/EE-91.in @@ -1,154 +1,154 @@ # -*- ThePEG-repository -*- ################################################## # LEP physics parameters (override defaults) ################################################## set /Herwig/Generators/EventGenerator:EventHandler:LuminosityFunction:Energy 91.2 ################################################## # select the analyses ################################################## # Validated ################################################## # ALEPH charged particle multiplicity insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1991_S2435284 # OPAL charged particle multiplicity insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1992_I321190 # OPAL charged particle multiplicity (light flavour separated) insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_I536266 # DELPHI charged particle multiplicity insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I301657 # ALEPH main LEP I QCD summary paper insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_S3486095 # ALEPH D* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1999_S4193598 # OPAL D* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I382219 # OPAL charged hadron analysis insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1994_S2927284 # OPAL Delta++ analysis insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_S3198391 # OPAL J/Psi analysis analysis insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1996_S3257789 # ALEPH eta/omega analysis insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2002_S4823664 # ALEPH pi0,eta,eta',K0,lambda in 2/3 jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2000_I507531 # OPAL K*0 analysis insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_S3608263 # OPAL flavour specific charged multiplicities etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3780481 # OPAL f_0,f_2 and phi production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3702294 # OPAL gamma,pi0,eta,eta',rho+/-,a0+/- insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_S3749908 # OPAL K0 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_S4418603 # OPAL K* +/- insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1993_I342766 # SLD flavour specific charged multiplicities etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1996_S3398250 # SLD flavour specific charged multiplicities etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_1999_S3743934 # SLD flavour specific charged multiplicities etc insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2004_S5693039 # OPAL event shapes and multiplicities at different energies insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_S6132243 # ALEPH jet and event shapes at many energies insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2004_S5765862 # OPAL/JADE jet rates at many energies insert /Herwig/Analysis/RivetAnalysis:Analyses 0 JADE_OPAL_2000_S4300807 # DELPHI strange baryon production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_S3137023 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2006_I719387 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I524694 # DELPHI f_0, rho_0 and f_2 production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_S3960137 # DELPHI K*0 and phi production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I420528 # DELPHI f'_2 production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I416741 # DELPHI pi0 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_I401100 # DELPHI K- K*+/- insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I377487 # DELPHI K+/-, p pbar insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I394052 # DELPHI Delta++ insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I399737 # DELPHI pi, K p, flavour seperated insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1998_I473409 # OPAL strange baryon production insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_S3396100 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I421977 # DELPHI tuning paper insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1996_S3430090 # DELPHI b quark insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2011_I890503 # ALEPH b quark insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_2001_S4656318 # SLD b quark insert /Herwig/Analysis/RivetAnalysis:Analyses 0 SLD_2002_S4869273 # OPAL b quark insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2003_I599181 # PDG hadron multiplicities and ratios insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES insert /Herwig/Analysis/RivetAnalysis:Analyses 0 PDG_HADRON_MULTIPLICITIES_RATIOS # OPAL from gluon paper insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I648738 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2004_I631361:PROCESS=QQ # L3 eta insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1992_I336180 # L3 jet rates insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_2004_I652683 # ALEPH pi+-, K+- and (p, anti-p) insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1995_I382179 # L3 eta' and omega specta insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1997_I427107 # charged mult, different # of jets insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1992_I334948 # charged mult, different rapidity regions insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1991_I324035 # lambda, lambdabar correlations insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1993_I360638 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I474010 # delphi flavour sep charged insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1997_I428178 # ALEPH pi0 insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1997_I427131 # ALEPH Lambda polarization insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I415745 # OPAL Lambda polarization insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I447188 # DELPHI Lambda/K asymmetry insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I382285 # OPAL b baryon polarization insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1998_I474012 # DELPHI b baryon polarization insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_2000_I513614 # ALEPH b baryon polarization insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1996_I402895 # OPAL rho and comega polarization insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2000_I502750 # DELPHI charged particle distributions insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1999_I448370 # OPAL K0 spectrum insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1995_I393503 # OPAL phi, D*, B* spin insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1997_I440103 # DELPHI B* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 DELPHI_1995_I395026 # ALEPH B* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ALEPH_1995_I398426 # OPAL B* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_1996_I428493 # L3 B* insert /Herwig/Analysis/RivetAnalysis:Analyses 0 L3_1995_I381046 ################################################## # unvalidated ################################################## # OPAL 4 jet angles insert /Herwig/Analysis/RivetAnalysis:Analyses 0 OPAL_2001_S4553896 ################################################## # MC ################################################## -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Bottom_Hadrons -insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Particle_Multiplicities +#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Bottom_Hadrons +#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_Particle_Multiplicities 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,47 +1,47 @@ # -*- 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 # BES J/psi dalitz insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1697377 # 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 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