Skip to content

Commit d8b1e40

Browse files
committed
Change default option for strangeness tracking; Adjust threads for svfinder
* change the default to no strangeness tracking (not validated and very slow) * adjust threads for secondary vertex finder to 8 since it can make use of this
1 parent 0d93a48 commit d8b1e40

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

MC/bin/o2dpg_sim_workflow.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
parser.add_argument('--no-combine-dpl-devices', action='store_true', help=argparse.SUPPRESS)
109109
parser.add_argument('--no-mc-labels', action='store_true', default=False, help=argparse.SUPPRESS)
110110
parser.add_argument('--no-tpc-digitchunking', action='store_true', help=argparse.SUPPRESS)
111-
parser.add_argument('--no-strangeness-tracking', action='store_true', help=argparse.SUPPRESS)
111+
parser.add_argument('--with-strangeness-tracking', action='store_true', default=False, help="Enable strangeness tracking")
112112
parser.add_argument('--combine-tpc-clusterization', action='store_true', help=argparse.SUPPRESS) #<--- useful for small productions (pp, low interaction rate, small number of events)
113113
parser.add_argument('--first-orbit', default=0, type=int, help=argparse.SUPPRESS) # to set the first orbit number of the run for HBFUtils (only used when anchoring)
114114
# (consider doing this rather in O2 digitization code directly)
@@ -1275,8 +1275,8 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
12751275
svfinder_threads = ' --threads 1 '
12761276
svfinder_cpu = 1
12771277
if COLTYPE == "PbPb" or (doembedding and COLTYPEBKG == "PbPb"):
1278-
svfinder_threads = ' --threads 3 '
1279-
svfinder_cpu = 3
1278+
svfinder_threads = ' --threads 8 '
1279+
svfinder_cpu = 8
12801280
SVFINDERtask = createTask(name='svfinder_'+str(tf), needs=[PVFINDERtask['name']], tf=tf, cwd=timeframeworkdir, lab=["RECO"], cpu=svfinder_cpu, mem='5000')
12811281
SVFINDERtask['cmd'] = '${O2_ROOT}/bin/o2-secondary-vertexing-workflow '
12821282
SVFINDERtask['cmd'] += getDPL_global_options(bigshm=True) + svfinder_threads + putConfigValuesNew(['svertexer'], {"NameConf.mDirMatLUT" : ".."})
@@ -1288,7 +1288,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
12881288
svfinder_sources += ",MID"
12891289
SVFINDERtask['cmd'] += ' --vertexing-sources ' + svfinder_sources + (' --combine-source-devices','')[args.no_combine_dpl_devices]
12901290
# strangeness tracking is now called from the secondary vertexer
1291-
if args.no_strangeness_tracking:
1291+
if not args.with_strangeness_tracking:
12921292
SVFINDERtask['cmd'] += ' --disable-strangeness-tracker'
12931293
# if enabled, it may require MC labels
12941294
else:
@@ -1356,7 +1356,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
13561356
if environ.get('O2DPG_AOD_NOTRUNCATE') != None or environ.get('ALIEN_JDL_O2DPG_AOD_NOTRUNCATE') != None:
13571357
AODtask['cmd'] += ' --enable-truncation 0' # developer option to suppress precision truncation
13581358

1359-
if args.no_strangeness_tracking:
1359+
if not args.with_strangeness_tracking:
13601360
AODtask['cmd'] += ' --disable-strangeness-tracking'
13611361

13621362
workflow['stages'].append(AODtask)

0 commit comments

Comments
 (0)