@@ -179,9 +179,9 @@ def getDPL_global_options(bigshm=False,nosmallrate=False):
179179 tpcdigineeds += [ BKG_HITDOWNLOADER_TASKS ['TPC' ]['name' ] ]
180180
181181 TPCDigitask = createTask (name = 'tpcdigi_' + str (tf ), needs = tpcdigineeds ,
182- tf = tf , cwd = timeframeworkdir , lab = ["DIGI" ], cpu = '8' , mem = '16000 ' )
182+ tf = tf , cwd = timeframeworkdir , lab = ["DIGI" ], cpu = '8' , mem = '9000 ' )
183183 TPCDigitask ['cmd' ] = ('' ,'ln -nfs ../bkg_HitsTPC.root . ;' )[doembedding ]
184- TPCDigitask ['cmd' ] += 'o2-sim-digitizer-workflow ' + getDPL_global_options (bigshm = True ) + ' -n ' + str (args .ns ) + simsoption + ' --onlyDet TPC --interactionRate 50000 --tpc-lanes ' + str (NWORKERS ) + ' --incontext ' + str (CONTEXTFILE )
184+ TPCDigitask ['cmd' ] += 'o2-sim-digitizer-workflow ' + getDPL_global_options () + ' -n ' + str (args .ns ) + simsoption + ' --onlyDet TPC --interactionRate 50000 --tpc-lanes ' + str (NWORKERS ) + ' --incontext ' + str (CONTEXTFILE ) + ' --tpc-chunked-writer'
185185 workflow ['stages' ].append (TPCDigitask )
186186
187187 trddigineeds = [ContextTask ['name' ]]
@@ -231,9 +231,14 @@ def createRestDigiTask(name, det='ALLSMALLER'):
231231 # reco
232232 # -----------
233233
234- # TODO: check value for MaxTimeBin; A large value had to be set tmp in order to avoid crashes bases on "exceeding timeframe limit"
235- TPCRECOtask = createTask (name = 'tpcreco_' + str (tf ), needs = [TPCDigitask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '3' , mem = '16000' )
236- TPCRECOtask ['cmd' ] = 'o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = True ) + ' --tpc-digit-reader "--infile tpcdigits.root" --input-type digits --output-type clusters,tracks,send-clusters-per-sector --configKeyValues "GPU_global.continuousMaxTimeBin=100000;GPU_proc.ompThreads=' + str (NWORKERS )+ '"'
234+ # TODO: check value for MaxTimeBin; A large value had to be set tmp in order to avoid crashes based on "exceeding timeframe limit"
235+ TPCRECOtask1 = createTask (name = 'tpccluster_' + str (tf ), needs = [TPCDigitask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '3' , mem = '16000' )
236+ TPCRECOtask1 ['cmd' ] = 'o2-tpc-chunkeddigit-merger --rate 1 --tpc-lanes ' + str (NWORKERS ) + ' --session ' + str (taskcounter )
237+ TPCRECOtask1 ['cmd' ] += ' | o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True , nosmallrate = True ) + ' --input-type digitizer --output-type clusters,send-clusters-per-sector --configKeyValues "GPU_global.continuousMaxTimeBin=100000;GPU_proc.ompThreads=' + str (NWORKERS )+ '"'
238+ workflow ['stages' ].append (TPCRECOtask1 )
239+
240+ TPCRECOtask = createTask (name = 'tpcreco_' + str (tf ), needs = [TPCRECOtask1 ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '3' , mem = '16000' )
241+ 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 )+ '"'
237242 workflow ['stages' ].append (TPCRECOtask )
238243
239244 ITSRECOtask = createTask (name = 'itsreco_' + str (tf ), needs = [det_to_digitask ["ITS" ]['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '1' , mem = '2000' )
0 commit comments