Diffusion rivethg 8be9a8891a22

merge
8be9a8891a22
Actions

Tags

None

Subscribers

None

Description

merge

Details

Provenance

lonnblad	Authored on
lonnblad	Pushed on Jun 9 2019, 10:47 PM

Parents

rRIVETHG5c85b234a794: Merged with release-2-7-x again to stay in touch.
rRIVETHG7de3b91dab4e: removing unncessary hist annotations

Branches

Unknown

Tags

Unknown

Event Timeline

lonnblad committed rRIVETHG8be9a8891a22: merge.Jun 9 2019, 1:46 PM

Merged Changes

5c85b234a794 Merged with release-2-7-x again to stay in touch.
Author
lonnblad
Browse Repository
No Builds
No Audits
21e8b86f67f4 Fixed unbooked counter.
Author
lonnblad
Browse Repository
No Builds
No Audits
80888162de52 sync yoda for CDF analysis where y errors changed due better calc in HEPData
Author
richardn
Browse Repository
No Builds
No Audits
b1fc075ea36e merge
Author
richardn
Browse Repository
No Builds
No Audits
5b9ad81056e1 CDF_2015_I1388868, changes to allow yoda sync, histograms renumbered and…
Author
richardn
Browse Repository
No Builds
No Audits
b7e3b43d063b PLUTO_1980_I154270 clean up to prepare for yoda sync
Author
richardn
Browse Repository
No Builds
No Audits
0b636d5a1b12 L3_2004_I652683 add missing plots and sync yoda, still missing n charged as…
Author
richardn
Browse Repository
No Builds
No Audits
6953173bd7a6 Adding more heavy-ion beam particles
Author
pkarczma
Browse Repository
No Builds
No Audits
376af79dd757 add OPAL_1997_I421977 for sigma +/- production
Author
richardn
Browse Repository
No Builds
No Audits
2482c97f5ef8 update BABAR_2007_S6895344.yoda with improved error calc
Author
richardn
Browse Repository
No Builds
No Audits
30bba576cb22 sync yoda for H1_1994_S2919893.yoda, only difference handling of non-existance…
Author
richardn
Browse Repository
No Builds
No Audits
9c75892ee50a sync yoda for OPAL_2000_S4418603.yoda, changes only in histos not used by rivet
Author
richardn
Browse Repository
No Builds
No Audits
863f8bff0181 sync yoda for OPAL_1997_S3608263, missing histos in rivet copy
Author
richardn
Browse Repository
No Builds
No Audits
9ebf9ff016df sync yoda for OPAL_1997_S3396100, trival difference some asymmetric x bins in…
Author
richardn
Browse Repository
No Builds
No Audits
30560befa15d remove null bins from yoda to allow sync with hepdata in CLEO_2004_S5809304.yoda
Author
richardn
Browse Repository
No Builds
No Audits
3a8bd6baea7c sync yoda for BELLE_2015_I1397632, two hists change label + final bin
Author
richardn
Browse Repository
No Builds
No Audits
c68cc9ae0f16 Show MCnet message only if loglevel is INFO or smaller. Helps declutter logfile…
Author
holsch
Browse Repository
No Builds
No Audits
69c78472ec6f update JADE_1983_I190818 to handle zero bins widths and update the yoda from…
Author
richardn
Browse Repository
No Builds
No Audits
b07b6f3583e0 merge
Author
richardn
Browse Repository
No Builds
No Audits
80caf76b93f3 update PLUTO_1980_I154270.yoda for new hepdata error calc
Author
richardn
Browse Repository
No Builds
No Audits
4ccb58ed5e22 Adding new heavy-ion beam particles: GOLD and LEAD
Author
pkarczma
Browse Repository
No Builds
No Audits
980c24c7ddb9 switch to using counters in DELPHI_2000_S4328825, errors now calculated, and…
Author
richardn
Browse Repository
No Builds
No Audits

Changes (146)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

analyses/

pluginALICE/

ALICE_2012_I1127497.cc

ALICE_2012_I930312.cc

