Skip to content

Improvement for --skipModules/--skipReadout #2196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawenzel merged 1 commit into from
Dec 2, 2025
Merged

Improvement for --skipModules/--skipReadout #2196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 17 additions & 15 deletions MC/bin/o2dpg_sim_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
'for given interaction rate; '
'pass this to avoid that')
parser.add_argument('--skipModules',nargs="*", help="List of modules to skip in geometry budget (and therefore processing)", default=["ZDC"])
parser.add_argument('--skipReadout',nargs="*", help="List of modules to take out from readout", default=[""])
parser.add_argument('--with-ZDC', action='store_true', help='Enable ZDC in workflow')
parser.add_argument('-seed',help='random seed number', default=None)
parser.add_argument('-o',help='output workflow file', default='workflow.json')
Expand Down Expand Up @@ -257,6 +258,19 @@ def load_external_config(configfile):
print(f"INFO: Written additional config key parameters to JSON {config_key_param_path}")
json.dump(anchorConfig, f, indent=2)

# Processing skipped material budget (modules):
# - If user did NOT specify --with-ZDC
# - AND ZDC is not already in the list
# --> append ZDC automatically
if args.with_ZDC:
# User wants ZDC to *not* be skipped → ensure it's removed
args.skipModules = [m for m in args.skipModules if m != "ZDC"]
else:
# If user did not request --with-ZDC,
# auto-append ZDC unless already present
if "ZDC" not in args.skipModules:
args.skipModules.append("ZDC")

# with this we can tailor the workflow to the presence of
# certain detectors
# these are all detectors that should be assumed active
Expand All @@ -267,14 +281,14 @@ def load_external_config(configfile):
# if "all" here, there was in fact nothing in the anchored script, set to what is passed to this script (which it either also "all" or a subset)
activeDetectors = readout_detectors
elif readout_detectors != 'all' and activeDetectors != 'all':
# in this case both are comma-seperated lists. Take intersection
# in this case both are comma-separated lists. Take intersection
r = set(readout_detectors.split(','))
a = set(activeDetectors.split(','))
activeDetectors = ','.join(r & a)
# the last case: simply take what comes from the anchored config

# convert to set/hashmap
activeDetectors = { det:1 for det in activeDetectors.split(',') }
activeDetectors = { det:1 for det in activeDetectors.split(',') if det not in args.skipModules and det not in args.skipReadout}
for det in activeDetectors:
activate_detector(det)

Expand Down Expand Up @@ -409,18 +423,6 @@ def extractVertexArgs(configKeyValuesStr, finalDiamondDict):
NTIMEFRAMES=int(args.tf)
NWORKERS=args.n_workers

# Processing skipped material budget (modules):
# - If user did NOT specify --with-ZDC
# - AND ZDC is not already in the list
# --> append ZDC automatically
if args.with_ZDC:
# User wants ZDC to *not* be skipped → ensure it's removed
args.skipModules = [m for m in args.skipModules if m != "ZDC"]
else:
# If user did not request --with-ZDC,
# auto-append ZDC unless already present
if "ZDC" not in args.skipModules:
args.skipModules.append("ZDC")

SKIPMODULES = " ".join(["--skipModules"] + args.skipModules) if len(args.skipModules) > 0 else ""
SIMENGINE=args.e
Expand Down Expand Up @@ -1443,7 +1445,7 @@ def getDigiTaskName(det):
TPCRECOtask['name'],
ITSTPCMATCHtask['name'],
TRDTRACKINGtask2['name'] if isActive("TRD") else None]
toftracksrcdefault = dpl_option_from_config(anchorConfig, 'o2-tof-matcher-workflow', '--track-sources', default_value='TPC,ITS-TPC,TPC-TRD,ITS-TPC-TRD')
toftracksrcdefault = cleanDetectorInputList(dpl_option_from_config(anchorConfig, 'o2-tof-matcher-workflow', '--track-sources', default_value='TPC,ITS-TPC,TPC-TRD,ITS-TPC-TRD'))
tofusefit = option_if_available('o2-tof-matcher-workflow', '--use-fit', envfile=async_envfile)
TOFTPCMATCHERtask = createTask(name='toftpcmatch_'+str(tf), needs=toftpcmatchneeds, tf=tf, cwd=timeframeworkdir, lab=["RECO"], mem='1000')
tofmatcher_cmd_parts = [
Expand Down