@@ -50,7 +50,12 @@ sed -i 's/JDL_ANCHORYEAR/JDL_LPMANCHORYEAR/' async_pass.sh
5050# create workflow ---> creates the file that can be parsed
5151export IGNORE_EXISTING_SHMFILES=1
5252touch list.list
53+ ALIEN_JDL_LPMPRODUCTIONTAG_KEEP=$ALIEN_JDL_LPMPRODUCTIONTAG
54+ echo " Substituting ALIEN_JDL_LPMPRODUCTIONTAG=$ALIEN_JDL_LPMPRODUCTIONTAG with ALIEN_JDL_LPMANCHORPRODUCTION=$ALIEN_JDL_LPMANCHORPRODUCTION for simulating reco pass..."
55+ ALIEN_JDL_LPMPRODUCTIONTAG=$ALIEN_JDL_LPMANCHORPRODUCTION
5356./async_pass.sh
57+ ALIEN_JDL_LPMPRODUCTIONTAG=$ALIEN_JDL_LPMPRODUCTIONTAG_KEEP
58+ echo " Setting back ALIEN_JDL_LPMPRODUCTIONTAG to $ALIEN_JDL_LPMPRODUCTIONTAG "
5459
5560# now create the local MC config file --> config-config.json
5661${O2DPG_ROOT} /UTILS/parse-async-WorkflowConfig.py
@@ -80,11 +85,14 @@ baseargs="-tf ${NTIMEFRAMES} --split-id ${ALIEN_JDL_SPLITID:-0} --prod-split ${A
8085remainingargs=" -eCM 900 -col pp -gen pythia8 -proc inel -ns ${NSIGEVENTS} \
8186 -interactionRate 2000 \
8287 -confKey \" Diamond.width[2]=6.0;Diamond.width[0]=0.01;Diamond.width[1]=0.01;Diamond.position[0]=0.0;Diamond.position[1]=-0.035;Diamond.position[2]=0.41\" \
83- --include-qc --include-analysis"
88+ --include-local- qc --include-analysis"
8489
8590remainingargs=" ${remainingargs} -e ${SIMENGINE} -j ${NWORKERS} "
8691remainingargs=" ${remainingargs} -productionTag ${ALIEN_JDL_LPMPRODUCTIONTAG:- alibi_anchorTest_tmp} "
8792remainingargs=" ${remainingargs} --anchor-config config-json.json"
93+
94+ echo " baseargs: ${baseargs} "
95+ echo " remainingargs: ${remainingargs} "
8896
8997${O2DPG_ROOT} /MC/bin/o2dpg_sim_workflow_anchored.py ${baseargs} -- ${remainingargs}
9098# -- RUN THE MC WORKLOAD TO PRODUCE AOD --
@@ -99,7 +107,7 @@ if [ "${MCRC}" = "0" ]; then
99107 [ ${ALIBI_EXECUTOR_FRAMEWORK} ] && copy_ALIEN " *AO2D*"
100108
101109 # do QC tasks
102- if [[ " ${remainingargs} " == * " --include-qc" * ]]; then
110+ if [[ " ${remainingargs} " == * " --include-local- qc" * ]]; then
103111 echo " Doing QC"
104112 ${O2DPG_ROOT} /MC/bin/o2_dpg_workflow_runner.py -f workflow.json --target-labels QC --cpu-limit ${ALIEN_JDL_CPULIMIT:- 8}
105113 RC=$?
@@ -124,6 +132,14 @@ if [ ${ALIBI_EXECUTOR_FRAMEWORK} ]; then
124132 copy_ALIEN mcarchive.tar.gz
125133fi
126134
135+ #
136+ # full logs tar-ed for output, regardless the error code or validation - to catch also QC logs...
137+ #
138+ if [[ -n " $ALIEN_PROC_ID " ]]; then
139+ find ./ \( -name " *.log*" -o -name " *mergerlog*" -o -name " *serverlog*" -o -name " *workerlog*" \) | tar -czvf debug_log_archive.tgz -T -
140+ # find ./ \( -name "*.log*" -o -name "*mergerlog*" -o -name "*serverlog*" -o -name "*workerlog*" \) | tar cfJ debug_log_archive.xz -T -
141+ fi
142+
127143unset FAIRMQ_IPC_PREFIX
128144
129145return ${MCRC} 2> /dev/null || exit ${MCRC}
0 commit comments