@@ -737,13 +737,17 @@ def getDigiTaskName(det):
737737
738738 TRDTRACKINGtask = createTask (name = 'trdreco_' + str (tf ), needs = [TRDDigitask ['name' ], ITSTPCMATCHtask ['name' ], TPCRECOtask ['name' ], ITSRECOtask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '1' , mem = '2000' )
739739 TRDTRACKINGtask ['cmd' ] = '${O2_ROOT}/bin/o2-trd-tracklet-transformer ' + getDPL_global_options () + putConfigValues ()
740- TRDTRACKINGtask ['cmd' ] += ' | ${O2_ROOT}/bin/o2-trd-global-tracking ' + getDPL_global_options (bigshm = True ) \
741- + putConfigValuesNew (['ITSClustererParam' ,
740+ workflow ['stages' ].append (TRDTRACKINGtask )
741+
742+ # FIXME This is so far a workaround to avoud a race condition for trdcalibratedtracklets.root
743+ TRDTRACKINGtask2 = createTask (name = 'trdreco2_' + str (tf ), needs = [TRDTRACKINGtask ['name' ]], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], cpu = '1' , mem = '2000' )
744+ TRDTRACKINGtask2 ['cmd' ] = '${O2_ROOT}/bin/o2-trd-global-tracking ' + getDPL_global_options (bigshm = True ) \
745+ + putConfigValuesNew (['ITSClustererParam' ,
742746 'ITSCATrackerParam' ,
743747 'TPCGasParam' ],
744748 {"ITSClustererParam.dictFilePath" :"../" }) \
745749 + " --track-sources " + anchorConfig .get ("o2-trd-global-tracking-options" ,{}).get ("track-sources" ,"all" )
746- workflow ['stages' ].append (TRDTRACKINGtask )
750+ workflow ['stages' ].append (TRDTRACKINGtask2 )
747751
748752 TOFRECOtask = createTask (name = 'tofmatch_' + str (tf ), needs = [ITSTPCMATCHtask ['name' ], getDigiTaskName ("TOF" )], tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], mem = '1500' )
749753 TOFRECOtask ['cmd' ] = '${O2_ROOT}/bin/o2-tof-reco-workflow --use-ccdb ' + getDPL_global_options () + putConfigValuesNew ()
@@ -752,7 +756,7 @@ def getDigiTaskName(det):
752756 toftpcmatchneeds = [TOFRECOtask ['name' ], TPCRECOtask ['name' ]]
753757 toftracksrcdefault = "TPC,ITS-TPC"
754758 if isActive ('TRD' ):
755- toftpcmatchneeds .append (TRDTRACKINGtask ['name' ])
759+ toftpcmatchneeds .append (TRDTRACKINGtask2 ['name' ])
756760 toftracksrcdefault += ",TPC-TRD,ITS-TPC-TRD"
757761 TOFTPCMATCHERtask = createTask (name = 'toftpcmatch_' + str (tf ), needs = toftpcmatchneeds , tf = tf , cwd = timeframeworkdir , lab = ["RECO" ], mem = '1000' )
758762 TOFTPCMATCHERtask ['cmd' ] = '${O2_ROOT}/bin/o2-tof-matcher-workflow ' + getDPL_global_options () \
@@ -838,7 +842,7 @@ def getDigiTaskName(det):
838842 if isActive ('MCH' ):
839843 pvfinderneeds += [MCHRECOtask ['name' ]]
840844 if isActive ('TRD' ):
841- pvfinderneeds += [TRDTRACKINGtask ['name' ]]
845+ pvfinderneeds += [TRDTRACKINGtask2 ['name' ]]
842846 if isActive ('FDD' ):
843847 pvfinderneeds += [FDDRECOtask ['name' ]]
844848 if isActive ('MFT' ) and isActive ('MCH' ):
@@ -960,7 +964,7 @@ def addQCPerTF(taskName, needs, readerCommand, configFilePath, objectsFile=''):
960964 if isActive ('TOF' ):
961965 aodneeds += [ TOFRECOtask ['name' ] ]
962966 if isActive ('TRD' ):
963- aodneeds += [ TRDTRACKINGtask ['name' ] ]
967+ aodneeds += [ TRDTRACKINGtask2 ['name' ] ]
964968 if isActive ('EMC' ):
965969 aodneeds += [ EMCRECOtask ['name' ] ]
966970 if isActive ('CPV' ):
0 commit comments