ALICE_2015_PBPBCentrality.cc

ALICE_2016_I1507157.cc

pluginATLAS/

ATLAS_2011_I945498.cc

ATLAS_2014_I1306294.cc

ATLAS_2016_I1444991.cc

ATLAS_2017_I1614149.cc

pluginCDF/

CDF_1996_S3108457.cc

pluginCMS/

CMS_2016_PAS_TOP_15_006.cc

CMS_2018_I1682495.cc

CMS_2018_I1690148.cc

pluginHERA/

H1_2000_S4129130.cc

pluginLEP/

ALEPH_1996_S3486095.cc

ALEPH_2004_S5765862.cc

DELPHI_1995_S3137023.cc

DELPHI_1996_S3430090.cc

L3_2004_I652683.cc

OPAL_1996_S3257789.cc

OPAL_1998_S3780481.cc

OPAL_2004_I631361.cc

OPAL_2004_I631361.info

OPAL_2004_I648738.cc

OPAL_2004_S6132243.cc

SLD_1996_S3398250.cc

SLD_1999_S3743934.cc

SLD_2004_S5693039.cc

pluginMC/

bin/

rivet-mkanalysis

AnalysisHandler.hh

Projections/

JetSmearingFunctions.hh

ParticleSmearingFunctions.hh

RivetFastJet.hh

AxesDefinition.hh

BottomUpSoftDrop.hh

EnergyCorrelator.hh

ExtraRecombiners.hh

IteratedSoftDrop.hh

MeasureDefinition.hh

ModifiedMassDropTagger.hh

NjettinessPlugin.hh

Nsubjettiness.hh

RecursiveSoftDrop.hh

RecursiveSymmetryCutBase.hh

TauComponents.hh

pyext/

rivet/

Core/

AnalysisHandler.cc

Projections/

ChargedFinalState.cc

LeadingParticlesFinalState.cc

ParticleFinder.cc

RivetHepMC_2.cc

EnergyCorrelator

EnergyCorrelator.cc

EnergyCorrelator.hh

example_basic_usage.cc

example_basic_usage.ref

AxesDefinition.cc

ExtraRecombiners.cc

MeasureDefinition.cc

NjettinessPlugin.cc

Nsubjettiness.cc

TauComponents.cc

BottomUpSoftDrop.cc

IteratedSoftDrop.cc

ModifiedMassDropTagger.cc

RecursiveSoftDrop.cc

RecursiveSymmetryCutBase.cc

example_advanced_usage.cc

example_advanced_usage.ref

example_bottomup_softdrop.cc

example_bottomup_softdrop.ref

example_isd.ref

example_mmdt.cc

example_mmdt.ref

example_mmdt_ee.cc

example_mmdt_ee.ref

example_mmdt_sub.cc

example_mmdt_sub.ref

example_recluster.cc

example_recluster.ref

example_recursive_softdrop.cc

example_recursive_softdrop.ref

example_softdrop.cc

example_softdrop.ref

test/

rRIVETHG8be9a8891a22

ChangeLog

analyses/pluginALICE/ALICE_2012_I1127497.cc

analyses/pluginALICE/ALICE_2012_I930312.cc

analyses/pluginALICE/ALICE_2015_PBPBCentrality.cc

analyses/pluginALICE/ALICE_2016_I1507157.cc

analyses/pluginATLAS/ATLAS_2011_I945498.cc

analyses/pluginATLAS/ATLAS_2014_I1306294.cc

analyses/pluginATLAS/ATLAS_2016_I1444991.cc

analyses/pluginATLAS/ATLAS_2017_I1614149.cc

analyses/pluginCDF/CDF_1996_S3108457.cc

analyses/pluginCMS/CMS_2016_PAS_TOP_15_006.cc

analyses/pluginCMS/CMS_2018_I1682495.cc

analyses/pluginCMS/CMS_2018_I1690148.cc

analyses/pluginHERA/H1_2000_S4129130.cc

analyses/pluginLEP/ALEPH_1996_S3486095.cc

analyses/pluginLEP/ALEPH_2004_S5765862.cc

