Skip to content

Commit 27bd92b

Browse files
committed
Account that MEAN_IR_FOR_TPC may be float, add MEAN_IR_REF_FOR_TPC
1 parent 2ade006 commit 27bd92b

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

DATA/production/configurations/asyncReco/setenv_extra.sh

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
369369
elif [[ $BEAMTYPE == "pp" ]] ; then
370370
export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[0]=78;tpcitsMatch.askMinTPCRow[1]=78;tpcitsMatch.askMinTPCRow[2]=78;tpcitsMatch.askMinTPCRow[3]=78;tpcitsMatch.askMinTPCRow[4]=78;tpcitsMatch.askMinTPCRow[5]=78;tpcitsMatch.askMinTPCRow[6]=78;tpcitsMatch.askMinTPCRow[7]=78;tpcitsMatch.askMinTPCRow[8]=78;tpcitsMatch.askMinTPCRow[9]=78;tpcitsMatch.askMinTPCRow[10]=78;tpcitsMatch.askMinTPCRow[11]=78;tpcitsMatch.askMinTPCRow[12]=78;tpcitsMatch.askMinTPCRow[13]=78;tpcitsMatch.askMinTPCRow[14]=78;tpcitsMatch.askMinTPCRow[15]=78;tpcitsMatch.askMinTPCRow[16]=78;tpcitsMatch.askMinTPCRow[17]=78;tpcitsMatch.askMinTPCRow[18]=78;tpcitsMatch.askMinTPCRow[19]=78;tpcitsMatch.askMinTPCRow[20]=78;tpcitsMatch.askMinTPCRow[21]=78;tpcitsMatch.askMinTPCRow[22]=78;tpcitsMatch.askMinTPCRow[23]=78;tpcitsMatch.askMinTPCRow[24]=78;tpcitsMatch.askMinTPCRow[25]=78;tpcitsMatch.askMinTPCRow[26]=78;tpcitsMatch.askMinTPCRow[27]=78;tpcitsMatch.askMinTPCRow[28]=78;tpcitsMatch.askMinTPCRow[29]=78;tpcitsMatch.askMinTPCRow[30]=78;tpcitsMatch.askMinTPCRow[31]=78;tpcitsMatch.askMinTPCRow[32]=78;tpcitsMatch.askMinTPCRow[33]=78;tpcitsMatch.askMinTPCRow[34]=78;tpcitsMatch.askMinTPCRow[35]=78;"
371371
fi
372-
373-
372+
373+
374374
# settings to improve inner pad-rows contribution
375375
export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+=";GPU_rec_tpc.trackletMinSharedNormFactor=1.;GPU_rec_tpc.trackletMaxSharedFraction=0.3;GPU_rec_tpc.rejectIFCLowRadiusCluster=1;"
376376
if grep extrapolationTrackingRowRange $O2_ROOT/include/GPU/GPUSettingsList.h &> /dev/null ; then
@@ -395,14 +395,14 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
395395
CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_proc.tpcUseOldCPUDecoding=1;GPU_proc.tpcApplyClusterFilterOnCPU=$ALIEN_JDL_TPCCLUSTERFILTER;"
396396
fi
397397

398-
if [[ -n "$ALIEN_JDL_TPCCHICUTOPT" ]]; then # 0 or 1 to disable or enable (default) the chi2 cut both on one-side and smoothed Kalman chi2
398+
if [[ -n "$ALIEN_JDL_TPCCHICUTOPT" ]]; then # 0 or 1 to disable or enable (default) the chi2 cut both on one-side and smoothed Kalman chi2
399399
CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_rec_tpc.mergerInterpolateRejectAlsoOnCurrentPosition=$ALIEN_JDL_TPCCHICUTOPT;"
400400
fi
401401

