Skip to content

Commit

Permalink
Harmonize l1vertices to L1Vertices
Browse files Browse the repository at this point in the history
Port note: files not present in master removed:
L1Trigger/L1TNtuples/plugins/L1PhaseIITreeProducer.cc
L1Trigger/L1TNtuples/plugins/L1PhaseIITreeStep1Producer.cc
L1Trigger/L1TNtuples/python/l1PhaseIITreeProducer_cfi.py
L1Trigger/L1TNtuples/python/l1PhaseIITreeStep1Producer_cfi.py
  • Loading branch information
Nick Manganelli committed Jun 29, 2023
1 parent 84d3e90 commit 8bfd955
Show file tree
Hide file tree
Showing 24 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
OuterTrackerTkMET = DQMEDAnalyzer('L1TPhase2OuterTrackerTkMET',
TopFolderName = cms.string('L1T/L1TPhase2/'),
TTTracksTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"),
L1VertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"),
L1VertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
maxZ0 = cms.double ( 15. ) , # in cm
maxEta = cms.double ( 2.4 ) ,
chi2dofMax = cms.double( 10. ),
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ void GTTFileWriter::fillDescriptions(edm::ConfigurationDescriptions& description
desc.addUntracked<edm::InputTag>(
"vertexAssociatedTracks",
edm::InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedAssociatedEmulation"));
desc.addUntracked<edm::InputTag>("vertices", edm::InputTag("l1tVertexProducer", "l1verticesEmulation"));
desc.addUntracked<edm::InputTag>("vertices", edm::InputTag("l1tVertexProducer", "L1VerticesEmulation"));
desc.addUntracked<edm::InputTag>("jets", edm::InputTag("l1tTrackJetsEmulation", "L1TrackJets"));
desc.addUntracked<edm::InputTag>("htmiss", edm::InputTag("l1tTrackerEmuHTMiss", "L1TrackerEmuHTMiss"));
desc.addUntracked<edm::InputTag>("etmiss", edm::InputTag("l1tTrackerEmuEtMiss", "L1TrackerEmuEtMiss"));
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/DemonstratorTools/python/l1tGTTFileWriter_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
l1tGTTFileWriter = cms.EDAnalyzer('GTTFileWriter',
tracks = cms.untracked.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"),
convertedTracks = cms.untracked.InputTag("l1tGTTInputProducer", "Level1TTTracksConverted"),
vertices = cms.untracked.InputTag("l1tVertexProducer", "l1verticesEmulation"),
vertices = cms.untracked.InputTag("l1tVertexProducer", "L1VerticesEmulation"),
selectedTracks = cms.untracked.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedEmulation"),
vertexAssociatedTracks = cms.untracked.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedAssociatedEmulation"),
jets = cms.untracked.InputTag("l1tTrackJetsEmulation","L1TrackJets"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
process.l1tGTTFileWriter.tracks = cms.untracked.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks")
process.l1tGTTFileWriter.convertedTracks = cms.untracked.InputTag("l1tGTTInputProducer", "Level1TTTracksConverted")
process.l1tGTTFileWriter.selectedTracks = cms.untracked.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedEmulation")
process.l1tGTTFileWriter.vertices = cms.untracked.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation")
process.l1tGTTFileWriter.vertices = cms.untracked.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation")
process.l1tGTTFileWriter.vertexAssociatedTracks = cms.untracked.InputTag("l1tTrackVertexAssociationProducer", "Level1TTTracksSelectedAssociatedEmulation")
process.l1tGTTFileWriter.jets = cms.untracked.InputTag("l1tTrackJetsEmulation","L1TrackJets")
process.l1tGTTFileWriter.htmiss = cms.untracked.InputTag("l1tTrackerEmuHTMiss", "L1TrackerEmuHTMiss")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ void L1FastTrackingJetProducer::fillDescriptions(edm::ConfigurationDescriptions&
// L1FastTrackingJets
edm::ParameterSetDescription desc;
desc.add<edm::InputTag>("L1TrackInputTag", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"));
desc.add<std::string>("L1PrimaryVertexTag", "l1vertices");
desc.add<std::string>("L1PrimaryVertexTag", "L1Vertices");
desc.add<edm::InputTag>("GenInfo", edm::InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks"));
desc.add<double>("trk_zMax", 15.0);
desc.add<double>("trk_chi2dofMax", 10.0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ void L1TrackJetEmulatorProducer::fillDescriptions(ConfigurationDescriptions &des
// Please change this to state exactly what you do use, even if it is no parameters
ParameterSetDescription desc;
desc.add<edm::InputTag>("L1TrackInputTag", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"));
desc.add<edm::InputTag>("L1PVertexInputTag", edm::InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"));
desc.add<edm::InputTag>("L1PVertexInputTag", edm::InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"));
desc.add<double>("MaxDzTrackPV", 1.0);
desc.add<double>("trk_zMax", 15.0);
desc.add<double>("trk_ptMax", 200.0);
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TTrackMatch/plugins/L1TrackJetProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ void L1TrackJetProducer::produce(Event &iEvent, const EventSetup &iSetup) {
void L1TrackJetProducer::fillDescriptions(ConfigurationDescriptions &descriptions) {
ParameterSetDescription desc;
desc.add<edm::InputTag>("L1TrackInputTag", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"));
desc.add<edm::InputTag>("L1PVertexInputTag", edm::InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"));
desc.add<edm::InputTag>("L1PVertexInputTag", edm::InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"));
desc.add<double>("MaxDzTrackPV", 1.0);
desc.add<double>("trk_zMax", 15.0);
desc.add<double>("trk_ptMax", 200.0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,9 @@ void L1TrackVertexAssociationProducer::fillDescriptions(edm::ConfigurationDescri
edm::InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelected"));
desc.add<edm::InputTag>("l1SelectedTracksEmulationInputTag",
edm::InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedEmulation"));
desc.add<edm::InputTag>("l1VerticesInputTag", edm::InputTag("l1tVertexFinder", "l1vertices"));
desc.add<edm::InputTag>("l1VerticesInputTag", edm::InputTag("l1tVertexFinder", "L1Vertices"));
desc.add<edm::InputTag>("l1VerticesEmulationInputTag",
edm::InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"));
edm::InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"));
desc.add<std::string>("outputCollectionName", "Level1TTTracksSelectedAssociated");
{
edm::ParameterSetDescription descCutSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

l1tFastTrackingJets = cms.EDProducer("L1FastTrackingJetProducer",
L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "l1vertices"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "L1Vertices"),
GenInfo = cms.InputTag("TTTrackAssociatorFromPixelDigis", "Level1TTTracks"),
trk_zMax = cms.double(15.), # max track z0 [cm]
trk_chi2dofMax = cms.double(10.), # max track chi2/dof
Expand All @@ -24,7 +24,7 @@

l1tFastTrackingJetsExtended = cms.EDProducer("L1FastTrackingJetProducer",
L1TrackInputTag = cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "Level1TTTracks"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "l1vertices"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexProducer", "L1Vertices"),
GenInfo = cms.InputTag("TTTrackAssociatorFromPixelDigisExtended", "Level1TTTracks"),
trk_zMax = cms.double(15.), # max track z0 [cm]
trk_chi2dofMax = cms.double(40.), # max track chi2 for extended tracks
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1TTrackMatch/python/l1tTrackFastJets_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

l1tTrackFastJets = cms.EDProducer("L1TrackFastJetProducer",
L1TrackInputTag = cms.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexFinder", "l1vertices"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexFinder", "L1Vertices"),
trk_zMax = cms.double(15.), # max track z0 [cm]
trk_chi2dofMax = cms.double(10.), # max track chi2/dof
trk_bendChi2Max = cms.double(2.2),# max bendChi2 cut
Expand All @@ -20,7 +20,7 @@

l1tTrackFastJetsExtended = cms.EDProducer("L1TrackFastJetProducer",
L1TrackInputTag = cms.InputTag("l1tTTTracksFromExtendedTrackletEmulation", "Level1TTTracks"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexFinder", "l1vertices"),
L1PrimaryVertexTag=cms.InputTag("l1tVertexFinder", "L1Vertices"),
trk_zMax = cms.double(15.), # max track z0 [cm]
trk_chi2dofMax = cms.double(40.), # max track chi2 for extended tracks
trk_bendChi2Max = cms.double(2.4),#Bendchi2 cut for extended tracks
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1TTrackMatch/python/l1tTrackJetsEmulation_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

l1tTrackJetsEmulation = cms.EDProducer('L1TrackJetEmulatorProducer',
L1TrackInputTag= cms.InputTag("l1tTrackVertexAssociationProducerForJets", "Level1TTTracksSelectedAssociatedEmulation"),
L1PVertexInputTag=cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"),
L1PVertexInputTag=cms.InputTag("l1tVertexFinderEmulator","L1VerticesEmulation"),
MaxDzTrackPV = cms.double(1.0),
trk_zMax = cms.double (15.) , # maximum track z
trk_ptMax = cms.double(200.), # maximumum track pT before saturation [GeV]
Expand Down Expand Up @@ -33,7 +33,7 @@

l1tTrackJetsExtendedEmulation = l1tTrackJetsEmulation.clone(
L1TrackInputTag= cms.InputTag("l1tTrackVertexAssociationProducerExtendedForJets", "Level1TTTracksExtendedSelectedAssociatedEmulation"),
L1PVertexInputTag=cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"),
L1PVertexInputTag=cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
minTrkJetpT= 5.0, # minimum track pt to be considered for track jet
MaxDzTrackPV = 5.0,
d0_cutNStubs4= -1, # -1 excludes nstub=4 from disp tag
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TTrackMatch/python/l1tTrackJets_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#prompt jet selection
l1tTrackJets = cms.EDProducer('L1TrackJetProducer',
L1TrackInputTag = cms.InputTag("l1tTrackVertexAssociationProducerForJets", "Level1TTTracksSelectedAssociated"),
L1PVertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"),
L1PVertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
MaxDzTrackPV = cms.double( 1.0 ), #max distance from PV;negative=no cut
trk_zMax = cms.double (15.) , # maximum track z
trk_ptMax = cms.double(200.), # maximumum track pT before saturation [GeV]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
l1SelectedTracksInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelected"),
l1SelectedTracksEmulationInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelectedEmulation"),
# If no vertex collection is provided, then the DeltaZ cuts will not be run
l1VerticesInputTag = cms.InputTag("l1tVertexFinder", "l1vertices"),
l1VerticesEmulationInputTag = cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"),
l1VerticesInputTag = cms.InputTag("l1tVertexFinder", "L1Vertices"),
l1VerticesEmulationInputTag = cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
outputCollectionName = cms.string("Level1TTTracksSelectedAssociated"),
cutSet = cms.PSet(
#deltaZMaxEtaBounds = cms.vdouble(0.0, absEtaMax.value), # these values define the bin boundaries in |eta|
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1TTrackMatch/python/l1tTrackerEmuEtMiss_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
L1TrackAssociatedInputTag = cms.InputTag("l1tTrackVertexAssociationProducerForEtMiss", "Level1TTTracksSelectedAssociatedEmulation"),
# To bypass GTT input module use cms.InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks")
# and set useGTTinput to false
L1VertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"),
L1VertexInputTag = cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
# This will use the vertex algorithm as specified in l1tVertexProducer_cfi, if using emulated vertex
# set useVertexEmulator to true
L1MetCollectionName = cms.string("L1TrackerEmuEtMiss"),
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/L1TTrackMatch/python/l1tTrackerHTMiss_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

l1tTkCaloHTMiss = cms.EDProducer("L1TkHTMissProducer",
L1TkJetInputTag = cms.InputTag("l1tTkCaloJets", "L1TkCaloJets"),
L1VertexInputTag = cms.InputTag("l1tVertexFinder", "l1vertices"),
L1VertexInputTag = cms.InputTag("l1tVertexFinder", "L1Vertices"),
jet_maxEta = cms.double(2.2), # maximum eta of jets for HT
jet_minPt = cms.double(15.0), # minimum pt of jets for HT [GeV]
jet_minNtracksHighPt=cms.int32(0), #Add track jet quality criteria pT>100
Expand All @@ -20,7 +20,7 @@

l1tTrackerHTMiss = cms.EDProducer("L1TkHTMissProducer",
L1TkJetInputTag = cms.InputTag("l1tTrackJets", "L1TrackJets"),
L1VertexInputTag = cms.InputTag("l1tVertexFinder", "l1vertices"),
L1VertexInputTag = cms.InputTag("l1tVertexFinder", "L1Vertices"),
jet_maxEta = cms.double(2.4),
jet_minPt = cms.double(5.0),
jet_minNtracksLowPt=cms.int32(2),
Expand All @@ -36,7 +36,7 @@

l1tTrackerHTMissExtended = cms.EDProducer("L1TkHTMissProducer",
L1TkJetInputTag = cms.InputTag("l1tTrackJetsExtended", "L1TrackJetsExtended"),
L1VertexInputTag = cms.InputTag("l1tVertexFinder", "l1vertices"),
L1VertexInputTag = cms.InputTag("l1tVertexFinder", "L1Vertices"),
jet_maxEta = cms.double(2.4),
jet_minPt = cms.double(5.0),
jet_minNtracksLowPt=cms.int32(2),
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1TTrackMatch/test/L1TrackMET_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
producerName = producerName.replace(".","p") # legalize the name
producer = process.l1tVertexProducer.clone()
producer.VertexReconstruction.Algorithm = cms.string("fastHisto")
process.l1tTrackerEtMiss.L1VertexInputTag = cms.InputTag(producerName,"l1vertices")
process.l1tTrackerEtMiss.L1VertexInputTag = cms.InputTag(producerName,"L1Vertices")


setattr(process, producerName, producer)
Expand All @@ -100,7 +100,7 @@
EmuproducerName = EmuproducerName.replace(".","p") # legalize the name
Emuproducer = process.l1tVertexProducer.clone()
Emuproducer.VertexReconstruction.Algorithm = cms.string("fastHistoEmulation")
process.l1tTrackerEmuEtMiss.L1VertexInputTag = cms.InputTag(EmuproducerName,"l1verticesEmulation")
process.l1tTrackerEmuEtMiss.L1VertexInputTag = cms.InputTag(EmuproducerName,"L1VerticesEmulation")

if GTTInput:
Emuproducer.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted")
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@
TrackMHTEmuInputTag = cms.InputTag("l1tTrackerEmuHTMiss",process.l1tTrackerEmuHTMiss.L1MHTCollectionName.value()),
TrackMHTEmuExtendedInputTag = cms.InputTag("l1tTrackerEmuHTMissExtended",process.l1tTrackerEmuHTMissExtended.L1MHTCollectionName.value()),
GenParticleInputTag = cms.InputTag("genParticles",""),
RecoVertexInputTag=cms.InputTag("l1tVertexFinder", "l1vertices"),
RecoVertexEmuInputTag=cms.InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"),
RecoVertexInputTag=cms.InputTag("l1tVertexFinder", "L1Vertices"),
RecoVertexEmuInputTag=cms.InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"),
)

process.ntuple = cms.Path(process.L1TrackNtuple)
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/Phase2L1ParticleFlow/plugins/L1BJetProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void L1BJetProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptio
desc.add<int>("nParticles", 10);
desc.add<double>("minPt", 20);
desc.add<double>("maxEta", 2.4);
desc.add<edm::InputTag>("vtx", edm::InputTag("L1VertexFinderEmulator", "l1verticesEmulation"));
desc.add<edm::InputTag>("vtx", edm::InputTag("L1VertexFinderEmulator", "L1VerticesEmulation"));
descriptions.add("L1BJetProducer", desc);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
jets = ("l1tSCPFL1PuppiExtended", ""),
maxJets = 6,
minPt = 10,
vtx = ("l1tVertexFinderEmulator","l1verticesEmulation")
vtx = ("l1tVertexFinderEmulator","L1VerticesEmulation")
)


Expand Down
8 changes: 4 additions & 4 deletions L1Trigger/Phase2L1ParticleFlow/python/l1ctLayer1_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'),
emClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromL1EGClusters:selected')),
hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromCombinedCaloHCal:calibrated')),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","L1VerticesEmulation"),
vtxCollectionEmulation = cms.bool(True),
emPtCut = cms.double(0.5),
hadPtCut = cms.double(1.0),
Expand Down Expand Up @@ -160,7 +160,7 @@
muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'),
emClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters:egamma')), # used only for E/gamma
hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters')),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","L1VerticesEmulation"),
vtxCollectionEmulation = cms.bool(True),
nVtx = cms.int32(1),
emPtCut = cms.double(0.5),
Expand Down Expand Up @@ -310,7 +310,7 @@
muons = cms.InputTag('l1tSAMuonsGmt','promptSAMuons'),
emClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters:egamma')), # used only for E/gamma
hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromHGC3DClusters')),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","L1VerticesEmulation"),
vtxCollectionEmulation = cms.bool(True),
nVtx = cms.int32(1),
emPtCut = cms.double(0.5),
Expand Down Expand Up @@ -396,7 +396,7 @@
useTrackerMuons = cms.bool(False),
emClusters = cms.VInputTag(),
hadClusters = cms.VInputTag(cms.InputTag('l1tPFClustersFromCombinedCaloHF:calibrated')),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","l1verticesEmulation"),
vtxCollection = cms.InputTag("l1tVertexFinderEmulator","L1VerticesEmulation"),
vtxCollectionEmulation = cms.bool(True),
nVtx = cms.int32(1),
emPtCut = cms.double(0.5),
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ void HPSPFTauProducer::fillDescriptions(edm::ConfigurationDescriptions& descript
desc.add<double>("maxSeedChargedPFCandEta", 2.4);
desc.add<bool>("applyPreselection", false);
desc.add<double>("isolationConeSize", 0.4);
desc.add<edm::InputTag>("srcL1Vertices", edm::InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"));
desc.add<edm::InputTag>("srcL1Vertices", edm::InputTag("l1tVertexFinderEmulator", "L1VerticesEmulation"));
desc.add<double>("maxChargedIso", 1000.0);
{
edm::ParameterSetDescription psd0;
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/VertexFinder/python/l1tVertexNTupler_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
l1TracksTPInputTags = cms.InputTag("l1tTPStubValueMapProducer:allMatchedTPs"),
l1TracksTPValueMapInputTags = cms.InputTag("l1tTPStubValueMapProducer:TPs"),
l1TracksBranchNames = cms.vstring('hybrid'),
l1VertexInputTags = cms.VInputTag( cms.InputTag("l1tVertexProducer", "l1vertices") ),
l1VertexInputTags = cms.VInputTag( cms.InputTag("l1tVertexProducer", "L1Vertices") ),
l1VertexTrackInputs = cms.vstring('hybrid'),
l1VertexBranchNames = cms.vstring('fastHisto'),
emulationVertexInputTags = cms.VInputTag(),
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/VertexFinder/python/l1tVertexProducer_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
l1tVertexProducer = cms.EDProducer('VertexProducer',
l1TracksInputTag = cms.InputTag("l1tTrackSelectionProducer", "Level1TTTracksSelected"),

l1VertexCollectionName = cms.string("l1vertices"), #Emulation postfix is appended when fastHistoEmulation is chosen as the algorithm
l1VertexCollectionName = cms.string("L1Vertices"), #Emulation postfix is appended when fastHistoEmulation is chosen as the algorithm

# === Vertex Reconstruction configuration
VertexReconstruction = cms.PSet(
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/VertexFinder/test/vertexNTupler_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
producer.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted")
producerSum = process.L1GTTInputProducer + producerSum

process.l1tVertexNTupler.emulationVertexInputTags.append( cms.InputTag(producerName, 'l1tVerticesEmulation') )
process.l1tVertexNTupler.emulationVertexInputTags.append( cms.InputTag(producerName, 'L1VerticesEmulation') )
process.l1tVertexNTupler.emulationVertexBranchNames.append(algo)
else:
process.l1tVertexNTupler.l1VertexInputTags.append( cms.InputTag(producerName, 'l1tVertices') )
process.l1tVertexNTupler.l1VertexInputTags.append( cms.InputTag(producerName, 'L1Vertices') )
process.l1tVertexNTupler.l1VertexBranchNames.append(algo)
process.l1tVertexNTupler.l1VertexTrackInputs.append('hybrid')

Expand Down Expand Up @@ -146,7 +146,7 @@
setattr(process, producerName, producer)
producerNames += [producerName]
process.l1tVertexNTupler.extraVertexDescriptions += ['DBSCAN(dist={0},minPt={1},minDensity={2},seedTrackPt{3})'.format(dist, minPt, minDensity, seedTrackPt)]
process.l1tVertexNTupler.extraVertexInputTags.append( cms.InputTag(producerName, 'l1tVertices'))
process.l1tVertexNTupler.extraVertexInputTags.append( cms.InputTag(producerName, 'L1Vertices'))
producerSum += producer

print "Total number of producers =", len(additionalProducerAlgorithms)+1
Expand Down

0 comments on commit 8bfd955

Please sign in to comment.