From 16f8275a1871cbf258f4d87999f2a3c5bad898e4 Mon Sep 17 00:00:00 2001 From: swenzel Date: Mon, 5 Feb 2024 16:51:39 +0100 Subject: [PATCH 1/2] Override MCH/MID alignment objects for sim Prefetch some special alignment objects for MCH/MID (in place of ordinary DET/Calib/Align and use them for simulation/digitization) related to https://its.cern.ch/jira/browse/O2-4622 --- MC/bin/o2dpg_sim_workflow.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index 70dcafb71..357086c86 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -506,6 +506,16 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True): '${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 +# and digitization (Det/Calib/Align is only read in simulation since reconstruction tasks use GLO/Config/AlignedGeometry automatically). +SIM_ALIGNMENT_PREFETCH_TASK = createTask(name='sim_alignment', cpu='0') +SIM_ALIGNMENT_PREFETCH_TASK['cmd'] = '${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p MID/MisCalib/Align --timestamp ' + args.timestamp + ' --created-not-after ' \ + + str(args.condition_not_after) + ' -d ${ALICEO2_CCDB_LOCALCACHE}/MID/Calib/Align --no-preserve-path ; ' +SIM_ALIGNMENT_PREFETCH_TASK['cmd'] += '${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p MCH/MisCalib/Align --timestamp ' + args.timestamp + ' --created-not-after ' \ + + str(args.condition_not_after) + ' -d ${ALICEO2_CCDB_LOCALCACHE}/MCH/Calib/Align --no-preserve-path ' +workflow['stages'].append(SIM_ALIGNMENT_PREFETCH_TASK) # query initial configKey args for signal transport; mainly used to setup generators simInitialConfigKeys = create_geant_config(args, args.confKey) From aba28b52cf292c2df9dd5a160db429ddba9655b0 Mon Sep 17 00:00:00 2001 From: Sandro Wenzel Date: Mon, 13 May 2024 15:06:48 +0200 Subject: [PATCH 2/2] fixup --- MC/bin/o2dpg_sim_workflow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MC/bin/o2dpg_sim_workflow.py b/MC/bin/o2dpg_sim_workflow.py index 196740742..a8bd215a5 100755 --- a/MC/bin/o2dpg_sim_workflow.py +++ b/MC/bin/o2dpg_sim_workflow.py @@ -528,9 +528,9 @@ def getDPL_global_options(bigshm=False, ccdbbackend=True): # These object will take precedence over ordinary align objects **and** will only be applied in transport simulation # and digitization (Det/Calib/Align is only read in simulation since reconstruction tasks use GLO/Config/AlignedGeometry automatically). SIM_ALIGNMENT_PREFETCH_TASK = createTask(name='sim_alignment', cpu='0') -SIM_ALIGNMENT_PREFETCH_TASK['cmd'] = '${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p MID/MisCalib/Align --timestamp ' + args.timestamp + ' --created-not-after ' \ +SIM_ALIGNMENT_PREFETCH_TASK['cmd'] = '${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p MID/MisCalib/Align --timestamp ' + str(args.timestamp) + ' --created-not-after ' \ + str(args.condition_not_after) + ' -d ${ALICEO2_CCDB_LOCALCACHE}/MID/Calib/Align --no-preserve-path ; ' -SIM_ALIGNMENT_PREFETCH_TASK['cmd'] += '${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p MCH/MisCalib/Align --timestamp ' + args.timestamp + ' --created-not-after ' \ +SIM_ALIGNMENT_PREFETCH_TASK['cmd'] += '${O2_ROOT}/bin/o2-ccdb-downloadccdbfile --host http://alice-ccdb.cern.ch -p MCH/MisCalib/Align --timestamp ' + str(args.timestamp) + ' --created-not-after ' \ + str(args.condition_not_after) + ' -d ${ALICEO2_CCDB_LOCALCACHE}/MCH/Calib/Align --no-preserve-path ' workflow['stages'].append(SIM_ALIGNMENT_PREFETCH_TASK)