@@ -677,14 +677,6 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True):
677677# We download some binary files, necessary for processing
678678# Eventually, these files/objects should be queried directly from within these tasks?
679679
680- # We download trivial TPC space charge corrections to be applied during
681- # reco. This is necessary to have consistency (decalibration and calibration) between digitization and reconstruction ... until digitization can
682- # also apply this effect via CCDB.
683- TPC_SPACECHARGE_DOWNLOADER_TASK = createTask (name = 'tpc_spacecharge_downloader' , cpu = '0' )
684- 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} ; ' \
685- '${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} ; }'
686- workflow ['stages' ].append (TPC_SPACECHARGE_DOWNLOADER_TASK )
687-
688680# Fix (residual) geometry alignment for simulation stage
689681# Detectors that prefer to apply special alignments (for example residual effects) should be listed here and download these files.
690682# These object will take precedence over ordinary align objects **and** will only be applied in transport simulation
@@ -972,7 +964,7 @@ def putConfigValues(listOfMainKeys=[], localCF = {}):
972964 CTPSCALER = args .ctp_scaler
973965 tpcDistortionType = args .tpc_distortion_type
974966 print (f"TPC distortion simulation: type = { tpcDistortionType } , CTP scaler value { CTPSCALER } " );
975- tpcdigineeds = [ContextTask ['name' ], LinkGRPFileTask ['name' ], TPC_SPACECHARGE_DOWNLOADER_TASK [ 'name' ] ]
967+ tpcdigineeds = [ContextTask ['name' ], LinkGRPFileTask ['name' ]]
976968 if usebkgcache :
977969 tpcdigineeds += [ BKG_HITDOWNLOADER_TASKS ['TPC' ]['name' ] ]
978970
@@ -1581,7 +1573,7 @@ def getDigiTaskName(det):
15811573 "--disable-mc" if args .no_mc_labels else "" ,
15821574 "--enable-truncation 0" if environ .get ("O2DPG_AOD_NOTRUNCATE" ) or environ .get ("ALIEN_JDL_O2DPG_AOD_NOTRUNCATE" ) else "" ,
15831575 "--disable-strangeness-tracker" if args .no_strangeness_tracking else "" ,
1584- f"--aod-timeframe-id ${ ALIEN_PROC_ID } { aod_df_id } " if not args .run_anchored else "" ,
1576+ f"--aod-timeframe-id ${{ ALIEN_PROC_ID} }{ aod_df_id } " if not args .run_anchored else "" ,
15851577 ])
15861578 workflow ['stages' ].append (AODtask )
15871579
0 commit comments