analyses/pluginLEP/DELPHI_1995_S3137023.cc

analyses/pluginLEP/DELPHI_1996_S3430090.cc

analyses/pluginLEP/L3_2004_I652683.cc

analyses/pluginLEP/OPAL_1996_S3257789.cc

analyses/pluginLEP/OPAL_1998_S3780481.cc

analyses/pluginLEP/OPAL_2004_I631361.cc

analyses/pluginLEP/OPAL_2004_I631361.info

analyses/pluginLEP/OPAL_2004_I648738.cc

analyses/pluginLEP/OPAL_2004_S6132243.cc

analyses/pluginLEP/SLD_1996_S3398250.cc

analyses/pluginLEP/SLD_1999_S3743934.cc

analyses/pluginLEP/SLD_2004_S5693039.cc

analyses/pluginMC/MC_VH2BB.cc

analyses/pluginMC/MC_WJETS.cc

bin/make-pgfplots

bin/make-plots

bin/rivet

bin/rivet-mkanalysis

configure.ac

include/Rivet/Analysis.hh

include/Rivet/AnalysisHandler.hh

include/Rivet/Makefile.am

include/Rivet/Projections/Spherocity.hh

include/Rivet/Tools/Cmp.fhh

include/Rivet/Tools/Cmp.hh

include/Rivet/Tools/JetSmearingFunctions.hh

include/Rivet/Tools/ParticleSmearingFunctions.hh

include/Rivet/Tools/RivetFastJet.hh

include/Rivet/Tools/fjcontrib/AxesDefinition.hh

include/Rivet/Tools/fjcontrib/BottomUpSoftDrop.hh

include/Rivet/Tools/fjcontrib/EnergyCorrelator.hh

include/Rivet/Tools/fjcontrib/ExtraRecombiners.hh

include/Rivet/Tools/fjcontrib/IteratedSoftDrop.hh

include/Rivet/Tools/fjcontrib/MeasureDefinition.hh

include/Rivet/Tools/fjcontrib/ModifiedMassDropTagger.hh

include/Rivet/Tools/fjcontrib/Njettiness.hh

include/Rivet/Tools/fjcontrib/NjettinessPlugin.hh

include/Rivet/Tools/fjcontrib/Nsubjettiness.hh

include/Rivet/Tools/fjcontrib/Recluster.hh

include/Rivet/Tools/fjcontrib/RecursiveSoftDrop.hh

include/Rivet/Tools/fjcontrib/RecursiveSymmetryCutBase.hh

include/Rivet/Tools/fjcontrib/SoftDrop.hh

include/Rivet/Tools/fjcontrib/TauComponents.hh

include/Rivet/Tools/fjcontrib/XConePlugin.hh

pyext/rivet/core.pyx

pyext/rivet/rivet.pxd

src/Core/Analysis.cc

src/Core/AnalysisHandler.cc

src/Core/Projection.cc

src/Makefile.am

src/Projections/ChargedFinalState.cc

src/Projections/FinalState.cc

src/Projections/LeadingParticlesFinalState.cc

src/Projections/ParticleFinder.cc

src/Tools/Makefile.am

src/Tools/RivetHepMC_2.cc

src/Tools/RivetYODA.cc

src/Tools/fjcontrib/EnergyCorrelator/AUTHORS

src/Tools/fjcontrib/EnergyCorrelator/COPYING

src/Tools/fjcontrib/EnergyCorrelator/ChangeLog

src/Tools/fjcontrib/EnergyCorrelator/EnergyCorrelator.cc

src/Tools/fjcontrib/EnergyCorrelator/EnergyCorrelator.hh

src/Tools/fjcontrib/EnergyCorrelator/Makefile.am

src/Tools/fjcontrib/EnergyCorrelator/NEWS

src/Tools/fjcontrib/EnergyCorrelator/README

src/Tools/fjcontrib/EnergyCorrelator/VERSION

src/Tools/fjcontrib/EnergyCorrelator/example.cc

src/Tools/fjcontrib/EnergyCorrelator/example.ref

