diff --git a/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt b/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt index cd14d84535dab0e98c07942810e7b68dc919717e..11e2a8f324ba69d128f452710cb22d907d02b402 100644 --- a/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt +++ b/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt @@ -8,5 +8,5 @@ atlas_subdir( TrigInDetConfig ) # Install files from the package: atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) -atlas_add_test( TrigInDetCfg SCRIPT python -m TrigInDetConfig.TrigInDetConfig POST_EXEC_SCRIPT nopost.sh ) +atlas_add_test( trigInDetFastTrackingCfg SCRIPT python -m TrigInDetConfig.TrigInDetConfig POST_EXEC_SCRIPT nopost.sh ) atlas_add_test( TrigTrackingCutFlags SCRIPT python -m TrigInDetConfig.TrigTrackingCutFlags POST_EXEC_SCRIPT nopost.sh ) diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py index 87adfc9736db148779beb9b4264acb60d3fa8a5c..d6c9cd216d4ef8bf63c26e64dcf3b0cc84adf238 100644 --- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py +++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py @@ -675,7 +675,7 @@ def trackConverterCfg(flags, signature, signatureName): return acc -def trigInDetCfg( inflags, roisKey="EMRoIs", signatureName='' ): +def trigInDetFastTrackingCfg( inflags, roisKey="EMRoIs", signatureName='' ): # redirect InDet.Tracking flags to point to a specific trigger setting flags = inflags.cloneAndReplace("InDet.Tracking", "Trigger.InDetTracking."+signatureName) @@ -690,7 +690,7 @@ def trigInDetCfg( inflags, roisKey="EMRoIs", signatureName='' ): acc.merge(beamposCondCfg(flags)) - verifier = CompFactory.AthViews.ViewDataVerifier( name = 'VDVInDet'+signature, + verifier = CompFactory.AthViews.ViewDataVerifier( name = 'VDVInDetFTF'+signature, DataObjects= [('xAOD::EventInfo', 'StoreGateSvc+EventInfo'), ('InDet::PixelClusterContainerCache', 'PixelTrigClustersCache'), ('PixelRDO_Cache', 'PixRDOCache'), @@ -733,7 +733,7 @@ if __name__ == "__main__": # output can be used by experts to check actual configuration (e.g. here we configure to run on RAW and it should be reflected in settings) from AthenaConfiguration.MainServicesConfig import MainServicesCfg acc = MainServicesCfg( ConfigFlags ) - acc.merge( trigInDetCfg( ConfigFlags, roisKey="ElectronRoIs", signatureName="Electron" ) ) + acc.merge( trigInDetFastTrackingCfg( ConfigFlags, roisKey="ElectronRoIs", signatureName="Electron" ) ) acc.printConfig(withDetails=True, summariseProps=True) acc.store( open("test.pkl", "wb") ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py index 399678f5344a6031092622c1dd6149f8b9b881f2..a509b32e047afeb161eba7f4a199734c84f21e23 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py @@ -61,13 +61,13 @@ def generateChains( flags, chainDict ): RequireParentView = True) del name - from TrigInDetConfig.TrigInDetConfig import trigInDetCfg - idTracking = trigInDetCfg(flags, roisKey=evtViewMaker.InViewRoIs, signatureName="Electron") + from TrigInDetConfig.TrigInDetConfig import trigInDetFastTrackingCfg + idTracking = trigInDetFastTrackingCfg(flags, roisKey=evtViewMaker.InViewRoIs, signatureName="Electron") fastInDetReco = InViewReco("FastElectron", viewMaker=evtViewMaker) fastInDetReco.mergeReco(idTracking) - fastInDetReco.addRecoAlgo(CompFactory.AthViews.ViewDataVerifier( name = 'VDVElectronFastCalo', - DataObjects=[('xAOD::TrigEMClusterContainer' , 'StoreGateSvc+HLT_FastCaloEMClusters')]) ) + fastInDetReco.addRecoAlgo(CompFactory.AthViews.ViewDataVerifier(name='VDVElectronFastCalo', + DataObjects=[('xAOD::TrigEMClusterContainer', 'StoreGateSvc+HLT_FastCaloEMClusters')])) from TrigEgammaHypo.TrigEgammaFastElectronFexMTConfig import fastElectronFexAlgCfg fastInDetReco.mergeReco(fastElectronFexAlgCfg(flags, rois=evtViewMaker.InViewRoIs)) @@ -92,8 +92,9 @@ def generateChains( flags, chainDict ): # # # EF calo - # # # EF ID + # # # Precison tracking + # # # offline egamma emptyStep = ChainStep(name="EmptyElStep", Sequences=[EmptyMenuSequence("EmptyElStep")], chainDicts=[chainDict]) chain = Chain(chainDict['chainName'], L1Thresholds=l1Thresholds, ChainSteps=[fastCaloStep, fastInDetStep, emptyStep, emptyStep]) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py index 6f4b973e7e032b22cfa2f07c368502fad1af5227..6a4eb88fad42bf75feed3d3abbe878be4547b5d9 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py @@ -6,7 +6,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from TrigL2MuonSA.TrigL2MuonSAConfig_newJO import l2MuFastAlgCfg, l2MuFastHypoCfg from TrigmuComb.TrigmuCombConfig_newJO import l2MuCombRecoCfg, l2MuCombHypoCfg from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromDict, TrigmuCombHypoToolFromDict, TrigMuonEFMSonlyHypoToolFromDict, TrigMuonEFCombinerHypoToolFromDict -from TrigInDetConfig.TrigInDetConfig import trigInDetCfg +from TrigInDetConfig.TrigInDetConfig import trigInDetFastTrackingCfg from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict @@ -244,7 +244,7 @@ def generateChains( flags, chainDict ): recoL2CB.mergeReco( MuCombViewDataVerifier() ) #ID tracking - accID = trigInDetCfg( flags, roisKey=recoL2CB.inputMaker().InViewRoIs, signatureName="Muon" ) + accID = trigInDetFastTrackingCfg( flags, roisKey=recoL2CB.inputMaker().InViewRoIs, signatureName="Muon" ) recoL2CB.mergeReco(accID) accL2CB.merge(recoL2CB, sequenceName = stepL2CBReco.getName())