diff --git a/Reconstruction/eflowRec/python/PFHLTSequence.py b/Reconstruction/eflowRec/python/PFHLTSequence.py
index 1b59e4c86fa1c581691f8c1449d12f42cae9b045..a0a999012a0203cc07e5cf19fbdc4d83d3ac36d2 100644
--- a/Reconstruction/eflowRec/python/PFHLTSequence.py
+++ b/Reconstruction/eflowRec/python/PFHLTSequence.py
@@ -9,7 +9,7 @@ log = logging.getLogger('PFHLTSequence')
# Use the appropriate containers based on what config is desired
trackvtxcontainers = {
"offline": ("InDetTrackParticles","PrimaryVertices"),
- "ftf": ("HLT_IDTrack_FS_FTF","HLT_EFHistoPrmVtx"),
+ "ftf": ("HLT_IDTrack_FS_FTF","HLT_IDVertex_FS"),
}
# PFTrackSelector
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h
index 95e23681c80e5f5cc2b574ee325f60482ea4a6a2..323c2031ea7ab5e470a7019e762844180874b85c 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h
@@ -70,7 +70,7 @@ class HLTBjetMonTool : public IHLTMonTool {
"The SG key of the online BJet container from the TriggerEDMRun3"};
SG::ReadHandleKey<xAOD::VertexContainer> m_offlineVertexContainerKey {this,"OfflineVertexContainerName","PrimaryVertices","Key of offline primary vertexes"};
- SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_EFHistoPrmVtx","Key of online bjet primary vertexes"};
+ SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_IDVertex_FS","Key of online bjet primary vertexes"};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_onlineTrackContainerKey {this,"OnlineTrackContainerName","HLT_IDTrack_Bjet_IDTrig","Key of online tracks of bjets"};
ToolHandle<Trig::TrigDecisionTool> m_trigDec; //!
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
index 69349b9b66d6cf0efe8c7fcc94a8f50cec7b3f88..05c6df13cca7ad238032cb9fa73bcab8586899d9 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
@@ -1083,7 +1083,9 @@ StatusCode HLTBjetMonTool::book(){
if(HistJet) hist2("jetEtaPhi"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(jet->eta(),jet->phi());
// zPV associated to the jets in the same event: they are the same for every jet in the same event so only the first zPV should be plotted
if (ijet == 0) {
- auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, "EFHistoPrmVtx"); // CV 200120
+ std::string vtxname = m_onlineVertexContainerKey.key();
+ if ( vtxname.find("HLT_")==0 ) vtxname.erase(0,4);
+ auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, vtxname ); // CV 200120
ATH_CHECK( vertexLinkInfo.isValid() ) ; // TM 200120
const xAOD::Vertex* vtx = *(vertexLinkInfo.link);
ATH_MSG_DEBUG(" PVz_jet from jet link info: " << vtx->z());
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
index df2cc7e08ed45b02f99e7e9aaa5f002b33a21095..503e71ac1b32747c319d37732f41e02aa974ae25 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
@@ -229,7 +229,7 @@ StatusCode TrigBjetMonitorAlgorithm::fillHistograms( const EventContext& ctx ) c
}// onlinebjets
}//bjetChain
-
+
//bjet or mujet chains
if (bjetChain || mujetChain) {
@@ -369,7 +369,11 @@ StatusCode TrigBjetMonitorAlgorithm::fillHistograms( const EventContext& ctx ) c
fill("TrigBjetMonitor",jetEta,jetPhi);
// zPV associated to the jets in the same event: they are the same for every jet in the same event so only the first zPV should be plotted
if (ijet == 0) {
- auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, "EFHistoPrmVtx"); // CV 200120
+
+ std::string vtxname = m_onlineVertexContainerKey.key();
+ if ( vtxname.find("HLT_")==0 ) vtxname.erase(0,4);
+
+ auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, vtxname ); // CV 200120
ATH_CHECK( vertexLinkInfo.isValid() ) ; // TM 200120
const xAOD::Vertex* vtx = *(vertexLinkInfo.link);
NameH = "PVz_jet_"+trigName;
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
index 07dfd01f729b88c38f5434c1c70defca9b867a49..565bae13e0d6fa10e7588a92948fe96754dbd669 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
@@ -31,7 +31,7 @@ class TrigBjetMonitorAlgorithm : public AthMonitorAlgorithm {
std::vector<std::string> m_allChains;
SG::ReadHandleKey<xAOD::MuonContainer> m_muonContainerKey;
SG::ReadHandleKey<xAOD::VertexContainer> m_offlineVertexContainerKey {this,"OfflineVertexContainerName","PrimaryVertices","Key of offline primary vertexes"};
- SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_EFHistoPrmVtx","Key of online bjet primary vertexes"};
+ SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_IDVertex_FS","Key of online bjet primary vertexes"};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_onlineTrackContainerKey {this,"OnlineTrackContainerName","HLT_IDTrack_Bjet_IDTrig","Key of online tracks of bjets"};
ToolHandle<Trig::TrigDecisionTool> m_trigDec; //!
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 4c6d6d8264b15120f44708ce97cdb6b23bdba059..235f6af57abc37b174a10eafba5028cb98047fa0 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -287,10 +287,16 @@ TriggerHLTListRun3 = [
('xAOD::JetContainer#HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetAuxContainer#HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+ # FS tracks
('xAOD::TrackParticleContainer#HLT_IDTrack_FS_FTF', 'BS ESD AODFULL', 'Jet'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_FS_FTFAux.', 'BS ESD AODFULL', 'Jet'),
- # custom BeamSpot tracks - we don't want to write these out in general so this
+ # FS vertices
+ ('xAOD::VertexContainer#HLT_IDVertex_FS', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::VertexAuxContainer#HLT_IDVertex_FSAux.', 'BS ESD AODFULL', 'Jet'),
+
+
+ # custom BeamSpot tracks - we don't want to write these out in general so this
# is commented, if we want to write them out at some point, then these lines
# should be uncommented and they should get written out
# ('xAOD::TrackParticleContainer#HLT_IDTrack_BeamSpot_FTF', 'BS ESD AODFULL', 'ID', 'inViews:beamspotViewRoIs' ),
@@ -367,9 +373,6 @@ TriggerHLTListRun3 = [
('xAOD::JetContainer#HLT_GSCJet', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet', 'inViews:BTagViews'),
('xAOD::JetAuxContainer#HLT_GSCJetAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
- # vertex for b-jets
- ('xAOD::VertexContainer#HLT_EFHistoPrmVtx', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
- ('xAOD::VertexAuxContainer#HLT_EFHistoPrmVtxAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
# bjet b-tagging
('xAOD::BTaggingContainer#HLT_BTagging', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet', 'inViews:BTagViews'),
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 56188de40fa2cb65e71647363678e011c361ccca..bd983492a07456dd75086f98819fcb1e4754fa43 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -614,7 +614,7 @@ if opt.reverseViews or opt.filterViews:
viewMakers = collectViewMakers( topSequence )
theFilter = []
if opt.filterViews:
- theFilter = [ "Cache", "EventInfo", "HLT_EFHistoPrmVtx" ]
+ theFilter = [ "Cache", "EventInfo", "HLT_IDVertex_FS" ]
for alg in viewMakers:
alg.ReverseViewsDebug = opt.reverseViews
alg.FallThroughFilter = theFilter
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index da405570bc0df65ac541a7da39f13e7a65fb3e42..53a1a5e9058f3f8a7c479724779852282f7fe45c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -25,7 +25,7 @@ def getBJetSequence():
# ====================================================================================================
def bJetStep2Sequence():
- prmVtxKey = "HLT_EFHistoPrmVtx"
+ prmVtxKey = "HLT_IDVertex_FS"
outputRoIName = "HLT_Roi_Bjet"
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
index b0b6a72fe7b34571ea33426aef46b906f5a51068..b6e791509e2bb946216608219bb7ede9303ca980 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
@@ -144,7 +144,7 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
gscDepth = "EM3"
if "gsc" in jetRecoDict["jetCalib"]:
gscDepth = "trackWIDTH"
- pvname = "HLT_EFHistoPrmVtx"
+ pvname = "HLT_IDVertex_FS"
elif jetRecoDict["dataType"]=="pf":
gscDepth = "auto"
@@ -152,7 +152,7 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
calibSeq = "JetArea_Residual_EtaJES_GSC"
if jetRecoDict["jetCalib"].endswith("IS"):
calibSeq += "_Insitu"
- pvname = "HLT_EFHistoPrmVtx"
+ pvname = "HLT_IDVertex_FS"
calibSpec = ":".join( [calibContext, dataSource, calibSeq, rhoKey, pvname, gscDepth] )
from .TriggerJetMods import ConstitFourMom_copy
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
index 23a12bd0493f1d732f987b990acade362969a4e4..97789cf114ee819440148b76cdcfb02ce60e326c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
@@ -20,10 +20,10 @@ def JetTrackingSequence(dummyFlags,trkopt,RoIs):
viewAlgs = makeInDetAlgsNoView( "JetFS", "FS", rois=RoIs )
jetTrkSeq += viewAlgs
tracksname = recordable("HLT_IDTrack_FS_FTF")
- verticesname = recordable("HLT_EFHistoPrmVtx")
+ verticesname = recordable("HLT_IDVertex_FS")
from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
- vtxAlgs = makeVertices( "jet", "HLT_IDTrack_FS_FTF", verticesname )
+ vtxAlgs = makeVertices( "jet", tracksname, verticesname )
prmVtx = vtxAlgs[-1]
jetTrkSeq += prmVtx
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
index aed3c8e8234227faaf5c0f7900e4703730c47866..8b4318d8a45d55ebd10ef76b653a60188786ea45 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
@@ -121,7 +121,7 @@ class TrkMHTConfig(AlgConfig):
# These are the names set by the upstream algorithms. Unfortunately
# these aren't passed to us - we just have to 'know' them
tracks = "HLT_IDTrack_FS_FTF"
- vertices = "HLT_EFHistoPrmVtx"
+ vertices = "HLT_IDVertex_FS"
tva = "JetTrackVtxAssoc_{trkopt}".format(**jetRecoDict)
track_links = "GhostTrack_{trkopt}".format(**jetRecoDict)
@@ -164,7 +164,7 @@ class PFSumConfig(AlgConfig):
constit_mod_seq = getConstitModAlg(
constit, "HLT",
tvaKey="JetTrackVtxAssoc_{trkopt}".format(**jetRecoDict),
- vtxKey="HLT_EFHistoPrmVtx")
+ vtxKey="HLT_IDVertex_FS")
self.inputs = [tcSeq, pfseq, constit_mod_seq]
self.fexAlg = self._make_fex_alg(
HLT__MET__PFSumFex,