Add a test with the clic reconstruction

Author: jmcarcell

k4MarlinWrapper/examples/clicRec_e4h_input.py

@@ -24,6 +24,11 @@
 from Configurables import LcioEvent, MarlinProcessorWrapper
 from k4MarlinWrapper.parseConstants import *
 
+from Configurables import ToolSvc, Lcio2EDM4hepTool, EDM4hep2LcioTool
+from Configurables import k4DataSvc, PodioInput, PodioOutput, EventDataSvc
+
+from k4FWCore import ApplicationMgr, IOSvc
+
 algList = []
 
 
@@ -33,22 +38,32 @@
 
 parseConstants(CONSTANTS)
 
-
-# For converters
-from Configurables import ToolSvc, Lcio2EDM4hepTool, EDM4hep2LcioTool
-
-
-from Configurables import k4DataSvc, PodioInput
-
-evtsvc = k4DataSvc("EventDataSvc")
-evtsvc.input = os.path.join(
-    "$TEST_DIR/inputFiles/", os.environ.get("INPUTFILE", "ttbar_edm4hep_frame.root")
+parser.add_argument(
+    "--iosvc", action="store_true", default=False, help="Use IOSvc instead of PodioDataSvc"
 )
-
-
-inp = PodioInput("InputReader")
-inp.OutputLevel = DEBUG
-
+parser.add_argument("--rec-output", default=False, help="Output file name for the REC file")
+parser.add_argument("--dst-output", default=False, help="Output file name for the DST file")
+
+args = parser.parse_known_args()[0]
+
+if args.iosvc:
+    evtsvc = EventDataSvc("EventDataSvc")
+    iosvc = IOSvc()
+    iosvc.Input = os.path.join(
+        "$TEST_DIR/inputFiles/", os.environ.get("INPUTFILE", "ttbar_edm4hep_frame.root")
+    )
+    iosvc.Output = "my_output.root"
+else:
+    evtsvc = k4DataSvc("EventDataSvc")
+    evtsvc.input = os.path.join(
+        "$TEST_DIR/inputFiles/", os.environ.get("INPUTFILE", "ttbar_edm4hep_frame.root")
+    )
+
+    inp = PodioInput("InputReader")
+    inp.OutputLevel = DEBUG
+
+    out = PodioOutput("PodioOutput", filename="my_output.root")
+    out.outputCommands = ["keep *"]
 
 MyAIDAProcessor = MarlinProcessorWrapper("MyAIDAProcessor")
 MyAIDAProcessor.OutputLevel = WARNING
@@ -2429,14 +2444,6 @@
 }
 
 
-# Write output to EDM4hep
-from Configurables import PodioOutput
-
-out = PodioOutput("PodioOutput", filename="my_output.root")
-out.outputCommands = ["keep *"]
-
-
-algList.append(inp)
 algList.append(MyAIDAProcessor)
 algList.append(EventNumber)
 algList.append(InitDD4hep)
@@ -2486,8 +2493,8 @@
 # # algList.append(VertexFinderUnconstrained)  # Config.VertexUnconstrainedON
 algList.append(Output_REC)
 algList.append(Output_DST)
-algList.append(out)
 
-from Configurables import ApplicationMgr
+if not args.iosvc:
+    algList = [inp] + algList + [out]
 
 ApplicationMgr(TopAlg=algList, EvtSel="NONE", EvtMax=3, ExtSvc=[evtsvc], OutputLevel=WARNING)

test/CMakeLists.txt

@@ -78,6 +78,7 @@ set_tests_properties ( same_num_io
 
 # Test clicReconstruction with EDM4hep input and output
 ExternalData_Add_Test( marlinwrapper_tests NAME clicRec_edm4hep_input COMMAND bash -c "${CMAKE_CURRENT_SOURCE_DIR}/scripts/clicRec_e4h_input.sh DATA{${PROJECT_SOURCE_DIR}/test/input_files/ttbar_20240223_edm4hep.root}")
+ExternalData_Add_Test( marlinwrapper_tests NAME clicRec_edm4hep_input_iosvc COMMAND bash -c "${CMAKE_CURRENT_SOURCE_DIR}/scripts/clicRec_e4h_input.sh DATA{${PROJECT_SOURCE_DIR}/test/input_files/ttbar_20240223_edm4hep.root} --iosvc")
 
 # Run clicReconstruction sequence with LCIO input and output, no converters, with inter-event parallelism
 ExternalData_Add_Test( marlinwrapper_tests NAME clicRec_lcio_mt COMMAND bash -c "${CMAKE_CURRENT_SOURCE_DIR}/scripts/clicRec_lcio_mt.sh DATA{${PROJECT_SOURCE_DIR}/test/input_files/testSimulation.slcio}")

test/scripts/clicRec_e4h_input.sh

@@ -23,7 +23,17 @@ set -eu
 
 cd CLICPerformance/clicConfig
 
-k4run $EXAMPLE_DIR/clicRec_e4h_input.py --EventDataSvc.input=$1
+if [ "$2" = "--iosvc" ]; then
+  iosvc="_iosvc"
+  echo "Running with IO service"
+  file_arg = "--IOSvc.Input=$1"
+elif [ -n "$2" ]; then
+  echo "Wrong argument $2"
+else
+  echo "Running without IO service"
+  file_arg = "EventDataSvc.input=$1"
+fi
+k4run $EXAMPLE_DIR/clicRec_e4h_input.py $file_arg --rec-output Output_REC_e4h_input$iosvc.slcio --dst-output Output_DST_e4h_input$iosvc.slcio
 
 input_num_events=$(python $TEST_DIR/python/root_num_events.py $1)
 output_num_events=$(python $TEST_DIR/python/root_num_events.py my_output.root)
@@ -35,14 +45,14 @@ if [ "$input_num_events" != "$output_num_events" ]; then
 fi
 
 # Second check: contents (at least superficially)
-echo "Comparing contents of Output_REC_e4h_input.slcio"
-if ! diff <(anajob Output_REC_e4h_input.slcio) $TEST_DIR/inputFiles/anajob_Output_REC.expected; then
+echo "Comparing contents of Output_REC_e4h_input$iosvc.slcio"
+if ! diff <(anajob Output_REC_e4h_input$iosvc.slcio) $TEST_DIR/inputFiles/anajob_Output_REC.expected; then
   echo "File contents of REC slcio file are not as expected"
   exit 1
 fi
 
-echo "Comparing contents of Output_DST_e4h_input.slcio"
-if ! diff <(anajob Output_DST_e4h_input.slcio) $TEST_DIR/inputFiles/anajob_Output_DST.expected; then
+echo "Comparing contents of Output_DST_e4h_input$iosvc.slcio"
+if ! diff <(anajob Output_DST_e4h_input$iosvc.slcio) $TEST_DIR/inputFiles/anajob_Output_DST.expected; then
   echo "File contents of DST slcio file are not as expected"
   exit 1
 fi