Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions MC/bin/o2dpg_sim_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,8 @@ def getDigiTaskName(det):
putConfigValues(),
('',' --disable-mc')[args.no_mc_labels]
])
workflow['stages'].append(TOFRECOtask)
if isActive('TOF'):
workflow['stages'].append(TOFRECOtask)

#<--------- TOF-TPC(-ITS) global track matcher workflow
toftpcmatchneeds = [TOFRECOtask['name'], TPCRECOtask['name'], ITSTPCMATCHtask['name'], TRDTRACKINGtask2['name']]
Expand All @@ -1355,7 +1356,8 @@ def getDigiTaskName(det):
tpc_corr_options_mc
]
TOFTPCMATCHERtask['cmd'] = task_finalizer(tofmatcher_cmd_parts)
workflow['stages'].append(TOFTPCMATCHERtask)
if isActive('TOF'):
workflow['stages'].append(TOFTPCMATCHERtask)

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

#<--------- HMP forward matching
hmpmatchneeds = [HMPRECOtask['name'], ITSTPCMATCHtask['name'], TOFTPCMATCHERtask['name'], TRDTRACKINGtask2['name']]
hmpmatchneeds = [HMPRECOtask['name'],
ITSTPCMATCHtask['name'],
TOFTPCMATCHERtask['name'] if isActive("TOF") else None,
TRDTRACKINGtask2['name']]
hmpmatchneeds = [ n for n in hmpmatchneeds if n != None ]
hmp_match_sources = cleanDetectorInputList(dpl_option_from_config(anchorConfig, 'o2-hmpid-matcher-workflow', 'track-sources', default_value='ITS-TPC,ITS-TPC-TRD,TPC-TRD'))
HMPMATCHtask = createTask(name='hmpmatch_'+str(tf), needs=hmpmatchneeds, tf=tf, cwd=timeframeworkdir, lab=["RECO"], mem='1000')
HMPMATCHtask['cmd'] = task_finalizer(
Expand Down Expand Up @@ -1559,7 +1565,7 @@ def getDigiTaskName(det):
HMPMATCHtask['name'],
HMPMATCHtask['name'],
ITSTPCMATCHtask['name'],
TOFTPCMATCHERtask['name'],
TOFTPCMATCHERtask['name'] if isActive("TOF") else None,
MFTMCHMATCHtask['name'],
MCHMIDMATCHtask['name']]
pvfinderneeds = [ p for p in pvfinderneeds if p != None ]
Expand Down Expand Up @@ -1792,11 +1798,12 @@ def remove_json_prefix(path):
configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/trd-tracking-task.json')

### TOF
addQCPerTF(taskName='tofDigitsQC',
needs=[getDigiTaskName("TOF")],
readerCommand='${O2_ROOT}/bin/o2-tof-reco-workflow --delay-1st-tf 3 --input-type digits --output-type none',
configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/tofdigits.json',
objectsFile='tofDigitsQC.root')
if isActive('TOF'):
addQCPerTF(taskName='tofDigitsQC',
needs=[getDigiTaskName("TOF")],
readerCommand='${O2_ROOT}/bin/o2-tof-reco-workflow --delay-1st-tf 3 --input-type digits --output-type none',
configFilePath='json://${O2DPG_ROOT}/MC/config/QC/json/tofdigits.json',
objectsFile='tofDigitsQC.root')

# depending if TRD and FT0 are available
if isActive('FT0') and isActive('TRD'):
Expand Down
3 changes: 3 additions & 0 deletions MC/bin/o2dpg_workflow_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ def dump_workflow(workflow, filename, meta=None):
s['cmd'] = '. ' + taskwrapper_string + ' ' + s['name']+'.log \'' + s['cmd'] + '\''
# remove unnecessary whitespaces for better readibility
s['cmd'] = trimString(s['cmd'])
# remove None entries from needs list
s['needs'] = [ n for n in s['needs'] if n != None ]

# make the final dict to be dumped
to_dump = {"stages": to_dump}
filename = make_workflow_filename(filename)
Expand Down