Make sure to actually enter the event loop in the DelphesROOT_EDM4HEP…

… executable (#125) * Make sure to not abort event loop early * Move tests to one branch * Add test to make sure DelphesROOT_EDM4HEP works as expected * Make sure to make tests runnable concurrently
key4hep · Jul 29, 2024 · 02a602e · 02a602e
1 parent efe646e
commit 02a602e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/standalone/src/DelphesRootReader.h b/standalone/src/DelphesRootReader.h
@@ -91,7 +91,7 @@ class DelphesRootReader : public DelphesInputReader {
     }
     ++m_entry;
 
-    return finished();
+    return true;
   };
 
   TTree* converterTree() override { return m_treeWriter->GetTree(); }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -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()
diff --git a/tests/data/gev91ee_zboson_100events.root b/tests/data/gev91ee_zboson_100events.root
diff --git a/tests/testDriver.sh b/tests/testDriver.sh
@@ -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")