Merge branch '182-add-support-for-named-pipe-fifo-lhe-files' into 'master'
de35fa62c96d
Actions

Description

Merge branch '182-add-support-for-named-pipe-fifo-lhe-files' into 'master'

Switch to new method of normalisation for SHERPA files.

Closes #182

See merge request hej/HEJ!243

Details

Provenance

amaier	Authored on Mar 6 2023, 12:57 PM
amaier	Pushed on Mar 22 2023, 7:11 AM

Parents

rHEJ115257f66c99: Merge branch 'alt_analysis_scaling' into '182-add-support-for-named-pipe-fifo…
rHEJb71cc85bf8c9: Merge branch 'restore_Higgs_rap_sampling' into 'master'

Branches

Unknown

Tags

Unknown

Event Timeline

amaier committed rHEJde35fa62c96d: Merge branch '182-add-support-for-named-pipe-fifo-lhe-files' into 'master' (authored by amaier).Mar 6 2023, 12:57 PM

Merged Changes

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

115257f66c99 Merge branch 'alt_analysis_scaling' into '182-add-support-for-named-pipe-fifo…
Author
amaier
Browse Repository
No Builds
No Audits
5da1f5623776 update documentation
Author
amaier
Browse Repository
No Builds
No Audits
6752e1a3be20 update analysis rescaling factor before each fill
Author
amaier
Browse Repository
No Builds
No Audits
23380ef21409 update hdf5 test to work with more recent versions of highfive
Author
amaier
Browse Repository
No Builds
No Audits
e8d3764c25d7 Merge branch 'master' into 182-add-support-for-named-pipe-fifo-lhe-files
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
640f32bcf6f8 Merge branch 'lhetest' into '182-add-support-for-named-pipe-fifo-lhe-files'
Author
Conor Elrick <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
881294a40013 Added test on event weight of HEJ output
Author
Conor Elrick <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
ff24a0048f9f Merge branch 'fix_event_file_xs' into '182-add-support-for-named-pipe-fifo-lhe…
Author
Conor Elrick <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
2aece2a0b60b Add back a corrected member function to rewrite the init block in the…
Author
amaier
Browse Repository
No Builds
No Audits
2677dd7a71cc pass scale factor to event writer
Author
amaier
Browse Repository
No Builds
No Audits
65916c5aba0c EventWriter member function to set ratio between cross section and sum of…
Author
amaier
Browse Repository
No Builds
No Audits
3b30c89869ba bug fix: HDF5 output contained the cross section variance, not the error
Author
amaier
Browse Repository
No Builds
No Audits
af91364ca970 abort fifo test if commands fail of variables are not set
Author
amaier
Browse Repository
No Builds
No Audits
8704af6a65b6 bug fix: actually remove fifo after test
Author
amaier
Browse Repository
No Builds
No Audits
6fd1c75ec290 consistent style in example
Author
amaier
Browse Repository
No Builds
No Audits
6521ca2b17a6 typos in documentation
Author
amaier
Browse Repository
No Builds
No Audits
11cb3337b58b Removed whitespace
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
22c13c07aee6 Fixed merge conflict from depreciated EmptyAnalysis
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
e561439d465c Removed whitespace
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
63884e872a71 Added line about fifo to Changes.md
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
5c8dc0c4f45f Added note about fifo to sphinx docs
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
8dc9da24f423 Removed python file from tests
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
545d10a7ad6b Use gzipped file in fifo test
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
e97b9fc8ccd8 Initial commit of wip fifo ctest
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
5fcbb66a5777 Merge branch 'dont_use_filesystem_yet' into '182-add-support-for-named-pipe…
Author
amaier
Browse Repository
No Builds
No Audits
9fef62777f27 remove unused header
Author
amaier
Browse Repository
No Builds
No Audits
94b626b894cf decide whether to create a progress bar without requiring std::filesystem
Author
amaier
Browse Repository
No Builds
No Audits
033eded1ded6 new docker images for rivet CI tests require new software stack
Author
amaier
Browse Repository
No Builds
No Audits
9a41fd58c8a4 bug fix: new qcdloop image uses v2 of HEJ software environment
Author
amaier
Browse Repository
No Builds
No Audits
94fdc59c617e Remove variable
Author
amaier
Browse Repository
No Builds
No Audits
0c42a276ee0b Remove redundant CI test
Author
amaier
Browse Repository
No Builds
No Audits
04ba967516dd update CI image to match required rivet version
Author
amaier
Browse Repository
No Builds
No Audits
01f5176510ce document new rivet version requirement
Author
amaier
Browse Repository
No Builds
No Audits
40c7670a965d Added missing linker flag to cmakelist
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
a0e9a94d10ab Reimplemented progress bar for non-fifo input
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
02d7c28eb8b2 tabs -> spaces AnalysisTemplate
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
78df146058e9 Added first pass of testing script for fifo
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
08cd45c11e9c Added fixes to leshoucheswriter
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
38641073b2a2 Add void mention of xsscale
Author
CE PH <conor.elrick@ed.ac.uk>
Browse Repository
No Builds
No Audits
c42f654a0d98 make `scalefactor` a const member function
Author
amaier
Browse Repository
No Builds
No Audits
71da19cb281a ensure that `number_events` returns either nothing or the correct number of…
Author
amaier
Browse Repository
No Builds
No Audits
4c304f3ad63a rescale unconditionally if the rescaling factor is nontrivial
Author
amaier
Browse Repository
No Builds
No Audits
0b1fbd4f68ec remove redundant class
Author
amaier
Browse Repository
No Builds
No Audits
562e8880c578 avoid code duplication
Author
amaier
Browse Repository
No Builds
No Audits
d77ae7db95c7 use standard naming conventions for generator member
Author
amaier
Browse Repository
No Builds
No Audits
edb0a0ef0e27 remove generator member from EventReader base class
Author
amaier
Browse Repository
No Builds
No Audits
14dee44d6f2a Merge branch 'master' into 182-add-support-for-named-pipe-fifo-lhe-files
Author
amaier
Browse Repository
No Builds
No Audits
0037480ca964 the empty analysis should do nothing
Author
amaier
Browse Repository
No Builds
No Audits
59e6b2b12a7f naming conventions
Author
amaier
Browse Repository
No Builds
No Audits
98f82142a10c remove unused code
Author
amaier
Browse Repository
No Builds
No Audits

