diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index 7392343118990e3d85a0361c22e527cd55b25e6d..42c8d45603022bc240fe492eaa904d85c676d553 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
@@ -48,7 +48,7 @@ def _algoHLTTopoClusterLC(inputEDM="CellsClusters", OutputLevel=ERROR, algSuffix
algo.OutputLevel=OutputLevel
return algo
-def _algoL2Egamma(inputEDM="",OutputLevel=ERROR,doRinger=False, ClustersName="HLT_L2CaloEMClusters", RingerKey="HLT_FastCaloRinger"):
+def _algoL2Egamma(inputEDM="",OutputLevel=ERROR,doRinger=False, ClustersName="HLT_FastCaloEMClusters", RingerKey="HLT_FastCaloRinger"):
if not inputEDM:
from L1Decoder.L1DecoderConfig import mapThresholdToL1RoICollection
inputEDM = mapThresholdToL1RoICollection("EM")
@@ -57,7 +57,7 @@ def _algoL2Egamma(inputEDM="",OutputLevel=ERROR,doRinger=False, ClustersName="HL
algo=T2CaloEgamma_ReFastAlgo("FastCaloL2EgammaAlg", doRinger=doRinger, RingerKey=RingerKey)
algo.RoIs=inputEDM
from TrigEDMConfig.TriggerEDMRun3 import recordable
- algo.ClustersName=recordable("HLT_L2CaloEMClusters")
+ algo.ClustersName=recordable("HLT_FastCaloEMClusters")
algo.OutputLevel=OutputLevel
return algo
@@ -66,7 +66,7 @@ def _algoL2Egamma(inputEDM="",OutputLevel=ERROR,doRinger=False, ClustersName="HL
##### SEQUENCES
####################################
-def fastCaloRecoSequence(InViewRoIs, doRinger=False, ClustersName="HLT_L2CaloEMClusters", RingerKey="HLT_FastCaloRinger"):
+def fastCaloRecoSequence(InViewRoIs, doRinger=False, ClustersName="HLT_FastCaloEMClusters", RingerKey="HLT_FastCaloRinger"):
fastCaloAlg = _algoL2Egamma(inputEDM=InViewRoIs, doRinger=doRinger, ClustersName=ClustersName, RingerKey=RingerKey)
import AthenaCommon.CfgMgr as CfgMgr
@@ -97,7 +97,7 @@ def fastCaloEVCreator():
return (fastCaloViewsMaker, InViewRoIs)
-def createFastCaloSequence(EMRoIDecisions, doRinger=False, ClustersName="HLT_L2CaloEMClusters", RingerKey="HLT_FastCaloRinger"):
+def createFastCaloSequence(EMRoIDecisions, doRinger=False, ClustersName="HLT_FastCaloEMClusters", RingerKey="HLT_FastCaloRinger"):
"""Used for standalone testing"""
(fastCaloViewsMaker, InViewRoIs) = fastCaloEVCreator()
# connect to RoIs
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py
index d0251cde511cb9fbe9b630715f74995a3410ef8a..64ed98ff296c8b0e15c29e184b17a35f5157b93a 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaMTConfig.py
@@ -39,7 +39,7 @@ def fastL2EgammaClusteringAlg( flags, roisKey="EMCaloRoIs", doRinger=False):
alg = CompFactory.T2CaloEgammaReFastAlgo("FastEMCaloAlgo")
from TrigEDMConfig.TriggerEDMRun3 import recordable
- alg.ClustersName = recordable('HLT_L2CaloEMClusters')
+ alg.ClustersName = recordable('HLT_FastCaloEMClusters')
alg.RoIs = roisKey
alg.EtaWidth = 0.2
alg.PhiWidth = 0.2
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h
index 73437391b484062d1bb2fddf7c1f0b684af10a64..12bebf656547b565e9dfe51f2fe66da32e107b95 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerReFex.h
@@ -92,7 +92,7 @@ class RingerReFex : public IReAlgToolCalo
ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool"};
SG::WriteHandleKey<xAOD::TrigRingerRingsContainer> m_ringerContainerKey {this, "RingerKey", "HLT_FastCaloRinger", "TrigRingerRings container key"};
- SG::ReadHandleKey<xAOD::TrigEMClusterContainer> m_clusterContainerKey {this, "ClustersName", "HLT_L2CaloEMClusters", "TrigEMCluster container key"};
+ SG::ReadHandleKey<xAOD::TrigEMClusterContainer> m_clusterContainerKey {this, "ClustersName", "HLT_FastCaloEMClusters", "TrigEMCluster container key"};
Gaudi::Property<std::vector<float>> m_etaBins {this, "EtaBins", {}, "Eta bins range cover by the ringer reconstruction."};
Gaudi::Property<bool> m_global_center {this, "GlobalCenter", false, ""};
Gaudi::Property<bool> m_useHad {this, "UseHad", true, ""};
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/Root/TrigEgammaMatchingToolMT.cxx b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/Root/TrigEgammaMatchingToolMT.cxx
index f299f0a21a37c3fcb60bfe9a942eb36149d2df6d..49f69d2f63eedc4784f0769b4a7296afa30aab55 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/Root/TrigEgammaMatchingToolMT.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/Root/TrigEgammaMatchingToolMT.cxx
@@ -46,9 +46,9 @@ StatusCode TrigEgammaMatchingToolMT::initialize()
m_keys[ "Photon"] = "HLT_egamma_Photons" ;
m_keys[ "Track"] = "";
m_keys[ "EFCalo"] = "HLT_CaloEMClusters" ;
- m_keys[ "L2Electron"] = "HLT_L2Electrons" ;
- m_keys[ "L2Photon"] = "HLT_L2Photons" ;
- m_keys[ "L2Calo"] = "HLT_L2CaloEMClusters" ;
+ m_keys[ "L2Electron"] = "HLT_FastElectrons" ;
+ m_keys[ "L2Photon"] = "HLT_FastPhotons" ;
+ m_keys[ "L2Calo"] = "HLT_FastCaloEMClusters" ;
m_keys[ "L1Calo"] = "LVL1EmTauRoIs" ;
return StatusCode::SUCCESS;
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolMTTest.cxx b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolMTTest.cxx
index f64f79f66beeab713c465665b367eaab27801848..c28e384ea56f2cf2e93515c80d29a69b76b474e2 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolMTTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolMTTest.cxx
@@ -101,8 +101,8 @@ void TrigEgammaMatchingToolMTTest::inspect(const std::string trigger,const xAOD:
bool passedHLT = m_matchTool->ancestorPassed<xAOD::ElectronContainer> (dec, trigger , "HLT_egamma_Electrons");
bool passedEFCalo = m_matchTool->ancestorPassed<xAOD::CaloClusterContainer> (dec, trigger , "HLT_CaloEMClusters");
- bool passedL2 = m_matchTool->ancestorPassed<xAOD::TrigElectronContainer> (dec, trigger , "HLT_L2Electrons");
- bool passedL2Calo = m_matchTool->ancestorPassed<xAOD::TrigEMClusterContainer> (dec, trigger , "HLT_L2CaloEMClusters");
+ bool passedL2 = m_matchTool->ancestorPassed<xAOD::TrigElectronContainer> (dec, trigger , "HLT_FastElectrons");
+ bool passedL2Calo = m_matchTool->ancestorPassed<xAOD::TrigEMClusterContainer> (dec, trigger , "HLT_FastCaloEMClusters");
bool passedL1Calo = m_matchTool->ancestorPassed<TrigRoiDescriptorCollection> (dec, trigger , "initialRois");
ATH_MSG_INFO( "L1Calo passed : "<< passedL1Calo );
diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitorAlgorithm.py
index e0e4f1d958d8c6ef7a10607ab591592e9e646015..6d0b93763288429e61a65c848d22695c31c74b6c 100644
--- a/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitorAlgorithm.py
@@ -30,17 +30,17 @@ def TrigCaloMonConfig(inputFlags):
################################
- # HLT_L2CaloEMClusters #
+ # HLT_FastCaloEMClusters #
################################
# Add monitor algorithm
from AthenaConfiguration.ComponentFactory import CompFactory
- L2CaloEMClustersMonAlg = helper.addAlgorithm(CompFactory.HLTCalo_L2CaloEMClustersMonitor, 'HLT_L2CaloEMClustersMonAlg')
+ L2CaloEMClustersMonAlg = helper.addAlgorithm(CompFactory.HLTCalo_L2CaloEMClustersMonitor, 'HLT_FastCaloEMClustersMonAlg')
# Set properties
- L2CaloEMClustersMonAlg.HLTContainer = 'HLT_L2CaloEMClusters'
+ L2CaloEMClustersMonAlg.HLTContainer = 'HLT_FastCaloEMClusters'
L2CaloEMClustersMonAlg.OFFContainer = 'egammaClusters'
L2CaloEMClustersMonAlg.MonGroupName = 'TrigCaloMonitor'
L2CaloEMClustersMonAlg.OFFTypes = []
@@ -57,7 +57,7 @@ def TrigCaloMonConfig(inputFlags):
########################
# Declare HLT histograms
- hist_path='HLT_L2CaloEMClusters/HLT_Clusters'
+ hist_path='HLT_FastCaloEMClusters/HLT_Clusters'
L2CaloEMClustersMonGroup.defineHistogram('HLT_num',title='Number of HLT Clusters; Num Clusters; Entries',
path=hist_path,xbins=51,xmin=-0.5,xmax=50.5)
L2CaloEMClustersMonGroup.defineHistogram('HLT_eta,HLT_phi',title='Number of HLT Clusters; #eta; #phi; ', type='TH2F',
@@ -94,7 +94,7 @@ def TrigCaloMonConfig(inputFlags):
########################
# Declare OFF histograms
- hist_path='HLT_L2CaloEMClusters/OFF_Clusters'
+ hist_path='HLT_FastCaloEMClusters/OFF_Clusters'
L2CaloEMClustersMonGroup.defineHistogram('OFF_num',title='Number of OFF Clusters; Num Clusters; Entries',
path=hist_path,xbins=101,xmin=-1.0,xmax=201.0)
L2CaloEMClustersMonGroup.defineHistogram('OFF_eta,OFF_phi',title='Number of OFF Clusters; #eta; #phi; ', type='TH2F',
@@ -115,7 +115,7 @@ def TrigCaloMonConfig(inputFlags):
########################
# Declare HLT matched HLT vs. OFF cluster histograms
- hist_path='HLT_L2CaloEMClusters/HLT_Matched_to_OFF'
+ hist_path='HLT_FastCaloEMClusters/HLT_Matched_to_OFF'
L2CaloEMClustersMonGroup.defineHistogram('HLT_matched_fraction',title='Fraction of HLT clusters matched to HLT clusters; Matched fraction; Entries',
path=hist_path,xbins=100,xmin=0.0,xmax=1.0)
L2CaloEMClustersMonGroup.defineHistogram('HLT_vs_OFF_minimum_delta_r',title='HLT vs OFF Cluster #DeltaR; #DeltaR; Entries',
@@ -170,7 +170,7 @@ def TrigCaloMonConfig(inputFlags):
########################
# Declare OFF matched HLT vs. OFF cluster histograms
- hist_path='HLT_L2CaloEMClusters/OFF_Matched_to_HLT'
+ hist_path='HLT_FastCaloEMClusters/OFF_Matched_to_HLT'
L2CaloEMClustersMonGroup.defineHistogram('OFF_matched_fraction',title='Fraction of OFF clusters matched to HLT clusters; Matched fraction; Entries',
path=hist_path,xbins=100,xmin=0.0,xmax=1.0)
L2CaloEMClustersMonGroup.defineHistogram('OFF_vs_HLT_minimum_delta_r',title='HLT vs OFF Cluster #DeltaR; #DeltaR; Entries',
diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloESD_xAODTrigEMClusters.cxx b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloESD_xAODTrigEMClusters.cxx
index e6495986ab93692fde754e792e923abd06938dd4..bf96bf56d4a1ede40222b2531072f7914bf7fa86 100644
--- a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloESD_xAODTrigEMClusters.cxx
+++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCaloESD_xAODTrigEMClusters.cxx
@@ -16,7 +16,7 @@ HLTCaloESD_xAODTrigEMClusters::HLTCaloESD_xAODTrigEMClusters(const std::string &
//m_ShowerShapeTool("egammaShowerShape/egammashowershape")
{
declareProperty("HLTContainerRun2", m_HLT_cont_name_run2 = "HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma");
- declareProperty("HLTContainerRun3", m_HLT_cont_name_run3 = "HLT_L2CaloEMClusters");
+ declareProperty("HLTContainerRun3", m_HLT_cont_name_run3 = "HLT_FastCaloEMClusters");
declareProperty("OFFContainer", m_OFF_cont_name = "egammaClusters");
declareProperty("MonGroupName", m_mongroup_name = "");
diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.cxx b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.cxx
index 95bbce37f1a57dbe498e1ff74f595a3cca13b2a5..89587c4d5958dea50fad9049fe70da258d41ff34 100644
--- a/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.cxx
+++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/src/HLTCalo_L2CaloEMClustersMonitor.cxx
@@ -14,7 +14,7 @@ template <typename T> struct clus_kin {
HLTCalo_L2CaloEMClustersMonitor::HLTCalo_L2CaloEMClustersMonitor( const std::string& name, ISvcLocator* pSvcLocator )
: AthMonitorAlgorithm(name,pSvcLocator)
{
- declareProperty("HLTContainer", m_HLT_cont_key = "HLT_L2CaloEMClusters");
+ declareProperty("HLTContainer", m_HLT_cont_key = "HLT_FastCaloEMClusters");
declareProperty("OFFContainer", m_OFF_cont_key = "egammaClusters");
declareProperty("MonGroupName", m_mongroup_name = "TrigCaloMonitor");
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx
index ec025a2ece38cb454e5d8475ef0f60f1fa6d0138..49532041f20309e8a14a3dbfc6bbd6926eed5055 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx
@@ -160,19 +160,19 @@ asg::AcceptData TrigEgammaMonitorBaseAlgorithm::setAccept( const TrigCompositeUt
if(!info.trigL1){ // HLT item get full decision
ATH_MSG_DEBUG("Check for active features: TrigEMCluster,CaloClusterContainer");
- passedL2Calo = match()->ancestorPassed<xAOD::TrigEMClusterContainer>(dec, trigger, "HLT_L2CaloEMClusters");
+ passedL2Calo = match()->ancestorPassed<xAOD::TrigEMClusterContainer>(dec, trigger, "HLT_FastCaloEMClusters");
passedEFCalo = match()->ancestorPassed<xAOD::CaloClusterContainer>(dec, trigger, "HLT_CaloEMClusters");
if(info.trigType == "electron"){
ATH_MSG_DEBUG("Check for active features: TrigElectron, ElectronContainer, TrackParticleContainer");
- passedL2 = match()->ancestorPassed<xAOD::TrigElectronContainer>(dec, trigger, "HLT_L2Electrons");
+ passedL2 = match()->ancestorPassed<xAOD::TrigElectronContainer>(dec, trigger, "HLT_FastElectrons");
passedEF = match()->ancestorPassed<xAOD::ElectronContainer>(dec, trigger, "HLT_egamma_Electrons");
passedEFTrk = true; //match()->ancestorPassed<xAOD::TrackParticleContainer>(dec);
}
else if(info.trigType == "photon"){
ATH_MSG_DEBUG("Check for active features: TrigPhoton, PhotonContainer");
- passedL2 = match()->ancestorPassed<xAOD::TrigPhotonContainer>(dec, trigger, "HLT_L2Photons");
+ passedL2 = match()->ancestorPassed<xAOD::TrigPhotonContainer>(dec, trigger, "HLT_FastPhotons");
passedEF = match()->ancestorPassed<xAOD::PhotonContainer>(dec, trigger, "HLT_egamma_Photons");
passedEFTrk=true;// Assume true for photons
}
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/CaloRinger.py b/Trigger/TrigValidation/TrigUpgradeTest/share/CaloRinger.py
index 61da85864e13d4b2d26b4a22eea1dc1dccf7ddf3..0c2dce2a06553aecd5183d7a174c20084c777e3a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/CaloRinger.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/CaloRinger.py
@@ -50,7 +50,7 @@ if TriggerFlags.doCalo:
filterL1RoIsAlg.Output = ["HLTNav_FilteredEMRoIDecisions"]
filterL1RoIsAlg.Chains = [ "HLT_EMTestChain" ]
(fastCaloSequence, sequenceOut) = createFastCaloSequence(filterL1RoIsAlg.Output[0], doRinger=True,
- ClustersName="HLT_L2CaloEMClusters",
+ ClustersName="HLT_FastCaloEMClusters",
RingerKey="HLT_FastCaloRinger")
steps+=stepSeq("finalCaloSequence", filterL1RoIsAlg, [ fastCaloSequence ])
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 7f82370ada6039395891664540b406cd83cc9777..e783701fa4fe2af79df32ed9bfcb073333802bd6 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -109,15 +109,15 @@ TriggerHLTListRun3 = [
# Egamma
- ('xAOD::TrigEMClusterContainer#HLT_L2CaloEMClusters', 'BS ESD AODFULL', 'Egamma', 'inViews:EMCaloViews'), # last arg specifies in which view container the fragments are, look into the proprty of View maker alg for it
- ('xAOD::TrigEMClusterAuxContainer#HLT_L2CaloEMClustersAux.', 'BS ESD AODFULL', 'Egamma'),
+ ('xAOD::TrigEMClusterContainer#HLT_FastCaloEMClusters', 'BS ESD AODFULL', 'Egamma', 'inViews:EMCaloViews'), # last arg specifies in which view container the fragments are, look into the proprty of View maker alg for it
+ ('xAOD::TrigEMClusterAuxContainer#HLT_FastCaloEMClustersAux.', 'BS ESD AODFULL', 'Egamma'),
('xAOD::TrigRingerRingsContainer#HLT_FastCaloRinger', 'BS ESD AODFULL', 'Egamma', 'inViews:EMCaloViews'), #Ringer
('xAOD::TrigRingerRingsAuxContainer#HLT_FastCaloRingerAux.', 'BS ESD AODFULL', 'Egamma'), #Ringer
- ('xAOD::TrigPhotonContainer#HLT_L2Photons', 'BS ESD AODFULL', 'Egamma', 'inViews:EMPhotonViews'),
- ('xAOD::TrigPhotonAuxContainer#HLT_L2PhotonsAux.', 'BS ESD AODFULL', 'Egamma'),
- ('xAOD::TrigElectronContainer#HLT_L2Electrons', 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
- ('xAOD::TrigElectronAuxContainer#HLT_L2ElectronsAux.', 'BS ESD AODFULL', 'Egamma'),
+ ('xAOD::TrigPhotonContainer#HLT_FastPhotons', 'BS ESD AODFULL', 'Egamma', 'inViews:EMPhotonViews'),
+ ('xAOD::TrigPhotonAuxContainer#HLT_FastPhotonsAux.', 'BS ESD AODFULL', 'Egamma'),
+ ('xAOD::TrigElectronContainer#HLT_FastElectrons', 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
+ ('xAOD::TrigElectronAuxContainer#HLT_FastElectronsAux.', 'BS ESD AODFULL', 'Egamma'),
('xAOD::TrackParticleContainer#HLT_IDTrack_Electron_FTF', 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_Electron_FTFAux.', 'BS ESD AODFULL', 'Egamma'),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
index 3a99da4be12d9e320b668a050d0723ccc2909487..0b47542aaf456a1b0ed8f083cf4be66579afb1d2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
@@ -9,7 +9,7 @@ from TrigEDMConfig.TriggerEDMRun3 import recordable
class CaloMenuDefs(object):
"""Static Class to collect all string manipulations in Calo sequences """
from TrigEDMConfig.TriggerEDMRun3 import recordable
- L2CaloClusters= recordable("HLT_L2CaloEMClusters")
+ L2CaloClusters= recordable("HLT_FastCaloEMClusters")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index ba95dae7fbeab2cbbba94228631e3527f0451133..5c05433350f4a8a1202d877939474eb7391ccc9a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -43,7 +43,7 @@ def fastElectronSequence(ConfigFlags):
theElectronFex= EgammaFastElectronFex_1()
theElectronFex.TrigEMClusterName = CaloMenuDefs.L2CaloClusters
theElectronFex.TrackParticlesName = TrackParticlesName
- theElectronFex.ElectronsName=recordable("HLT_L2Electrons")
+ theElectronFex.ElectronsName=recordable("HLT_FastElectrons")
# EVCreator:
l2ElectronViewsMaker = EventViewCreatorAlgorithm("IMl2Electron")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
index e6345aa497f6c0888d8a75229277a8c1a1d03eab..b26abbfc3d37ce4949721b304a3908a259a25bdb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
@@ -24,7 +24,7 @@ def fastPhotonMenuSequence():
from TrigEgammaHypo.TrigEgammaFastPhotonFexMTConfig import EgammaFastPhotonFex_1
thePhotonFex= EgammaFastPhotonFex_1()
thePhotonFex.TrigEMClusterName = CaloMenuDefs.L2CaloClusters
- thePhotonFex.PhotonsName=recordable("HLT_L2Photons")
+ thePhotonFex.PhotonsName=recordable("HLT_FastPhotons")
#thePhotonFex.RoIs="EMIDRoIs"
l2PhotonViewsMaker = EventViewCreatorAlgorithm("IMl2Photon")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
index d07c0346fe6b9ef843efb11b4c4443fedbb635e4..afd53e4600dd1589728efe8f0dd5eb59cc7bb179 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
@@ -32,7 +32,7 @@ def generateChains( flags, chainDict ):
accCalo.merge( LumiBlockMuWriterCfg(flags) )
l2CaloHypo = l2CaloHypoCfg( flags, name = 'L2ElectronCaloHypo',
- CaloClusters = recordable('HLT_L2CaloEMClusters'))
+ CaloClusters = recordable('HLT_FastCaloEMClusters'))
accCalo.addEventAlgo(l2CaloHypo, sequenceName=stepView.getName())
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
index 434dc6e1e500cdbedb979a7cd5c7675bb8bd89b4..efc54c001babceceed00d6955b6b8092692e23eb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
@@ -84,8 +84,8 @@ def l2PhotonAlgCfg( flags ):
photonFex= CompFactory.TrigEgammaFastPhotonFexMT("EgammaFastPhotonFex_1")
#photonFex= L2PhotonFex_1()
- photonFex.TrigEMClusterName = recordable("HLT_L2CaloEMClusters")
- photonFex.PhotonsName = recordable("HLT_L2Photons")
+ photonFex.TrigEMClusterName = recordable("HLT_FastCaloEMClusters")
+ photonFex.PhotonsName = recordable("HLT_FastPhotons")
photonFex.RoIs = "L2PhotonRecoRoIs"
return acc, photonFex
@@ -94,7 +94,7 @@ def l2PhotonAlgCfg( flags ):
def photonViewDataVerifierCfg():
from AthenaConfiguration.ComponentFactory import CompFactory
moveClusters = CompFactory.AthViews.ViewDataVerifier("VDVFastPhoton")
- moveClusters.DataObjects = [ ('xAOD::TrigEMClusterContainer','StoreGateSvc+HLT_L2CaloEMClusters'),
+ moveClusters.DataObjects = [ ('xAOD::TrigEMClusterContainer','StoreGateSvc+HLT_FastCaloEMClusters'),
( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+L2PhotonRecoRoIs' )]
result = ComponentAccumulator()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
index dcc6728f660e63934fec76cb793dc37c672ac043..cc0af567ee5c948b1e3611d81a1cd01aa8e3470e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
@@ -31,7 +31,7 @@ def generateChains(flags, chainDict):
l2CaloHypo = l2CaloHypoCfg( flags,
name = 'L2PhotonCaloHypo',
- CaloClusters = recordable('HLT_L2CaloEMClusters') )
+ CaloClusters = recordable('HLT_FastCaloEMClusters') )
accCalo.addEventAlgo(l2CaloHypo, sequenceName=stepView.getName())
@@ -54,7 +54,7 @@ def generateChains(flags, chainDict):
accPhoton.merge(l2PhotonReco, sequenceName=stepReco.getName())
l2PhotonHypo = l2PhotonHypoCfg( flags,
- Photons = 'HLT_L2Photons',
+ Photons = 'HLT_FastPhotons',
RunInView = True )
accPhoton.addEventAlgo(l2PhotonHypo, sequenceName=stepView.getName())