Merge branch 'master' into HEJ@NLO
d5345cdaf180
Actions

Description

Merge branch 'master' into HEJ@NLO

Details

Provenance

amaier	Authored on May 24 2022, 8:15 AM
amaier	Pushed on Mar 22 2023, 7:11 AM

Parents

rHEJ68deca8f54a7: Merge branch '160-allow-require-c-17' into 'master'
rHEJ3dc0dd0f3f8f: Fix to HEJFOG to include missing function argument.

Branches

Unknown

Tags

Unknown

Event Timeline

amaier committed rHEJd5345cdaf180: Merge branch 'master' into HEJ@NLO (authored by amaier).May 24 2022, 12:56 PM

Merged Changes

68deca8f54a7 Merge branch '160-allow-require-c-17' into 'master'
Author
amaier
Browse Repository
No Builds
No Audits
6ad054693bc0 deprecate HEJ::optional
Author
amaier
Browse Repository
No Builds
No Audits
44d321ce507e use std::optional everywhere
Author
amaier
Browse Repository
No Builds
No Audits
2a6d1b5ff916 Updated changelog
Author
amaier
Browse Repository
No Builds
No Audits
85822a138141 Require C++17
Author
amaier
Browse Repository
No Builds
No Audits

Changes (30)

Path

Size

FixedOrderGen/

include/

src/

bin/

doc/

sphinx/

installation.rst

include/

HEJ/

BufferedEventReader.hh

src/

bin/

rHEJd5345cdaf180

View Options

CMakeLists.txt

View Options

Changes.md

View Options

FixedOrderGen/CMakeLists.txt

View Options

FixedOrderGen/include/EventGenerator.hh

View Options

FixedOrderGen/include/JetParameters.hh

View Options

FixedOrderGen/include/Process.hh

View Options

FixedOrderGen/include/config.hh

View Options

FixedOrderGen/src/EventGenerator.cc

View Options

FixedOrderGen/src/bin/main.cc

View Options

README.md

View Options

doc/sphinx/installation.rst

View Options

include/HEJ/BufferedEventReader.hh

View Options

include/HEJ/Config.hh

View Options

include/HEJ/EventReader.hh

View Options

include/HEJ/HDF5Reader.hh

View Options

include/HEJ/LesHouchesReader.hh

View Options

include/HEJ/Particle.hh

View Options

include/HEJ/RivetAnalysis.hh

View Options

include/HEJ/Unweighter.hh

View Options

include/HEJ/YAMLreader.hh

View Options

include/HEJ/make_RNG.hh

View Options

include/HEJ/optional.hh

View Options

src/Event.cc

View Options

src/HDF5Reader.cc

View Options

src/MatrixElement.cc

View Options

src/Unweighter.cc

View Options

src/bin/HEJ.cc

View Options

src/make_RNG.cc

View Options

t/test_colours.cc

View Options

Merge branch 'master' into HEJ@NLOd5345cdaf180Actions

Description

Details

Event Timeline

Merged Changes

Changes (30)

rHEJd5345cdaf180

CMakeLists.txt

Changes.md

FixedOrderGen/CMakeLists.txt

FixedOrderGen/include/EventGenerator.hh

FixedOrderGen/include/JetParameters.hh

FixedOrderGen/include/Process.hh

FixedOrderGen/include/config.hh

FixedOrderGen/src/EventGenerator.cc

FixedOrderGen/src/bin/main.cc

README.md

doc/sphinx/installation.rst

include/HEJ/BufferedEventReader.hh

include/HEJ/Config.hh

include/HEJ/EventReader.hh

include/HEJ/HDF5Reader.hh

include/HEJ/LesHouchesReader.hh

include/HEJ/Particle.hh

include/HEJ/RivetAnalysis.hh

include/HEJ/Unweighter.hh

include/HEJ/YAMLreader.hh

include/HEJ/make_RNG.hh

include/HEJ/optional.hh

src/Event.cc

src/HDF5Reader.cc

src/MatrixElement.cc

src/Unweighter.cc

src/bin/HEJ.cc

src/make_RNG.cc

t/test_colours.cc

t/test_colours2.cc

Merge branch 'master' into HEJ@NLO
d5345cdaf180
Actions