@@ -557,7 +557,6 @@ def createRestDigiTask(name, det='ALLSMALLER'):
557557 # -----------
558558 tpcreconeeds = []
559559 if not args .combine_tpc_clusterization :
560- # TODO: check value for MaxTimeBin; A large value had to be set tmp in order to avoid crashes based on "exceeding timeframe limit"
561560 # We treat TPC clusterization in multiple (sector) steps in order to stay within the memory limit
562561 # We seem to be needing to ask for 2 sectors at least, otherwise there is a problem with the branch naming.
563562 tpcclustertasks = []
@@ -567,7 +566,7 @@ def createRestDigiTask(name, det='ALLSMALLER'):
567566 tpcclustertasks .append (taskname )
568567 tpcclussect = createTask (name = taskname , needs = [TPCDigitask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '2' , mem = '8000' )
569568 tpcclussect ['cmd' ] = 'o2-tpc-chunkeddigit-merger --tpc-sectors ' + str (s )+ '-' + str (s + sectorpertask - 1 ) + ' --tpc-lanes ' + str (NWORKERS )
570- tpcclussect ['cmd' ] += ' | o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True ) + ' --input-type digitizer --output-type clusters,send-clusters-per-sector --outfile tpc-native-clusters-part' + str ((int )(s / sectorpertask )) + '.root --tpc-sectors ' + str (s )+ '-' + str (s + sectorpertask - 1 ) + ' ' + putConfigValues ({"GPU_global.continuousMaxTimeBin" : 100000 , " GPU_proc.ompThreads" : 4 })
569+ tpcclussect ['cmd' ] += ' | o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True ) + ' --input-type digitizer --output-type clusters,send-clusters-per-sector --outfile tpc-native-clusters-part' + str ((int )(s / sectorpertask )) + '.root --tpc-sectors ' + str (s )+ '-' + str (s + sectorpertask - 1 ) + ' ' + putConfigValues ({"GPU_proc.ompThreads" : 4 })
571570 tpcclussect ['env' ] = { "OMP_NUM_THREADS" : "4" , "SHMSIZE" : "5000000000" }
572571 workflow ['stages' ].append (tpcclussect )
573572
@@ -578,12 +577,12 @@ def createRestDigiTask(name, det='ALLSMALLER'):
578577 else :
579578 tpcclus = createTask (name = 'tpccluster_' + str (tf ), needs = [TPCDigitask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = NWORKERS , mem = '2000' )
580579 tpcclus ['cmd' ] = 'o2-tpc-chunkeddigit-merger --tpc-lanes ' + str (NWORKERS )
581- tpcclus ['cmd' ] += ' | o2-tpc-reco-workflow ' + getDPL_global_options () + ' --input-type digitizer --output-type clusters,send-clusters-per-sector ' + putConfigValues ({"GPU_global.continuousMaxTimeBin" : 100000 , " GPU_proc.ompThreads" : 1 })
580+ tpcclus ['cmd' ] += ' | o2-tpc-reco-workflow ' + getDPL_global_options () + ' --input-type digitizer --output-type clusters,send-clusters-per-sector ' + putConfigValues ({"GPU_proc.ompThreads" : 1 })
582581 workflow ['stages' ].append (tpcclus )
583582 tpcreconeeds .append (tpcclus ['name' ])
584583
585584 TPCRECOtask = createTask (name = 'tpcreco_' + str (tf ), needs = tpcreconeeds , tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], relative_cpu = 3 / 8 , mem = '16000' )
586- TPCRECOtask ['cmd' ] = 'o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True ) + ' --input-type clusters --output-type tracks,send-clusters-per-sector ' + putConfigValues ({"GPU_global.continuousMaxTimeBin" : 100000 , " GPU_proc.ompThreads" :NWORKERS , "GPU_rec.maxTrackQPt" :Q2PTCUTOFF })
585+ TPCRECOtask ['cmd' ] = 'o2-tpc-reco-workflow ' + getDPL_global_options (bigshm = True ) + ' --input-type clusters --output-type tracks,send-clusters-per-sector ' + putConfigValues ({"GPU_proc.ompThreads" :NWORKERS , "GPU_rec.maxTrackQPt" :Q2PTCUTOFF })
587586 workflow ['stages' ].append (TPCRECOtask )
588587
589588 ITSConfig = {"ITSClustererParam.dictFilePath" :"../" }
0 commit comments