diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py index 51a8d9cb9ce9ff5b6e1383f0622aad2003dd7bb6..487189bfc193f823c0f610578e19cc68f274558f 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration from __future__ import print_function @@ -744,16 +744,22 @@ if InDetTrigFlags.loadSummaryTool(): conddb.folderRequested("/TRT/Onl/Calib/ToT/ToTValue")): conddb.addFolderSplitOnline("TRT","/TRT/Onl/Calib/ToT/ToTValue","/TRT/Calib/ToT/ToTValue",className='CondAttrListCollection') - + from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys from TRT_ElectronPidTools.TRT_ElectronPidToolsConf import InDet__TRT_ElectronPidToolRun2,InDet__TRT_LocalOccupancy,TRT_ToT_dEdx from InDetTrigRecExample.InDetTrigConditionsAccess import TRT_ConditionsSetup # Calibration DB Tool from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool InDetTRTCalDbTool = TRT_CalDbTool(name = "TRT_CalDbTool") + TRT_RDO_Key = "TRT_RDOs" + if globalflags.DataSource == 'data': + TRT_RDO_Key = TrigTRTKeys.RDOs + + InDetTrigTRT_LocalOccupancy = InDet__TRT_LocalOccupancy(name ="InDetTrig_TRT_LocalOccupancy", isTrigger = True, - TRT_RDOContainerName="TRT_RDOs_EF", + TRT_RDOContainerName = TRT_RDO_Key, + TRT_DriftCircleCollection = TrigTRTKeys.DriftCircles, TRTCalDbTool = InDetTRTCalDbTool, TRTStrawStatusSummaryTool = InDetTrigTRTStrawStatusSummaryTool) ToolSvc += InDetTrigTRT_LocalOccupancy diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py index a1d6c04aa3a1b2f36be79aa6210ea08ef1c2781b..422959bc8289f628cccd6ac040b3aa8a83c117fb 100755 --- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py +++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration from __future__ import print_function @@ -19,7 +19,7 @@ from __future__ import print_function EF_PixRDOKey="PixelRDOs_EF" EF_SCTRDOKey="SCT_RDOs_EF" -EF_TRTRDOKey="TRT_RDOs_EF" +EF_TRTRDOKey="TRT_RDOs_TRIG" from TriggerJobOpts.TriggerFlags import TriggerFlags if not TriggerFlags.doTransientByteStream(): EF_PixRDOKey="PixelRDOs" diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h index bd5a8753d683aa879904e7e99174ac32f5b19c9e..db0c7def4a389a5a6a2a589ec9c014d31ad83cff 100644 --- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h +++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ /** @@ -70,8 +70,8 @@ namespace InDet{ int m_mode_rio_production; bool m_trtBadChannels; - bool m_roiSeeded; //!< detector manager name in StoreGate - SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey; + SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey{this, "RoIs", "", "RoIs to read in"}; + BooleanProperty m_roiSeeded{this, "isRoI_Seeded", false, "Use RoI"}; ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service SG::UpdateHandleKey<InDet::TRT_DriftCircleContainerCache> m_rioContainerCacheKey; diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx index d748ab1fd8378c90ea4e49d662bd73ddf3d55555..f4dda209ddc4370078ad68d4fd113ba44903393e 100644 --- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx +++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ /** @@ -34,8 +34,6 @@ namespace InDet { m_rioContainerKey("TRT_DriftCircles"), m_mode_rio_production(0), m_trtBadChannels(0), - m_roiSeeded(false), - m_roiCollectionKey(""), m_regionSelector("RegSelSvc", name), m_rioContainerCacheKey("") { @@ -57,6 +55,10 @@ namespace InDet { // Get TRT_DriftCircle tool ATH_CHECK(m_driftcircle_tool.retrieve()); ATH_CHECK(detStore()->retrieve(m_pTRTHelper,"TRT_ID")); + if (m_roiSeeded.value()) { + ATH_CHECK(m_roiCollectionKey.initialize()); + ATH_CHECK(m_regionSelector.retrieve()); + } ATH_CHECK( m_rdoContainerKey.initialize() ); ATH_CHECK( m_rioContainerKey.initialize() ); diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py index 087b642cbe8b10a86d66db53d27ddb33a109962f..a8877d432fe3a73f9a375405e08da0332a2e60f9 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # # Setup of precision tracking @@ -13,6 +13,11 @@ from AthenaCommon.Logging import logging log = logging.getLogger("InDetPT") +#Global keys/names for collections +from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys, TrigPixelKeys + + + # Start using already decided naming conventions # NB: this is only needed at the moment since the signature menu code is @@ -72,8 +77,10 @@ def makeInDetPrecisionTracking( whichSignature, outPTTrackParticles = "%sTrack_%s_%s" %(outputTrackPrefixName, remapSuffix( whichSignature ), 'IDTrig') - # disable the TRT extension at the moment for bjets and muons - if "electron" in whichSignature : +# # disable the TRT extension at the moment for bjets and muons + if "electron" in whichSignature : + doTRTextension = True + elif "tau" in whichSignature : doTRTextension = True else : doTRTextension = False @@ -96,7 +103,7 @@ def makeInDetPrecisionTracking( whichSignature, #If run in views need to check data dependancies! #NOTE: this seems necessary only when PT is called from a different view than FTF otherwise causes stalls if verifier: - verifier.DataObjects += [ ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+TrigPixelClusterAmbiguitiesMap' ), + verifier.DataObjects += [ ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+' + TrigPixelKeys.PixelClusterAmbiguitiesMap ), ( 'TrackCollection' , 'StoreGateSvc+' + inputFTFtracks ) ] @@ -191,9 +198,9 @@ def makeInDetPrecisionTracking( whichSignature, from AthenaCommon.AppMgr import ServiceMgr from AthenaCommon.GlobalFlags import globalflags #Only add raw data decoders if we're running over raw data + TRT_RDO_Key = "TRT_RDOs" if globalflags.InputFormat.is_bytestream(): - - + TRT_RDO_Key = TrigTRTKeys.RDOs from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRT_RodDecoder InDetTRTRodDecoder = TRT_RodDecoder( name = "%sTRTRodDecoder%s" %(algNamePrefix, signature), LoadCompressTableDB = True )#(globalflags.DataSource() != 'geant4')) @@ -206,9 +213,9 @@ def makeInDetPrecisionTracking( whichSignature, # load the TRTRawDataProvider from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProvider - InDetTRTRawDataProvider = TRTRawDataProvider( name = "%sTRTRawDataProvider%s"%(algNamePrefix, signature), - RDOKey = "TRT_RDOs", - ProviderTool = InDetTRTRawDataProviderTool ) + InDetTRTRawDataProvider = TRTRawDataProvider(name = "%sTRTRawDataProvider%s"%(algNamePrefix, signature), + RDOKey = TrigTRTKeys.RDOs, + ProviderTool = InDetTRTRawDataProviderTool) InDetTRTRawDataProvider.isRoI_Seeded = True InDetTRTRawDataProvider.RoIs = rois @@ -227,13 +234,14 @@ def makeInDetPrecisionTracking( whichSignature, from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__TRT_RIO_Maker InDetTrigTRTRIOMaker = InDet__TRT_RIO_Maker( name = "%sTRTDriftCircleMaker%s"%(algNamePrefix, signature), - #RawDataProvider = InDetTRTRawDataProvider, - TRTRIOLocation = 'TRT_TrigDriftCircles', - TRTRDOLocation = "TRT_RDOs", + TRTRIOLocation = TrigTRTKeys.DriftCircles, + TRTRDOLocation = TRT_RDO_Key, #EtaHalfWidth = InDetTrigSliceSettings[('etaHalfWidth',signature)], #PhiHalfWidth = InDetTrigSliceSettings[('phiHalfWidth',signature)], #doFullScan = InDetTrigSliceSettings[('doFullScan',signature)], TRT_DriftCircleTool = InDetTrigTRT_DriftCircleTool ) + InDetTrigTRTRIOMaker.isRoI_Seeded = True + InDetTrigTRTRIOMaker.RoIs = rois from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPatternPropagator, InDetTrigPatternUpdator @@ -267,13 +275,12 @@ def makeInDetPrecisionTracking( whichSignature, ToolSvc += InDetTrigTRTDetElementsRoadMaker - #TODO implement new configuration of circle cut from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTRTDriftCircleCut from TRT_TrackExtensionTool_xk.TRT_TrackExtensionTool_xkConf import InDet__TRT_TrackExtensionTool_xk InDetTrigTRTExtensionTool = InDet__TRT_TrackExtensionTool_xk ( name = "%sTrackExtensionTool%s"%(algNamePrefix,signature), MagneticFieldMode = 'MapSolenoid', # default - TRT_ClustersContainer = 'TRT_TrigDriftCircles', # default + TRT_ClustersContainer = TrigTRTKeys.DriftCircles, # default TrtManagerLocation = 'TRT', # default PropagatorTool = InDetTrigPatternPropagator, UpdatorTool = InDetTrigPatternUpdator, diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py index 4a00c1d6a214c2f0faf9b0c96b0d81b7e5e67ab1..1100088d9bebe9ac0559146d420dca160560dbe3 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py @@ -1,5 +1,5 @@ # -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # from AthenaCommon.Include import include @@ -131,12 +131,14 @@ def makeInDetAlgs( whichSignature='', separateTrackParticleCreator='', rois = 'E InDetPixelGangedAmbiguitiesFinder = InDet__PixelGangedAmbiguitiesFinder(name = "InDetPixelGangedAmbiguitiesFinder" + signature) ToolSvc += InDetPixelGangedAmbiguitiesFinder + #Global keys/names for collections + from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys, TrigPixelKeys from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__PixelClusterization InDetPixelClusterization = InDet__PixelClusterization(name = "InDetPixelClusterization" + signature, clusteringTool = InDetMergedPixelsTool, gangedAmbiguitiesFinder = InDetPixelGangedAmbiguitiesFinder, DataObjectName = InDetKeys.PixelRDOs(), - AmbiguitiesMap = 'TrigPixelClusterAmbiguitiesMap', + AmbiguitiesMap = TrigPixelKeys.PixelClusterAmbiguitiesMap, ClustersName = "PixelTrigClusters") InDetPixelClusterization.isRoI_Seeded = True diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py new file mode 100644 index 0000000000000000000000000000000000000000..23e3c1506a13d37487786236e64f45d7d00cb610 --- /dev/null +++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py @@ -0,0 +1,35 @@ +# +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration +# + +#---------------------------------------------------------------------------------------------------------- +# +# This file contains names of the collections used across the Inner detector Trigger SW +# + + +class IDTrigTRTKeys: + """ Keys for the Transition Radiation Tracker """ + def __init__ (self): + #Created by TRTRawDataProvider + self.RDOs = "TRT_RDOs_TRIG" #Raw data objects + + #Created by RIO_MAKER + self.DriftCircles = "TRT_TrigDriftCircles" + + +class IDTrigPixelKeys: + """ Keys for the Pixel """ + def __init__ (self): + self.PixelClusterAmbiguitiesMap = 'TrigPixelClusterAmbiguitiesMap' + + + + + + +TrigTRTKeys = IDTrigTRTKeys( ) +TrigPixelKeys = IDTrigPixelKeys( ) + + + diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref index 3128d1196fbf1384ead09aa2f7d01b5a474e046e..41f32d43e23fd79c2e590b0b8865083c66e5d5b9 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref @@ -71,8 +71,8 @@ TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - 6 TrigSignatureMoniMT INFO -- #1703681121 Features 7 134 7 - - TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM24VHI #3494457106 -TrigSignatureMoniMT INFO -- #3494457106 Events 6 6 5 5 5 4 - 4 -TrigSignatureMoniMT INFO -- #3494457106 Features 5 65 8 4 - +TrigSignatureMoniMT INFO -- #3494457106 Events 6 6 5 5 5 3 - 3 +TrigSignatureMoniMT INFO -- #3494457106 Features 5 65 8 3 - TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM24VHI #3481091923 TrigSignatureMoniMT INFO -- #3481091923 Events 6 6 0 0 0 - - 0 TrigSignatureMoniMT INFO -- #3481091923 Features 0 0 0 - - @@ -86,14 +86,14 @@ TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #3249 TrigSignatureMoniMT INFO -- #324908483 Events 20 20 20 20 20 - - 20 TrigSignatureMoniMT INFO -- #324908483 Features 137 1657 190 - - TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356 -TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 5 - 5 -TrigSignatureMoniMT INFO -- #1053337356 Features 56 656 116 6 - +TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 4 - 4 +TrigSignatureMoniMT INFO -- #1053337356 Features 56 656 116 5 - TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878 TrigSignatureMoniMT INFO -- #176627878 Events 20 20 16 16 16 4 - 4 TrigSignatureMoniMT INFO -- #176627878 Features 48 534 93 5 - TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765 -TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 4 - 4 -TrigSignatureMoniMT INFO -- #2758326765 Features 45 516 84 5 - +TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 3 - 3 +TrigSignatureMoniMT INFO -- #2758326765 Features 45 516 84 4 - TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM24VHI #713054523 TrigSignatureMoniMT INFO -- #713054523 Events 6 6 2 2 2 2 - 2 TrigSignatureMoniMT INFO -- #713054523 Features 2 34 4 2 - diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py index 2dd7b646b3339bea7a60f57926b1e94de444849b..a0f95d98d7dc78e8f4c04e0f860b936ed30b3ac2 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py @@ -1,5 +1,5 @@ -from AthenaCommon.CFElements import parOR +from AthenaCommon.CFElements import seqAND #from AthenaCommon.Constants import DEBUG def getSecondStageBjetTracking( inputRoI ): @@ -9,12 +9,12 @@ def getSecondStageBjetTracking( inputRoI ): from TrigInDetConfig.InDetSetup import makeInDetAlgs viewAlgs = makeInDetAlgs( whichSignature='Jet',separateTrackParticleCreator="_Bjet", rois=inputRoI ) - algSequence.append( parOR("SecondStageFastTrackingSequence",viewAlgs) ) + algSequence.append( seqAND("SecondStageFastTrackingSequence",viewAlgs) ) # Precision Tracking from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking - PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "bjet", inputFTFtracks="TrigFastTrackFinder_Tracks_Bjet" ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "bjet", rois=inputRoI, inputFTFtracks="TrigFastTrackFinder_Tracks_Bjet" ) algSequence += PTAlgs return [ algSequence, PTTracks, PTTrackParticles ] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py index b4f16674155848dd0a5b66c309e6f9d5bac0b99b..aba42d585d80e96fd6923017649dd037e64466e3 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py @@ -1,8 +1,8 @@ # -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # -from AthenaCommon.CFElements import parOR, seqAND +from AthenaCommon.CFElements import parOR from AthenaCommon.GlobalFlags import globalflags #logging @@ -38,7 +38,8 @@ def precisionElectronRecoSequence(RoIs): ViewVerifyTrk.DataObjects = [('TrackCollection','StoreGateSvc+'+TrackCollection), ('xAOD::CaloClusterContainer' , precisionCaloMenuDefs.precisionCaloClusters), ('CaloCellContainer' , 'StoreGateSvc+CaloCells'), - ('SCT_FlaggedCondData','StoreGateSvc+SCT_FlaggedCondData_TRIG')] + ('SCT_FlaggedCondData','StoreGateSvc+SCT_FlaggedCondData_TRIG'), + ] if globalflags.InputFormat.is_bytestream(): ViewVerifyTrk.DataObjects += [( 'InDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' ), @@ -53,7 +54,7 @@ def precisionElectronRecoSequence(RoIs): from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking("electron", ViewVerifyTrk, inputFTFtracks= TrackCollection, rois= RoIs) - PTSeq = seqAND("precisionTrackingInElectrons", PTAlgs) + PTSeq = parOR("precisionTrackingInElectrons", PTAlgs) #electronPrecisionTrack += PTSeq trackParticles = PTTrackParticles[-1] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py index 44e1869783dbd03bee9f330e969a28f34a2b231f..bf472ceee61374be112afe1e80098d6c9b833b68 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py @@ -482,7 +482,7 @@ def muEFCBRecoSequence( RoIs, name ): global TrackParticlesName from AthenaCommon import CfgMgr - from AthenaCommon.CFElements import parOR, seqAND + from AthenaCommon.CFElements import parOR from MuonCombinedRecExample.MuonCombinedAlgs import MuonCombinedInDetCandidateAlg, MuonCombinedAlg, MuonCreatorAlg from MuonCombinedAlgs.MuonCombinedAlgsMonitoring import MuonCreatorAlgMonitoring @@ -533,11 +533,11 @@ def muEFCBRecoSequence( RoIs, name ): #Pass verifier as an argument and it will automatically append necessary DataObjects #@NOTE: Don't provide any verifier if loaded in the same view as FTF if 'FS' in name: - PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonFS", inputFTFtracks=TrackCollection) - PTSeq = seqAND("precisionTrackingInMuonsFS", PTAlgs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonFS", rois = RoIs, verifier = False, inputFTFtracks=TrackCollection) + PTSeq = parOR("precisionTrackingInMuonsFS", PTAlgs ) else: - PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muon", ViewVerifyTrk, inputFTFtracks= TrackCollection) - PTSeq = seqAND("precisionTrackingInMuons", PTAlgs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muon", rois = RoIs, verifier = ViewVerifyTrk, inputFTFtracks= TrackCollection) + PTSeq = parOR("precisionTrackingInMuons", PTAlgs ) #Get last tracks from the list as input for other alg muEFCBRecoSequence += PTSeq @@ -590,7 +590,7 @@ def muEFCBRecoSequence( RoIs, name ): def muEFInsideOutRecoSequence(RoIs, name): - from AthenaCommon.CFElements import parOR, seqAND + from AthenaCommon.CFElements import parOR from AthenaCommon import CfgMgr from MuonRecExample.MuonStandalone import MooSegmentFinderAlg @@ -630,8 +630,8 @@ def muEFInsideOutRecoSequence(RoIs, name): from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking #When run in a different view than FTF some data dependencies needs to be loaded through verifier - PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonLate", inputFTFtracks= TrackCollection) - PTSeq = seqAND("precisionTrackingInLateMuons", PTAlgs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonLate", rois=RoIs, inputFTFtracks= TrackCollection) + PTSeq = parOR("precisionTrackingInLateMuons", PTAlgs ) efmuInsideOutRecoSequence += PTSeq trackParticles = PTTrackParticles[-1] @@ -689,8 +689,7 @@ def efmuisoRecoSequence( RoIs, Muons ): # ATR-20453 # Until such time as FS and RoI collections do not interfere, a hacky fix - #from AthenaCommon.CFElements import parOR - from AthenaCommon.CFElements import seqAND + from AthenaCommon.CFElements import seqAND,parOR # ATR-20453 # Until such time as FS and RoI collections do not interfere, a hacky fix @@ -713,9 +712,9 @@ def efmuisoRecoSequence( RoIs, Muons ): PTTrackParticles = [] #List of TrackParticleKeys from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking - PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonIso", inputFTFtracks=TrackCollection) + PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonIso", rois=RoIs, inputFTFtracks=TrackCollection) - PTSeq = seqAND("precisionTrackingInMuonsIso", PTAlgs ) + PTSeq = parOR("precisionTrackingInMuonsIso", PTAlgs ) efmuisoRecoSequence += PTSeq # set up algs diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py index fb1e6c239bb38348babaeec39a4a8abf5f89f386..f7bc9acb4092cc30962432bf8fc32e26d3a25f84 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py @@ -232,8 +232,8 @@ def tauIdTrackSequence( RoIs , name): elif "EF" in name: precName = 'tauEF' - PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( precName, False, inputFTFtracks= TrackCollection ) - PTSeq = seqAND("precisionTrackingIn"+precName, PTAlgs ) + PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( precName, verifier = False, rois = RoIs, inputFTFtracks= TrackCollection ) + PTSeq = parOR("precisionTrackingIn"+precName, PTAlgs ) #Get last tracks from the list as input for other alg tauIdTrackSequence += PTSeq