Merge, again
fdecd3749555
Actions

Description

Merge, again

Details

Provenance

buckley	Authored on
buckley	Pushed on Jun 3 2019, 10:42 PM

Parents

rRIVETHGd0297b23903a: By-eye merge with 27x branch head. Now to make it compile again. Let's never…
rRIVETHG4da600028998: merge

Branches

Unknown

Tags

Unknown

Event Timeline

buckley committed rRIVETHGfdecd3749555: Merge, again.Jun 3 2019, 10:42 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

d0297b23903a By-eye merge with 27x branch head. Now to make it compile again. Let's never…
Author
buckley
Browse Repository
No Builds
No Audits
7e7c8740907b Include missing UnstableParticles header
Author
buckley
Browse Repository
No Builds
No Audits
2a8d7a7ac9ca add DELPHI_2003_I620250 for event shapes below Z pole
Author
richardn
Browse Repository
No Builds
No Audits
2b71974310ce switch to using counters in OPAL_2002_S5361494, errors now calculated, and…
Author
richardn
Browse Repository
No Builds
No Audits
6f70bad8e2f5 put the average of x back into ALEPH_2001_S4656318.yoda
Author
richardn
Browse Repository
No Builds
No Audits
18795f3ebd70 sync DELPHI_2011_I890503.yoda, fixes y errors but still a zero width bin to…
Author
richardn
Browse Repository
No Builds
No Audits
04f18cacb6fb sync ALEPH_2001_S4656318.yoda, differences in histos not used in analysis
Author
richardn
Browse Repository
No Builds
No Audits
e19304560237 sync ALEPH_1996_S3196992.yoda with HEPdata, rounding issues in old version
Author
richardn
Browse Repository
No Builds
No Audits
4bfb0dd76c9a add DELPHI_2000_I524694 for sigma- and lambdsa(1520) production at LEP
Author
richardn
Browse Repository
No Builds
No Audits
e787c8d74cc4 clean up code in OPAL_1997_S3396100, fixed normalisation of sigma-(1385)…
Author
richardn
Browse Repository
No Builds
No Audits
7a5f1acb3d48 merge
Author
richardn
Browse Repository
No Builds
No Audits
dc5425f938d7 remove a superseeded SLD b fragmentation analysis
Author
richardn
Browse Repository
No Builds
No Audits
8ff9b17c659a Validation with options now works a bit better (see
Author
lonnblad
Browse Repository
No Builds
No Audits
40070e2e928d Minor validation update. Need to make a better scheme for handling options.
Author
lonnblad
Browse Repository
No Builds
No Audits
4ca9f22b3a2b The new validation framework is now functional, although it may need
Author
lonnblad
Browse Repository
No Builds
No Audits
d22339bfef08 add analysis CLEO_1991_I29927, B* production in e+e-
Author
richardn
Browse Repository
No Builds
No Audits
384e6eaeac53 update yoda for SND_2016_I1471515
Author
richardn
Browse Repository
No Builds
No Audits
30f32be2666b update yoda for ALEPH_1999_S4193598, factor 1000 change in y compensated in…
Author
richardn
Browse Repository
No Builds
No Audits
0279b6b7c458 update yoda for ALEPH_1995_I382179, extra error in y now included 3% additional…
Author
richardn
Browse Repository
No Builds
No Audits
34be824790b9 edit changelog
Author
richardn
Browse Repository
No Builds
No Audits
48bd9577408c merge
Author
richardn
Browse Repository
No Builds
No Audits
0676fba71f55 merge
Author
richardn
Browse Repository
No Builds
No Audits
3b469c5ec9a8 update yoda for ARGUS_1993_S2653028, improved y errors, still zero bin width…
Author
richardn
Browse Repository
No Builds
No Audits
811668abbb11 fix logic for unicode encoding
Author
cgutscho
Browse Repository
No Builds
No Audits
ad06fed56ee1 fixing Clang compiler warnings+errors
Author
cgutscho
Browse Repository
No Builds
No Audits
d52ea13b5e07 skip beam particles when determining promptness
Author
cgutscho
Browse Repository
No Builds
No Audits
8897e33f63fb Hide Doxy output from hg
Author
buckley
Browse Repository
No Builds
No Audits
728abbefbebd Merge
Author
buckley
Browse Repository
No Builds
No Audits
f1a8b100aa13 Use integer rather than overloaded Projection comparison at the apply stage.
Author
buckley
Browse Repository
No Builds
No Audits
52701d1d055b Install the Python requests package
Author
buckley
Browse Repository
No Builds
No Audits
d37ba1862dad update changelog
Author
richardn
Browse Repository
No Builds
No Audits
4517ea1aa48d merged
Author
richardn
Browse Repository
No Builds
No Audits
0f5fbc48ffe5 merge
Author
richardn
Browse Repository
No Builds
No Audits
e8b251820b40 fix no of tracks plots in ATLAS_2016_I1424838, normalise to 100 not 1, agreed…
Author
richardn
Browse Repository
No Builds
No Audits
9a9c943da155 merge tow version of OPAL_2004_I631361_qq, now using new options feture instead
Author
richardn
Browse Repository
No Builds
No Audits
899d35036c40 more MC decay analyses
Author
richardn
Browse Repository
No Builds
No Audits
0a58c395a75f update BELLE yoda files from HEPDATA, one change in error calculation and rest…
Author
richardn
Browse Repository
No Builds
No Audits
df34783ebf2c update yoda for BABAR analysis from rivet, where no diff with yodadiff
Author
richardn
Browse Repository
No Builds
No Audits
8e1303b97fe7 fix BABAR_2005_S6181155 to sync yoda with hepdata, still a zero width bin to…
Author
richardn
Browse Repository
No Builds
No Audits
4494cea7c1c3 sync BABAR yoda files with hepdata, diff due to improved error calculation in…
Author
richardn
Browse Repository
No Builds
No Audits
4a33b7f29b6c add MC decay analyses
Author
richardn
Browse Repository
No Builds
No Audits
87603fa6be7d additional KLOE analysis, needs data adding to hepdata
Author
richardn
Browse Repository
No Builds
No Audits
75f55b98d60b additional CLEO analysis, needs data adding to hepdata
Author
richardn
Browse Repository
No Builds
No Audits
2b0134a73a31 more BES analyses, neeed data added to hepdata
Author
richardn
Browse Repository
No Builds
No Audits
56593754cda9 additional SND analyses, will need data added to hepdata
Author
richardn
Browse Repository
No Builds
No Audits
19d3001131b6 additional B factory analyses, will need dada added to rivet
Author
richardn
Browse Repository
No Builds
No Audits
b430d4d4977e new tau decay analyses, will need data added to hepdata
Author
richardn
Browse Repository
No Builds
No Audits
8009d04903c2 add analysis for R at 4 GeV
Author
richardn
Browse Repository
No Builds
No Audits
51dc9d776473 add analyses for multiplicities at upsilon 4s
Author
richardn
Browse Repository
No Builds
No Audits
59d24b8272ae add BELLE analysis for baryon spectra at 10.52 GeV
Author
richardn
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

analyses

pluginALICE/

ALICE_2016_I1507157.cc

pluginATLAS/

ATLAS_2015_I1386475.cc

pluginCMS/

include/

Rivet/

Projections/

ConstLossyFinalState.hh

EventMixingFinalState.hh

Tools/

Correlators.hh

Percentile.hh

RivetYODA.hh

src/

Core/

Tools/

test/

rRIVETHGfdecd3749555

View Options

analyses/pluginALICE/ALICE_2016_I1507157.cc

View Options

analyses/pluginATLAS/ATLAS_2015_I1386475.cc

View Options

analyses/pluginATLAS/ATLAS_pPb_Calib.cc

View Options

analyses/pluginCMS/CMS_2013_I1223519.cc

View Options

analyses/pluginMC/MC_Cent_pPb_Eta.cc

View Options

analyses/pluginMC/TEST.cc

View Options

include/Rivet/Projections/ConstLossyFinalState.hh

View Options

include/Rivet/Projections/EventMixingFinalState.hh

View Options

include/Rivet/Tools/Correlators.hh

View Options

include/Rivet/Tools/Percentile.hh

View Options

include/Rivet/Tools/RivetYODA.hh

View Options

src/Core/AnalysisHandler.cc

View Options

src/Tools/RivetYODA.cc

View Options

test/testCmp.cc

View Options

Merge, againfdecd3749555Actions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rRIVETHGfdecd3749555

analyses/pluginALICE/ALICE_2016_I1507157.cc

analyses/pluginATLAS/ATLAS_2015_I1386475.cc

analyses/pluginATLAS/ATLAS_pPb_Calib.cc

analyses/pluginCMS/CMS_2013_I1223519.cc

analyses/pluginMC/MC_Cent_pPb_Eta.cc

analyses/pluginMC/TEST.cc

include/Rivet/Projections/ConstLossyFinalState.hh

include/Rivet/Projections/EventMixingFinalState.hh

include/Rivet/Tools/Correlators.hh

include/Rivet/Tools/Percentile.hh

include/Rivet/Tools/RivetYODA.hh

src/Core/AnalysisHandler.cc

src/Tools/RivetYODA.cc

test/testCmp.cc

test/testNaN.cc

Merge, again
fdecd3749555
Actions