Skip to content

Commit 3fbf303

Browse files
committed
make TPC residual merging conditional
1 parent 7844f38 commit 3fbf303

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

MC/bin/o2dpg_sim_workflow.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,13 +1975,15 @@ def remove_json_prefix(path):
19751975
workflow['stages'].append(POOL_merge_task)
19761976

19771977
# if TPC residuals extraction was requested, we have to merge per-tf trees
1978-
tpcResidMergingNeeds = ['scdaggreg_' + str(tf) for tf in range(1, NTIMEFRAMES + 1)]
1979-
TPCResid_merge_task = createTask(name='tpcresidmerge', needs = tpcResidMergingNeeds, lab=["CALIB"], mem='2000', cpu='1')
1980-
TPCResid_merge_task['cmd'] = ' set -e ; [ -f tpcresidmerge_input.txt ] && rm tpcresidmerge_input.txt; '
1981-
TPCResid_merge_task['cmd'] += ' for i in `seq 1 ' + str(NTIMEFRAMES) + '`; do find tf${i} -name "o2tpc_residuals_*.root" >> tpcresidmerge_input.txt; done; '
1982-
TPCResid_merge_task['cmd'] += '${O2DPG_ROOT}/UTILS/root_merger.py -o o2tpc_residuals.root -i $(grep -v \"^$\" tpcresidmerge_input.txt | paste -sd, -)'
1983-
workflow['stages'].append(TPCResid_merge_task)
1984-
1978+
if includeTPCResiduals:
1979+
tpcResidMergingNeeds = ['scdaggreg_' + str(tf) for tf in range(1, NTIMEFRAMES + 1)]
1980+
TPCResid_merge_task = createTask(name='tpcresidmerge', needs = tpcResidMergingNeeds, lab=["CALIB"], mem='2000', cpu='1')
1981+
TPCResid_merge_task['cmd'] = ' set -e ; [ -f tpcresidmerge_input.txt ] && rm tpcresidmerge_input.txt; '
1982+
TPCResid_merge_task['cmd'] += ' for i in `seq 1 ' + str(NTIMEFRAMES) + '`; do find tf${i} -name "o2tpc_residuals_*.root" >> tpcresidmerge_input.txt; done; '
1983+
TPCResid_merge_task['cmd'] += '${O2DPG_ROOT}/UTILS/root_merger.py -o o2tpc_residuals.root -i $(grep -v \"^$\" tpcresidmerge_input.txt | paste -sd, -)'
1984+
workflow['stages'].append(TPCResid_merge_task)
1985+
1986+
19851987
# adjust for alternate (RECO) software environments
19861988
adjust_RECO_environment(workflow, args.alternative_reco_software)
19871989

0 commit comments

Comments
 (0)