@@ -99,11 +99,11 @@ def createTask(name='', needs=[], tf=-1, cwd='./', lab=[], cpu=0, mem=0):
9999
100100def getDPL_global_options (bigshm = False ,nosmallrate = False ):
101101 if args .noIPC != None :
102- return "-b --run --no-IPC " + ('--rate 1 ' ,'' )[nosmallrate ]
102+ return "-b --run --no-IPC " + ('--rate 1000 ' ,'' )[nosmallrate ]
103103 if bigshm :
104- return "-b --run --shm-segment-size ${SHMSIZE:-50000000000} --session " + str (taskcounter ) + ' --driver-client-backend ws://' + (' --rate 1 ' ,'' )[nosmallrate ]
104+ return "-b --run --shm-segment-size ${SHMSIZE:-50000000000} --session " + str (taskcounter ) + ' --driver-client-backend ws://' + (' --rate 1000 ' ,'' )[nosmallrate ]
105105 else :
106- return "-b --run --session " + str (taskcounter ) + ' --driver-client-backend ws://' + (' --rate 1 ' ,'' )[nosmallrate ]
106+ return "-b --run --session " + str (taskcounter ) + ' --driver-client-backend ws://' + (' --rate 1000 ' ,'' )[nosmallrate ]
107107
108108doembedding = True if args .embedding == 'True' or args .embedding == True else False
109109usebkgcache = args .use_bkg_from != None
@@ -393,12 +393,12 @@ def createRestDigiTask(name, det='ALLSMALLER'):
393393 # We treat TPC clusterization in multiple (sector) steps in order to stay within the memory limit
394394 TPCCLUStask1 = createTask (name = 'tpcclusterpart1_' + str (tf ), needs = [TPCDigitask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '8' , mem = '16000' )
395395 TPCCLUStask1 ['cmd' ] = 'o2-tpc-chunkeddigit-merger --tpc-sectors 0-17 --rate 1 --tpc-lanes ' + str (NWORKERS ) + ' --session ' + str (taskcounter )
396- TPCCLUStask1 ['cmd' ] += ' | o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = True ) + ' --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 )+ '"'
396+ 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 )+ '"'
397397 workflow ['stages' ].append (TPCCLUStask1 )
398398
399399 TPCCLUStask2 = createTask (name = 'tpcclusterpart2_' + str (tf ), needs = [TPCDigitask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '8' , mem = '16000' )
400400 TPCCLUStask2 ['cmd' ] = 'o2-tpc-chunkeddigit-merger --tpc-sectors 18-35 --rate 1 --tpc-lanes ' + str (NWORKERS ) + ' --session ' + str (taskcounter )
401- TPCCLUStask2 ['cmd' ] += ' | o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = True ) + ' --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 )+ '"'
401+ 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 )+ '"'
402402 workflow ['stages' ].append (TPCCLUStask2 )
403403
404404 # additional file merge step (TODO: generalize to arbitrary number of files)
@@ -407,7 +407,7 @@ def createRestDigiTask(name, det='ALLSMALLER'):
407407 workflow ['stages' ].append (TPCCLUSMERGEtask )
408408
409409 TPCRECOtask = createTask (name = 'tpcreco_' + str (tf ), needs = [TPCCLUSMERGEtask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '3' , mem = '16000' )
410- TPCRECOtask ['cmd' ] = 'o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = True ) + ' --input-type clusters --output-type tracks,send-clusters-per-sector --configKeyValues "GPU_global.continuousMaxTimeBin=100000;GPU_proc.ompThreads=' + str (NWORKERS )+ '"'
410+ TPCRECOtask ['cmd' ] = 'o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = False ) + ' --input-type clusters --output-type tracks,send-clusters-per-sector --configKeyValues "GPU_global.continuousMaxTimeBin=100000;GPU_proc.ompThreads=' + str (NWORKERS )+ '"'
411411 workflow ['stages' ].append (TPCRECOtask )
412412
413413 ITSRECOtask = createTask (name = 'itsreco_' + str (tf ), needs = [det_to_digitask ["ITS" ]['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '1' , mem = '2000' )
@@ -419,23 +419,23 @@ def createRestDigiTask(name, det='ALLSMALLER'):
419419 workflow ['stages' ].append (FT0RECOtask )
420420
421421 ITSTPCMATCHtask = createTask (name = 'itstpcMatch_' + str (tf ), needs = [TPCRECOtask ['name' ], ITSRECOtask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], mem = '8000' , cpu = '3' )
422- ITSTPCMATCHtask ['cmd' ]= 'o2-tpcits-match-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = True ) + ' --tpc-track-reader \" tpctracks.root\" --tpc-native-cluster-reader \" --infile tpc-native-clusters.root\" '
422+ ITSTPCMATCHtask ['cmd' ]= 'o2-tpcits-match-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = False ) + ' --tpc-track-reader \" tpctracks.root\" --tpc-native-cluster-reader \" --infile tpc-native-clusters.root\" '
423423 workflow ['stages' ].append (ITSTPCMATCHtask )
424424
425425 TRDTRACKINGtask = createTask (name = 'trdreco_' + str (tf ), needs = [TRDDigitask ['name' ], ITSTPCMATCHtask ['name' ], TPCRECOtask ['name' ], ITSRECOtask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ])
426426 TRDTRACKINGtask ['cmd' ] = 'echo "would do TRD tracking"' # 'o2-trd-global-tracking'
427427 workflow ['stages' ].append (TRDTRACKINGtask )
428428
429429 TOFRECOtask = createTask (name = 'tofmatch_' + str (tf ), needs = [ITSTPCMATCHtask ['name' ], det_to_digitask ["TOF" ]['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ])
430- TOFRECOtask ['cmd' ] = 'o2-tof-reco-workflow ' + getDPL_global_options (nosmallrate = True )
430+ TOFRECOtask ['cmd' ] = 'o2-tof-reco-workflow ' + getDPL_global_options (nosmallrate = False )
431431 workflow ['stages' ].append (TOFRECOtask )
432432
433433 TOFTPCMATCHERtask = createTask (name = 'toftpcmatch_' + str (tf ), needs = [TOFRECOtask ['name' ], TPCRECOtask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ])
434434 TOFTPCMATCHERtask ['cmd' ] = 'o2-tof-matcher-tpc ' + getDPL_global_options ()
435435 workflow ['stages' ].append (TOFTPCMATCHERtask )
436436
437437 PVFINDERtask = createTask (name = 'pvfinder_' + str (tf ), needs = [ITSTPCMATCHtask ['name' ], FT0RECOtask ['name' ], TOFTPCMATCHERtask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '8' , mem = '4000' )
438- PVFINDERtask ['cmd' ] = 'o2-primary-vertexing-workflow ' + getDPL_global_options (nosmallrate = True )
438+ PVFINDERtask ['cmd' ] = 'o2-primary-vertexing-workflow ' + getDPL_global_options (nosmallrate = False )
439439 workflow ['stages' ].append (PVFINDERtask )
440440
441441 # -----------
0 commit comments