From f4a8bd42b0035702d1acbd8a8956a40b12b10fa4 Mon Sep 17 00:00:00 2001 From: alexbooth92 Date: Thu, 16 Oct 2025 01:35:52 -0700 Subject: [PATCH] Add hit merging step to ndlar flow job script. (cherry picked from commit 7378d0e4636cd8d4709ec50c9d26086248e128e2) --- run-ndlar-flow/run_ndlar_flow_ndlar.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/run-ndlar-flow/run_ndlar_flow_ndlar.sh b/run-ndlar-flow/run_ndlar_flow_ndlar.sh index a74eb72..65cc4f8 100755 --- a/run-ndlar-flow/run_ndlar_flow_ndlar.sh +++ b/run-ndlar-flow/run_ndlar_flow_ndlar.sh @@ -34,14 +34,15 @@ workflow1='yamls/ndlar_flow/workflows/charge/charge_event_building_mc.yaml' workflow2='yamls/ndlar_flow/workflows/charge/charge_event_reconstruction_mc.yaml' workflow3='yamls/ndlar_flow/workflows/combined/combined_reconstruction_mc.yaml' workflow4='yamls/ndlar_flow/workflows/charge/prompt_calibration_mc.yaml' -workflow5='yamls/ndlar_flow/workflows/charge/final_calibration_mc.yaml' +workflow5='yamls/ndlar_flow/workflows/charge/merged_calibration_mc.yaml' +workflow6='yamls/ndlar_flow/workflows/charge/final_calibration_mc.yaml' # light workflows -workflow6='yamls/ndlar_flow/workflows/light/light_event_building_mc.yaml' -workflow7='yamls/ndlar_flow/workflows/light/light_event_reconstruction_mc.yaml' +workflow7='yamls/ndlar_flow/workflows/light/light_event_building_mc.yaml' +workflow8='yamls/ndlar_flow/workflows/light/light_event_reconstruction_mc.yaml' # charge-light trigger matching -workflow8='yamls/ndlar_flow/workflows/charge/charge_light_assoc_mc.yaml' +workflow9='yamls/ndlar_flow/workflows/charge/charge_light_assoc_mc.yaml' cd "$ND_PRODUCTION_INSTALL_DIR"/ndlar_flow @@ -49,13 +50,13 @@ cd "$ND_PRODUCTION_INSTALL_DIR"/ndlar_flow # ensures that we properly report the failure to the production system. set -o errexit -run h5flow -c $workflow1 $workflow2 $workflow3 $workflow4 $workflow5\ +run h5flow -c $workflow1 $workflow2 $workflow3 $workflow4 $workflow5 $workflow6\ -i "$inFile" -o "$outFile" $compression -run h5flow -c $workflow6 $workflow7\ +run h5flow -c $workflow7 $workflow8\ -i "$inFile" -o "$outFile" $compression -run h5flow -c $workflow8\ +run h5flow -c $workflow9\ -i "$outFile" -o "$outFile" $compression mkdir -p "$outDir/FLOW/$subDir"