src/Tools/fjcontrib/EnergyCorrelator/example_basic_usage.cc

src/Tools/fjcontrib/EnergyCorrelator/example_basic_usage.ref

src/Tools/fjcontrib/Makefile.am

src/Tools/fjcontrib/Nsubjettiness/AUTHORS

src/Tools/fjcontrib/Nsubjettiness/AxesDefinition.cc

src/Tools/fjcontrib/Nsubjettiness/COPYING

src/Tools/fjcontrib/Nsubjettiness/ChangeLog

src/Tools/fjcontrib/Nsubjettiness/ExtraRecombiners.cc

src/Tools/fjcontrib/Nsubjettiness/Makefile.am

src/Tools/fjcontrib/Nsubjettiness/MeasureDefinition.cc

src/Tools/fjcontrib/Nsubjettiness/NEWS

src/Tools/fjcontrib/Nsubjettiness/Njettiness.cc

src/Tools/fjcontrib/Nsubjettiness/NjettinessPlugin.cc

src/Tools/fjcontrib/Nsubjettiness/Nsubjettiness.cc

src/Tools/fjcontrib/Nsubjettiness/README

src/Tools/fjcontrib/Nsubjettiness/TauComponents.cc

src/Tools/fjcontrib/Nsubjettiness/VERSION

src/Tools/fjcontrib/Nsubjettiness/XConePlugin.cc

src/Tools/fjcontrib/RecursiveTools/AUTHORS

src/Tools/fjcontrib/RecursiveTools/BottomUpSoftDrop.cc

src/Tools/fjcontrib/RecursiveTools/COPYING

src/Tools/fjcontrib/RecursiveTools/ChangeLog

src/Tools/fjcontrib/RecursiveTools/IteratedSoftDrop.cc

src/Tools/fjcontrib/RecursiveTools/Makefile.am

src/Tools/fjcontrib/RecursiveTools/ModifiedMassDropTagger.cc

src/Tools/fjcontrib/RecursiveTools/NEWS

src/Tools/fjcontrib/RecursiveTools/README

src/Tools/fjcontrib/RecursiveTools/Recluster.cc

src/Tools/fjcontrib/RecursiveTools/RecursiveSoftDrop.cc

src/Tools/fjcontrib/RecursiveTools/RecursiveSymmetryCutBase.cc

src/Tools/fjcontrib/RecursiveTools/SoftDrop.cc

src/Tools/fjcontrib/RecursiveTools/TODO

src/Tools/fjcontrib/RecursiveTools/VERSION

src/Tools/fjcontrib/RecursiveTools/example_advanced_usage.cc

src/Tools/fjcontrib/RecursiveTools/example_advanced_usage.ref

src/Tools/fjcontrib/RecursiveTools/example_bottomup_softdrop.cc

src/Tools/fjcontrib/RecursiveTools/example_bottomup_softdrop.ref

src/Tools/fjcontrib/RecursiveTools/example_isd.cc

src/Tools/fjcontrib/RecursiveTools/example_isd.ref

src/Tools/fjcontrib/RecursiveTools/example_mmdt.cc

src/Tools/fjcontrib/RecursiveTools/example_mmdt.ref

src/Tools/fjcontrib/RecursiveTools/example_mmdt_ee.cc

src/Tools/fjcontrib/RecursiveTools/example_mmdt_ee.ref

src/Tools/fjcontrib/RecursiveTools/example_mmdt_sub.cc

src/Tools/fjcontrib/RecursiveTools/example_mmdt_sub.ref

src/Tools/fjcontrib/RecursiveTools/example_recluster.cc

src/Tools/fjcontrib/RecursiveTools/example_recluster.ref

src/Tools/fjcontrib/RecursiveTools/example_recursive_softdrop.cc

src/Tools/fjcontrib/RecursiveTools/example_recursive_softdrop.ref

src/Tools/fjcontrib/RecursiveTools/example_softdrop.cc

src/Tools/fjcontrib/RecursiveTools/example_softdrop.ref

test/testCmp.cc