Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into tensor-cleanup
47184d881134
Actions

Description

Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into tensor-cleanup

Details

Provenance

black	Authored on Jul 22 2019, 1:35 PM
hej	Pushed on Jan 14 2021, 6:07 PM

Parents

rHEJ8aef8b3635d4: comments
rHEJ357005a8995f: Always return in main functions

Branches

Unknown

Tags

Unknown

Event Timeline

black committed rHEJ47184d881134: Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into tensor-cleanup (authored by black).Jul 22 2019, 1:35 PM

black committed rHEJ47184d881134: Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into tensor-cleanup (authored by black).

Merged Changes

357005a8995f Always return in main functions
Author
hej
Browse Repository
No Builds
No Audits
836778b313aa Fix/typo: LHE test was not activated
Author
hej
Browse Repository
No Builds
No Audits
a25bece12657 Always return in main functions
Author
hej
Browse Repository
No Builds
No Audits
c45795238dc1 removed redundant header
Author
hej
Browse Repository
No Builds
No Audits
579d5dac8ee1 Don't recluster in ME
Author
hej
Browse Repository
No Builds
No Audits
dee37c22669c Merge branch 'hdf5_weight' into 'master'
Author
amaier
Browse Repository
No Builds
No Audits
8fc8dab33d68 bug fix: trials is a double (see arXiv:1905.05120)
Author
amaier
Browse Repository
No Builds
No Audits
2c80bba9f312 Fix: HDF5 weight is given as `xs=sum(weight)/number_trials`
Author
hej
Browse Repository
No Builds
No Audits
74af41e4b154 Bugfix: weights are doubles
Author
hej
Browse Repository
No Builds
No Audits
4e12aaa59187 Added option for the EventReader to provide "numbers of events"
Author
hej
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

CMakeLists.txt

FixedOrderGen/

src/

include/

HEJ/

src/

bin/

test_scale_arithmetics.cc

test_scale_import.cc

rHEJ47184d881134

View Options

CMakeLists.txt

View Options

FixedOrderGen/src/main.cc

View Options

FixedOrderGen/t/2j.cc

View Options

FixedOrderGen/t/4j.cc

View Options

FixedOrderGen/t/h_2j.cc

View Options

FixedOrderGen/t/h_2j_decay.cc

View Options

FixedOrderGen/t/h_3j.cc

View Options

FixedOrderGen/t/h_3j_uno1.cc

View Options

FixedOrderGen/t/h_3j_uno2.cc

View Options

FixedOrderGen/t/h_5j.cc

View Options

include/HEJ/EventReader.hh

View Options

include/HEJ/HDF5Reader.hh

View Options

src/HDF5Reader.cc

View Options

src/MatrixElement.cc

View Options

src/bin/HEJ.cc

View Options

t/check_hepmc.cc

View Options

t/check_lhe.cc

View Options

t/check_res.cc

View Options

t/cmp_events.cc

View Options

t/test_classify_ref.cc

View Options

t/test_descriptions.cc

View Options

t/test_hdf5.cc

View Options

t/test_psp.cc

View Options

t/test_scale_arithmetics.cc

View Options

Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into tensor-cleanup47184d881134Actions

Description

Details

Event Timeline

Merged Changes

Changes (25)

rHEJ47184d881134

CMakeLists.txt

FixedOrderGen/src/main.cc

FixedOrderGen/t/2j.cc

FixedOrderGen/t/4j.cc

FixedOrderGen/t/h_2j.cc

FixedOrderGen/t/h_2j_decay.cc

FixedOrderGen/t/h_3j.cc

FixedOrderGen/t/h_3j_uno1.cc

FixedOrderGen/t/h_3j_uno2.cc

FixedOrderGen/t/h_5j.cc

include/HEJ/EventReader.hh

include/HEJ/HDF5Reader.hh

src/HDF5Reader.cc

src/MatrixElement.cc

src/bin/HEJ.cc

t/check_hepmc.cc

t/check_lhe.cc

t/check_res.cc

t/cmp_events.cc

t/test_classify_ref.cc

t/test_descriptions.cc

t/test_hdf5.cc

t/test_psp.cc

t/test_scale_arithmetics.cc

t/test_scale_import.cc

Merge branch 'master' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into tensor-cleanup
47184d881134
Actions