Skip to content

Commit 2c6170d

Browse files
committed
Code Simplification: Not necessary to specify sessions
1 parent feb8500 commit 2c6170d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

MC/bin/o2dpg_sim_workflow.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ def getDPL_global_options(bigshm=False,nosmallrate=False):
103103
if args.noIPC!=None:
104104
return "-b --run --no-IPC " + ('--rate 1000','')[nosmallrate]
105105
if bigshm:
106-
return "-b --run --shm-segment-size ${SHMSIZE:-50000000000} --session " + str(taskcounter) + ' --driver-client-backend ws://' + (' --rate 1000','')[nosmallrate]
106+
return "-b --run --shm-segment-size ${SHMSIZE:-50000000000} --driver-client-backend ws://" + (' --rate 1000','')[nosmallrate]
107107
else:
108-
return "-b --run --session " + str(taskcounter) + ' --driver-client-backend ws://' + (' --rate 1000','')[nosmallrate]
108+
return "-b --run " + ' --driver-client-backend ws://' + (' --rate 1000','')[nosmallrate]
109109

110110
doembedding=True if args.embedding=='True' or args.embedding==True else False
111111
usebkgcache=args.use_bkg_from!=None
@@ -411,12 +411,12 @@ def createRestDigiTask(name, det='ALLSMALLER'):
411411
# TODO: check value for MaxTimeBin; A large value had to be set tmp in order to avoid crashes based on "exceeding timeframe limit"
412412
# We treat TPC clusterization in multiple (sector) steps in order to stay within the memory limit
413413
TPCCLUStask1=createTask(name='tpcclusterpart1_'+str(tf), needs=[TPCDigitask['name']], tf=tf, cwd=timeframeworkdir, lab=["RECO"], cpu='8', mem='16000')
414-
TPCCLUStask1['cmd'] = 'o2-tpc-chunkeddigit-merger --tpc-sectors 0-17 --rate 1 --tpc-lanes ' + str(NWORKERS) + ' --session ' + str(taskcounter)
414+
TPCCLUStask1['cmd'] = 'o2-tpc-chunkeddigit-merger --tpc-sectors 0-17 --rate 1 --tpc-lanes ' + str(NWORKERS)
415415
TPCCLUStask1['cmd'] += ' | o2-tpc-reco-workflow ' + getDPL_global_options(bigshm=True, nosmallrate=False) + ' --input-type digitizer --output-type clusters,send-clusters-per-sector --outfile tpc-native-clusters-part1.root --tpc-sectors 0-17 --configKeyValues "GPU_global.continuousMaxTimeBin=100000;GPU_proc.ompThreads='+str(NWORKERS)+'"'
416416
workflow['stages'].append(TPCCLUStask1)
417417

418418
TPCCLUStask2=createTask(name='tpcclusterpart2_'+str(tf), needs=[TPCDigitask['name']], tf=tf, cwd=timeframeworkdir, lab=["RECO"], cpu='8', mem='16000')
419-
TPCCLUStask2['cmd'] = 'o2-tpc-chunkeddigit-merger --tpc-sectors 18-35 --rate 1 --tpc-lanes ' + str(NWORKERS) + ' --session ' + str(taskcounter)
419+
TPCCLUStask2['cmd'] = 'o2-tpc-chunkeddigit-merger --tpc-sectors 18-35 --rate 1 --tpc-lanes ' + str(NWORKERS)
420420
TPCCLUStask2['cmd'] += ' | o2-tpc-reco-workflow ' + getDPL_global_options(bigshm=True, nosmallrate=False) + ' --input-type digitizer --output-type clusters,send-clusters-per-sector --outfile tpc-native-clusters-part2.root --tpc-sectors 18-35 --configKeyValues "GPU_global.continuousMaxTimeBin=100000;GPU_proc.ompThreads='+str(NWORKERS)+'"'
421421
workflow['stages'].append(TPCCLUStask2)
422422

0 commit comments

Comments
 (0)