Fixed merge conflict from depreciated EmptyAnalysis
22c13c07aee6
Actions

Description

Fixed merge conflict from depreciated EmptyAnalysis

Details

Provenance

CE PH <conor.elrick@ed.ac.uk>	Authored on Feb 6 2023, 12:27 PM
amaier	Pushed on Mar 22 2023, 7:11 AM

Parents

rHEJ4076020dc1fc: Merge branch '185-cmake-warning-missing-source-file-extensions' into 'master'
rHEJe561439d465c: Removed whitespace

Branches

Unknown

Tags

Unknown

Event Timeline

CE PH <conor.elrick@ed.ac.uk> committed rHEJ22c13c07aee6: Fixed merge conflict from depreciated EmptyAnalysis (authored by CE PH <conor.elrick@ed.ac.uk>).Feb 6 2023, 12:27 PM

Merged Changes

4076020dc1fc Merge branch '185-cmake-warning-missing-source-file-extensions' into 'master'
Author
amaier
Browse Repository
No Builds
No Audits
a140b34d5f29 use full file names in `add_executable` statements
Author
amaier
Browse Repository
No Builds
No Audits
3a88f6fdb3d6 Merge branch '184-deprecate-emptyanalysis' into 'master'
Author
amaier
Browse Repository
No Builds
No Audits
d80c7a37379b fix HEJ version in documentation
Author
amaier
Browse Repository
No Builds
No Audits
aa8fe46580f0 warn about impending change in behaviour of `get_analysis`
Author
amaier
Browse Repository
No Builds
No Audits
1c280f30f764 deprecate EmptyAnalysis
Author
amaier
Browse Repository
No Builds
No Audits
aec0949f657a Merge branch '131-classification-as-non_resummable-und-bad_final_state-is…
Author
amaier
Browse Repository
No Builds
No Audits
196b3d5629c2 check validity of event treatment for `unknown` and `invalid` early on
Author
amaier
Browse Repository
No Builds
No Audits
15b354672ed8 don't require explicit treatment setting for `unknown` and `invalid` events
Author
amaier
Browse Repository
No Builds
No Audits
86f88d701d1b document changes
Author
amaier
Browse Repository
No Builds
No Audits
57da20d2755c removed obsolete event types
Author
amaier
Browse Repository
No Builds
No Audits
9eb1e0b847bd updated expected event types in decay test
Author
amaier
Browse Repository
No Builds
No Audits
244356e9afdd update classification reference data
Author
amaier
Browse Repository
No Builds
No Audits
9d42420f4807 update classification test
Author
amaier
Browse Repository
No Builds
No Audits
2cfb96a778f2 fallback for very soft particles in onshell test
Author
amaier
Browse Repository
No Builds
No Audits
c132159a8b48 use new event types in classification
Author
amaier
Browse Repository
No Builds
No Audits
c27bafc16b30 move momentum momentum conservation check to public interface
Author
amaier
Browse Repository
No Builds
No Audits
2d20f13cb4d1 new "abort" treatment for undesired event types
Author
amaier
Browse Repository
No Builds
No Audits
ebdfa4bedaeb added default treatment for new event types
Author
amaier
Browse Repository
No Builds
No Audits
8d38bb8d92f9 new event types for unphysical and unimplemented events
Author
amaier
Browse Repository
No Builds
No Audits
271b7655273a set bottom mass to 0 for jet_cuts test
Author
amaier
Browse Repository
No Builds
No Audits
387ac13624cf slightly adjust to reference phase space points to avoid re-ordering when…
Author
amaier
Browse Repository
No Builds
No Audits
92071bf6d746 fix momenta in colour flow test
Author
amaier
Browse Repository
No Builds
No Audits
34b81f081b1b ensure valid momenta in decay test
Author
amaier
Browse Repository
No Builds
No Audits
e4c15e98f55e ensure valid test reference momenta
Author
amaier
Browse Repository
No Builds
No Audits
2e8763cd40bb fix charge conservation in test configuration
Author
amaier
Browse Repository
No Builds
No Audits
5e132996756c fix sign error in test phase space point generation
Author
amaier
Browse Repository
No Builds
No Audits
825a3c80a401 ensure momentum conservation in test configurations
Author
amaier
Browse Repository
No Builds
No Audits
20a7a3fa7ad4 relax assertion in distance test
Author
amaier
Browse Repository
No Builds
No Audits
44931eaed655 add to_string function for `Event`
Author
amaier
Browse Repository
No Builds
No Audits

Changes (26)

Path

Size

Changes-API.md

Changes.md

config.yml

doc/

sphinx/

HEJ.rst

include/

HEJ/

detail/

src/

test_scale_arithmetics.cc

rHEJ22c13c07aee6

View Options

Changes-API.md

View Options

Changes.md

View Options

config.yml

View Options

doc/sphinx/HEJ.rst

View Options

include/HEJ/Config.hh

View Options

include/HEJ/EmptyAnalysis.hh

View Options

include/HEJ/Event.hh

View Options

include/HEJ/EventReweighter.hh

View Options

include/HEJ/detail/EmptyAnalysis.hh

View Options

include/HEJ/event_types.hh

View Options

include/HEJ/get_analysis.hh

View Options

include/HEJ/utility.hh

View Options

src/EmptyAnalysis.cc

View Options

src/Event.cc

View Options

src/EventReweighter.cc

View Options

src/PhaseSpacePoint.cc

View Options

src/YAMLreader.cc

View Options

src/get_analysis.cc

View Options

t/CMakeLists.txt

View Options

t/check_res.cc

View Options

t/hej_test.cc

View Options

t/hej_test.hh

View Options

t/test_classify.cc

View Options

t/test_colours.cc

View Options

t/test_decay.cc

View Options

t/test_scale_arithmetics.cc

Fixed merge conflict from depreciated EmptyAnalysis22c13c07aee6Actions

Description

Details

Event Timeline

Merged Changes

Changes (26)

rHEJ22c13c07aee6

Changes-API.md

Changes.md

config.yml

doc/sphinx/HEJ.rst

include/HEJ/Config.hh

include/HEJ/EmptyAnalysis.hh

include/HEJ/Event.hh

include/HEJ/EventReweighter.hh

include/HEJ/detail/EmptyAnalysis.hh

include/HEJ/event_types.hh

include/HEJ/get_analysis.hh

include/HEJ/utility.hh

src/EmptyAnalysis.cc

src/Event.cc

src/EventReweighter.cc

src/PhaseSpacePoint.cc

src/YAMLreader.cc

src/get_analysis.cc

t/CMakeLists.txt

t/check_res.cc

t/hej_test.cc

t/hej_test.hh

t/test_classify.cc

t/test_colours.cc

t/test_decay.cc

t/test_scale_arithmetics.cc

Fixed merge conflict from depreciated EmptyAnalysis
22c13c07aee6
Actions