402402
if [[ -n "$ALIEN_JDL_TPCCLUSEDGEREDEF" ]]; then # if >0 (float) undo the edge cluster bit for TPC clusters with distance to the edge exceeding this value
403403
CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+="GPU_rec_tpc.clustersEdgeFixDistance=$ALIEN_JDL_TPCCLUSEDGEREDEF;"
404404
fi
405-
405+
406406
#-------------------------------------- TPC corrections -----------------------------------------------
407407
# we need to provide to TPC
408408
# 1) interaction rate info (lumi) used for scaling or errors and possible of the corrections : INST_IR_FOR_TPC
@@ -412,6 +412,8 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
412412
TPC_SCALING_SOURCE=${ALIEN_JDL_TPCSCALINGSOURCE-IDCCCDB}
413413
# MEAN_IR_FOR_TPC allows (1) to alter the map mean IR if >0 or (2) disable all corrections if <0
414414
MEAN_IR_FOR_TPC=${ALIEN_JDL_MEANIRFORTPC-}
415+
# optional mean IR to impose for the ref. map
416+
MEAN_IR_REF_FOR_TPC=${ALIEN_JDL_MEANIRREFFORTPC-}
415417

416418
if [[ $ALIEN_JDL_LPMANCHORYEAR == "2022" ]]; then
417419
INST_IR_FOR_TPC=${ALIEN_JDL_INSTIRFORTPC-CTPCCDB} # by default override inst.IR by the mean IR from CCDB and use it for scaling
@@ -431,10 +433,10 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
431433
[[ -n "$ALIEN_JDL_MSHAPECORRECTION" && $ALIEN_JDL_MSHAPECORRECTION == "0" ]] && ENABLE_MSHAPE=0 || ENABLE_MSHAPE=1
432434

433435
if [[ -n $MEAN_IR_FOR_TPC ]] ; then # firs check if corrections were not disabled via MEAN_IR_FOR_TPC
434-
if [[ $MEAN_IR_FOR_TPC -gt 0 ]] ; then # positive value overrides map mean lumi
435-
echo "Applying externally provided map mean IR for scaling, $MEAN_IR_FOR_TPC Hz"
436+
if (( $(echo "$MEAN_IR_FOR_TPC > 0" | bc -l) )) ; then # positive value overrides map mean lumi
437+
echo "Applying externally provided map mean IR for scaling, $MEAN_IR_FOR_TPC"
436438
export TPC_CORR_SCALING+=";TPCCorrMap.lumiMean=$MEAN_IR_FOR_TPC;" # take mean lumy at face value
437-
elif [[ $MEAN_IR_FOR_TPC -lt 0 ]] ; then # negative mean lumi disables all corrections
439+
elif (( $(echo "$MEAN_IR_FOR_TPC < 0" | bc -l) )) ; then # negative mean lumi disables all corrections
438440
echo "Negative MEAN_IR_FOR_TPC -> all TPC corrections will be ignored"
439441
export TPC_CORR_SCALING+=" --lumi-type 0 "
440442
export TPC_CORR_SCALING+=";TPCCorrMap.lumiMean=$MEAN_IR_FOR_TPC;"
@@ -446,8 +448,14 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
446448
fi
447449
fi # MEAN_IR_FOR_TPC overridden
448450

451+
if [[ -n $MEAN_IR_REF_FOR_TPC ]] ; then
452+
echo "Applying externally provided map mean reference map IR, $MEAN_IR_REF_FOR_TPC"
453+
export TPC_CORR_SCALING+=";TPCCorrMap.lumiMeanRef=$MEAN_IR_REF_FOR_TPC"
454+
fi
455+
456+
449457
# set IR for TPC, even if it is not used for corrections scaling
450-
if [[ $INST_IR_FOR_TPC -gt 0 ]]; then # externally imposed CTP IR
458+
if (( $(echo "$INST_IR_FOR_TPC > 0" | bc -l) )) ; then # externally imposed CTP IR
451459
echo "Applying externally provided istantaneous IR $INST_IR_FOR_TPC Hz"
452460
export TPC_CORR_SCALING+=";TPCCorrMap.lumiInst=$INST_IR_FOR_TPC"
453461
elif [[ $INST_IR_FOR_TPC == "CTP" ]]; then

0 commit comments

Comments
 (0)