Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure to actually enter the event loop in the DelphesROOT_EDM4HEP executable #125

Merged
merged 4 commits into from
Jul 29, 2024
Merged

Make sure to actually enter the event loop in the DelphesROOT_EDM4HEP executable #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b96ffb
Make sure to not abort event loop early
tmadlener Jul 25, 2024
2f8946f
Move tests to one branch
tmadlener Jul 29, 2024
b131a28
Add test to make sure DelphesROOT_EDM4HEP works as expected
tmadlener Jul 29, 2024
9f5767d
Make sure to make tests runnable concurrently
tmadlener Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion standalone/src/DelphesRootReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class DelphesRootReader : public DelphesInputReader {
}
++m_entry;

return finished();
return true;
};

TTree* converterTree() override { return m_treeWriter->GetTree(); }
Expand Down
10 changes: 2 additions & 8 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,11 @@ find_file(DELPHES_CARD delphes_card_IDEA.tcl PATHS ${DELPHES_CARDS_DIR})
if(DELPHES_CARD)
if(BUILD_PYTHIA_READER)
ADD_COMPARISON_TEST(PythiaConverter_ee_Z_bbbar DelphesPythia8_EDM4HEP ${DELPHES_CARD} ${OUTPUT_CONFIG} pythia_converter_output_ee_Z_bbbar.root ${PROJECT_SOURCE_DIR}/examples/data/ee_Z_bbbar_ecm91GeV.cmd)
endif()
else()
message(WARNING "Cannot find IDEA delphes card from the delphes installation. Cannot use it for testing")
endif()

#Use tester card for testing the ResonanceDecayUserHook
find_file(DELPHES_CARD delphes_card_IDEA.tcl PATHS ${DELPHES_CARDS_DIR})
if(DELPHES_CARD)
if(BUILD_PYTHIA_READER)
ADD_COMPARISON_TEST(PythiaResonanceDecayFilter_pp_hhbbyy DelphesPythia8_EDM4HEP ${DELPHES_CARD} ${OUTPUT_CONFIG} pythia_resonance_decay_filter_pp_hhbbyy_output.root ${PROJECT_SOURCE_DIR}/examples/data/tester_pwp8_pp_hh_5f_hhbbyy.cmd --no-delphes)
endif()

ADD_COMPARISON_TEST(DelphesRootReader_ee_91gev DelphesROOT_EDM4HEP ${DELPHES_CARD} ${OUTPUT_CONFIG} delphes_root_converter_input_reader_test.root ${PROJECT_SOURCE_DIR}/tests/data/gev91ee_zboson_100events.root )
else()
message(WARNING "Cannot find IDEA delphes card from the delphes installation. Cannot use it for testing")
endif()
Binary file added tests/data/gev91ee_zboson_100events.root
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/testDriver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DELPHES_CARD_IN=${2}
OUTPUT_CONFIG=${3}
OUTPUT_FILE=${4}

DELPHES_CARD=$(pwd)/test_$(basename ${DELPHES_CARD_IN})
DELPHES_CARD=$(pwd)/$(mktemp -u test_XXXX_$(basename ${DELPHES_CARD_IN}))

# Keep track on whether this has been enabled from the calling site
xtrace_on=$(shopt -qo xtrace && echo "yes")
Expand Down
Loading