Skip to content

Commit 0ed0a86

Browse files
committed
anchoredMC: treat case of disabled TOF detector
1 parent 40a2866 commit 0ed0a86

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

MC/bin/o2dpg_sim_workflow.py

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,8 @@ def getDigiTaskName(det):
13301330
putConfigValues(),
13311331
('',' --disable-mc')[args.no_mc_labels]
13321332
])
1333-
workflow['stages'].append(TOFRECOtask)
1333+
if isActive('TOF'):
1334+
workflow['stages'].append(TOFRECOtask)
13341335

13351336
#<--------- TOF-TPC(-ITS) global track matcher workflow
13361337
toftpcmatchneeds = [TOFRECOtask['name'], TPCRECOtask['name'], ITSTPCMATCHtask['name'], TRDTRACKINGtask2['name']]
@@ -1355,7 +1356,8 @@ def getDigiTaskName(det):
13551356
tpc_corr_options_mc
13561357
]
13571358
TOFTPCMATCHERtask['cmd'] = task_finalizer(tofmatcher_cmd_parts)
1358-
workflow['stages'].append(TOFTPCMATCHERtask)
1359+
if isActive('TOF'):
1360+
workflow['stages'].append(TOFTPCMATCHERtask)
13591361

13601362
# MFT reco: needing access to kinematics (when assessment enabled)
13611363
mftreconeeds = [getDigiTaskName("MFT")]
@@ -1524,7 +1526,11 @@ def getDigiTaskName(det):
15241526
workflow['stages'].append(HMPRECOtask)
15251527

15261528
#<--------- HMP forward matching
1527-
hmpmatchneeds = [HMPRECOtask['name'], ITSTPCMATCHtask['name'], TOFTPCMATCHERtask['name'], TRDTRACKINGtask2['name']]
1529+
hmpmatchneeds = [HMPRECOtask['name'],
1530+
ITSTPCMATCHtask['name'],
1531+
TOFTPCMATCHERtask['name'] if isActive("TOF") else None,
1532+
TRDTRACKINGtask2['name']]
1533+
hmpmatchneeds = [ n for n in hmpmatchneeds if n != None ]
15281534
hmp_match_sources = cleanDetectorInputList(dpl_option_from_config(anchorConfig, 'o2-hmpid-matcher-workflow', 'track-sources', default_value='ITS-TPC,ITS-TPC-TRD,TPC-TRD'))
15291535
HMPMATCHtask = createTask(name='hmpmatch_'+str(tf), needs=hmpmatchneeds, tf=tf, cwd=timeframeworkdir, lab=["RECO"], mem='1000')
15301536
HMPMATCHtask['cmd'] = task_finalizer(
@@ -1559,7 +1565,7 @@ def getDigiTaskName(det):
15591565
HMPMATCHtask['name'],
15601566
HMPMATCHtask['name'],
15611567
ITSTPCMATCHtask['name'],
1562-
TOFTPCMATCHERtask['name'],
1568+
TOFTPCMATCHERtask['name'] if isActive("TOF") else None,
15631569
MFTMCHMATCHtask['name'],
15641570
MCHMIDMATCHtask['name']]
15651571
pvfinderneeds = [ p for p in pvfinderneeds if p != None ]
@@ -1792,11 +1798,12 @@ def remove_json_prefix(path):
17921798
configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/trd-tracking-task.json')
17931799

17941800
### TOF
1795-
addQCPerTF(taskName='tofDigitsQC',
1796-
needs=[getDigiTaskName("TOF")],
1797-
readerCommand='${O2_ROOT}/bin/o2-tof-reco-workflow --delay-1st-tf 3 --input-type digits --output-type none',
1798-
configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/tofdigits.json',
1799-
objectsFile='tofDigitsQC.root')
1801+
if isActive('TOF'):
1802+
addQCPerTF(taskName='tofDigitsQC',
1803+
needs=[getDigiTaskName("TOF")],
1804+
readerCommand='${O2_ROOT}/bin/o2-tof-reco-workflow --delay-1st-tf 3 --input-type digits --output-type none',
1805+
configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/tofdigits.json',
1806+
objectsFile='tofDigitsQC.root')
18001807

18011808
# depending if TRD and FT0 are available
18021809
if isActive('FT0') and isActive('TRD'):

MC/bin/o2dpg_workflow_utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ def dump_workflow(workflow, filename, meta=None):
172172
s['cmd'] = '. ' + taskwrapper_string + ' ' + s['name']+'.log \'' + s['cmd'] + '\''
173173
# remove unnecessary whitespaces for better readibility
174174
s['cmd'] = trimString(s['cmd'])
175+
# remove None entries from needs list
176+
s['needs'] = [ n for n in s['needs'] if n != None ]
177+
175178
# make the final dict to be dumped
176179
to_dump = {"stages": to_dump}
177180
filename = make_workflow_filename(filename)

0 commit comments

Comments
 (0)