Changes (49)

Path

Size

.gitlab-ci.yml

Changes-API.md

Changes.md

doc/

sphinx/

examples/

WRapidityAnalysisROOT.cc

include/

HEJ/

Analysis.hh

CombinedEventWriter.hh

CrossSectionAccumulator.hh

detail/

src/

CombinedEventWriter.cc

CrossSectionAccumulator.cc

bin/

rHEJde35fa62c96d

View Options

.gitlab-ci.yml

View Options

Changes-API.md

View Options

Changes.md

View Options

doc/sphinx/HEJ.rst

View Options

doc/sphinx/analyses.rst

View Options

doc/sphinx/installation.rst

View Options

examples/AnalysisPrint.cc

View Options

examples/AnalysisROOT.cc

View Options

examples/AnalysisTemplate.cc

View Options

examples/WRapidityAnalysisROOT.cc

View Options

include/HEJ/Analysis.hh

View Options

include/HEJ/CombinedEventWriter.hh

View Options

include/HEJ/CrossSectionAccumulator.hh

View Options

include/HEJ/EmptyAnalysis.hh

View Options

include/HEJ/EventReader.hh

View Options

include/HEJ/EventWriter.hh

View Options

include/HEJ/HDF5Writer.hh

View Options

include/HEJ/HepMC2Interface.hh

View Options

include/HEJ/HepMC2Writer.hh

View Options

include/HEJ/HepMC3Interface.hh

View Options

include/HEJ/HepMC3Writer.hh

View Options

include/HEJ/LesHouchesReader.hh

View Options

include/HEJ/LesHouchesWriter.hh

View Options

include/HEJ/ProgressBar.hh

View Options

include/HEJ/RivetAnalysis.hh

View Options

include/HEJ/detail/EmptyAnalysis.hh

View Options

include/HEJ/filesystem.hh

View Options

src/CombinedEventWriter.cc

View Options

src/CrossSectionAccumulator.cc

View Options

src/EmptyAnalysis.cc

View Options

src/EventReader.cc

View Options

src/HDF5Writer.cc

View Options

src/HepMC2Interface.cc

View Options

src/HepMC2Writer.cc

View Options

src/HepMC3Interface.cc

View Options

src/HepMC3Writer.cc

View Options

src/LesHouchesReader.cc

View Options

src/LesHouchesWriter.cc

View Options

src/RivetAnalysis.cc

View Options

src/bin/HEJ.cc

View Options

src/filesystem.cc

View Options

t/CMakeLists.txt

View Options

t/check_hepmc.cc

View Options

t/check_hepmc2.cc

View Options

t/check_highfive.cc

View Options

t/check_lhe.cc

View Options

t/check_lhe_sherpa.cc

View Options

t/check_res.cc

View Options

Merge branch '182-add-support-for-named-pipe-fifo-lhe-files' into 'master'de35fa62c96dActions

Description

Details

Event Timeline

Merged Changes

Changes (49)

rHEJde35fa62c96d

.gitlab-ci.yml

Changes-API.md

Changes.md

doc/sphinx/HEJ.rst

doc/sphinx/analyses.rst

doc/sphinx/installation.rst

examples/AnalysisPrint.cc

examples/AnalysisROOT.cc

examples/AnalysisTemplate.cc

examples/WRapidityAnalysisROOT.cc

include/HEJ/Analysis.hh

include/HEJ/CombinedEventWriter.hh

include/HEJ/CrossSectionAccumulator.hh

include/HEJ/EmptyAnalysis.hh

include/HEJ/EventReader.hh

include/HEJ/EventWriter.hh

include/HEJ/HDF5Writer.hh

include/HEJ/HepMC2Interface.hh

include/HEJ/HepMC2Writer.hh

include/HEJ/HepMC3Interface.hh

include/HEJ/HepMC3Writer.hh

include/HEJ/LesHouchesReader.hh

include/HEJ/LesHouchesWriter.hh

include/HEJ/ProgressBar.hh

include/HEJ/RivetAnalysis.hh

include/HEJ/detail/EmptyAnalysis.hh

include/HEJ/filesystem.hh

src/CombinedEventWriter.cc

src/CrossSectionAccumulator.cc

src/EmptyAnalysis.cc

src/EventReader.cc

src/HDF5Writer.cc

src/HepMC2Interface.cc

src/HepMC2Writer.cc

src/HepMC3Interface.cc

src/HepMC3Writer.cc

src/LesHouchesReader.cc

src/LesHouchesWriter.cc

src/RivetAnalysis.cc

src/bin/HEJ.cc

src/filesystem.cc

t/CMakeLists.txt

t/check_hepmc.cc

t/check_hepmc2.cc

t/check_highfive.cc

t/check_lhe.cc

t/check_lhe_sherpa.cc

t/check_res.cc

t/fifotest.sh

Merge branch '182-add-support-for-named-pipe-fifo-lhe-files' into 'master'
de35fa62c96d
Actions