From 65b8f5fb69a25d9d30c5272ccdb1a73b076a01ab Mon Sep 17 00:00:00 2001 From: swenzel Date: Sat, 12 Apr 2025 05:42:35 +0200 Subject: [PATCH] Disable outdated tpc_spacecharge_downloader task This task seems no longer needed. --- MC/bin/o2dpg_sim_workflow.py | 10 +--------- MC/run/ANCHOR/anchorMC.sh | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index b559405f6..d0c37e5ec 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -667,14 +667,6 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True): # We download some binary files, necessary for processing # Eventually, these files/objects should be queried directly from within these tasks? -# We download trivial TPC space charge corrections to be applied during -# reco. This is necessary to have consistency (decalibration and calibration) between digitization and reconstruction ... until digitization can -# also apply this effect via CCDB. -TPC_SPACECHARGE_DOWNLOADER_TASK = createTask(name='tpc_spacecharge_downloader', cpu='0') -TPC_SPACECHARGE_DOWNLOADER_TASK['cmd'] = '[ "${O2DPG_ENABLE_TPC_DISTORTIONS}" ] || { ${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p TPC/Calib/CorrectionMapRef --timestamp 1 --created-not-after ' + str(args.condition_not_after) + ' -d ${ALICEO2_CCDB_LOCALCACHE} ; ' \ - '${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p TPC/Calib/CorrectionMap --timestamp 1 --created-not-after ' + str(args.condition_not_after) + ' -d ${ALICEO2_CCDB_LOCALCACHE} ; }' -workflow['stages'].append(TPC_SPACECHARGE_DOWNLOADER_TASK) - # Fix (residual) geometry alignment for simulation stage # Detectors that prefer to apply special alignments (for example residual effects) should be listed here and download these files. # These object will take precedence over ordinary align objects **and** will only be applied in transport simulation @@ -978,7 +970,7 @@ def putConfigValuesNew(listOfMainKeys=[], localCF = {}): CTPSCALER = args.ctp_scaler tpcDistortionType=args.tpc_distortion_type print(f"TPC distortion simulation: type = {tpcDistortionType}, CTP scaler value {CTPSCALER}"); - tpcdigineeds=[ContextTask['name'], LinkGRPFileTask['name'], TPC_SPACECHARGE_DOWNLOADER_TASK['name']] + tpcdigineeds=[ContextTask['name'], LinkGRPFileTask['name']] if usebkgcache: tpcdigineeds += [ BKG_HITDOWNLOADER_TASKS['TPC']['name'] ] diff --git a/MC/run/ANCHOR/anchorMC.sh b/MC/run/ANCHOR/anchorMC.sh index e4a6bf1d9..a8d2ba355 100755 --- a/MC/run/ANCHOR/anchorMC.sh +++ b/MC/run/ANCHOR/anchorMC.sh @@ -126,7 +126,6 @@ echo_info "Substituting ALIEN_JDL_LPMPRODUCTIONTAG=$ALIEN_JDL_LPMPRODUCTIONTAG w ALIEN_JDL_LPMPRODUCTIONTAG=$ALIEN_JDL_LPMANCHORPRODUCTION if [[ $ALIEN_JDL_ANCHOR_SIM_OPTIONS == *"--tpc-distortion-type 2"* ]]; then - export O2DPG_ENABLE_TPC_DISTORTIONS=ON # set the SCALING SOURCE to CTP for MC unless explicitely given from outside export ALIEN_JDL_TPCSCALINGSOURCE=${ALIEN_JDL_TPCSCALINGSOURCE:-"CTP"} fi