Skip to content

Commit 12c55e2

Browse files
committed
Add backward-compatibility
1 parent c9da131 commit 12c55e2

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

DATA/production/configurations/asyncReco/setenv_extra.sh

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [[ $RUNNUMBER -lt 544772 ]]; then
2121
# these runs were using external dictionaries
2222
: ${RANS_OPT:="--ans-version compat"}
2323
export RANS_OPT
24-
fi
24+
fi
2525
echo "RSRUNNUMBER = $RUNNUMBER RANS_OPT = $RANS_OPT"
2626

2727
# IR, duration, B field, detector list
@@ -341,8 +341,13 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
341341
[[ $APPLYS11 == 1 ]] && export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[11]=78;" || export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[11]=20;"
342342
fi
343343
# settings to improve inner pad-rows contribution
344-
export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+=";GPU_rec_tpc.trackletMinSharedNormFactor=1.;GPU_rec_tpc.trackletMaxSharedFraction=0.3;GPU_rec_tpc.extrapolationTrackingRowRange=100;GPU_rec_tpc.rejectIFCLowRadiusCluster=1;"
345-
344+
export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+=";GPU_rec_tpc.trackletMinSharedNormFactor=1.;GPU_rec_tpc.trackletMaxSharedFraction=0.3;GPU_rec_tpc.rejectIFCLowRadiusCluster=1;"
345+
if grep extrapolationTrackingRowRange $O2_ROOT/include/GPU/GPUSettingsList.h &> /dev/null ; then
346+
export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_rec_tpc.globalTrackingRowRange=100;"
347+
else
348+
export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_rec_tpc.globalTrackingRowRange=100;"
349+
fi
350+
346351
#-------------------------------------- TPC corrections -----------------------------------------------
347352
# we need to provide to TPC
348353
# 1) interaction rate info (lumi) used for scaling or errors and possible of the corrections : INST_IR_FOR_TPC
@@ -369,7 +374,7 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
369374

370375
DISABLE_CORRECTIONS=
371376
[[ -n "$ALIEN_JDL_MSHAPECORRECTION" && $ALIEN_JDL_MSHAPECORRECTION == "0" ]] && ENABLE_MSHAPE=0 || ENABLE_MSHAPE=1
372-
377+
373378
if [[ -n $MEAN_IR_FOR_TPC ]] ; then # firs check if corrections were not disabled via MEAN_IR_FOR_TPC
374379
if [[ $MEAN_IR_FOR_TPC -gt 0 ]] ; then # positive value overrides map mean lumi
375380
echo "Applying externally provided map mean IR for scaling, $MEAN_IR_FOR_TPC Hz"
@@ -382,7 +387,7 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
382387
DISABLE_CORRECTIONS=1
383388
else
384389
echo "Did not recognize MEAN_IR_FOR_TPC = $MEAN_IR_FOR_TPC"
385-
return 1
390+
return 1
386391
fi
387392
fi # MEAN_IR_FOR_TPC overridden
388393

@@ -408,7 +413,7 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
408413
if [[ $TPC_SCALING_SOURCE == "NO_SCALING" ]]; then
409414
echo "NO SCALING is requested: only TPC/Calib/CorrectionMapsV2... will be applied"
410415
export TPC_CORR_SCALING+=" --lumi-type 0 "
411-
elif [[ $TPC_SCALING_SOURCE == "CTP" ]]; then
416+
elif [[ $TPC_SCALING_SOURCE == "CTP" ]]; then
412417
echo "CTP Lumi from data will be used for TPC scaling"
413418
export TPC_CORR_SCALING+=" --lumi-type 1 "
414419
elif [[ $TPC_SCALING_SOURCE == "IDCCCDB" ]]; then
@@ -426,11 +431,11 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
426431
echo "CTP is not in the list of detectors, disabling CTP Lumi input request"
427432
export TPC_CORR_SCALING+=" --disable-ctp-lumi-request "
428433
fi
429-
434+
430435
if [[ $ENABLE_MSHAPE == "1" ]]; then
431436
export TPC_CORR_SCALING+=" --enable-M-shape-correction "
432437
fi
433-
438+
434439
if [[ $ALIEN_JDL_LPMANCHORYEAR -ge 2023 ]] && [[ $BEAMTYPE == "PbPb" ]] ; then
435440
# adding additional cluster errors
436441
# the values below should be squared, but the validation of those values (0.01 and 0.0225) is ongoing

0 commit comments

Comments
 (0)