From 0aa4d5525f1c6bc0ebad30341db5d010988013ac Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 8 Sep 2022 22:29:01 +0200 Subject: [PATCH 1/8] Updating L1 Emulation to run and save Tk objects (cherry picked from commit e6d49f52c3fef2c4c83478bb8be8fe8c44919233) (cherry picked from commit 8ec852af2c6f5435d529ccd056c3eefc121d496e) --- DataFormats/L1Trigger/interface/TkJetWord.h | 26 ++--------- DataFormats/L1Trigger/src/TkJetWord.cc | 43 +++++++++++++++++++ DataFormats/L1Trigger/src/classes_def.xml | 2 + .../python/L1Trigger_EventContent_cff.py | 10 +++++ .../Configuration/python/SimL1Emulator_cff.py | 10 ++--- 5 files changed, 64 insertions(+), 27 deletions(-) create mode 100644 DataFormats/L1Trigger/src/TkJetWord.cc diff --git a/DataFormats/L1Trigger/interface/TkJetWord.h b/DataFormats/L1Trigger/interface/TkJetWord.h index 2813b8728f4f9..a4f12dd57b627 100644 --- a/DataFormats/L1Trigger/interface/TkJetWord.h +++ b/DataFormats/L1Trigger/interface/TkJetWord.h @@ -1,6 +1,9 @@ #ifndef FIRMWARE_TkJetWord_h #define FIRMWARE_TkJetWord_h +// Class to store the 96-bit TkJet word for L1 Track Trigger. +// Author: Emily MacDonald, updated by Benjamin Radburn-Smith (September 2022) + #include #include #include @@ -61,28 +64,7 @@ namespace l1t { public: // ----------Constructors -------------------------- TkJetWord() {} - TkJetWord(pt_t pt, glbeta_t eta, glbphi_t phi, z0_t z0, nt_t nt, nx_t nx, tkjetunassigned_t unassigned) { - std::string word = ""; - word.append(TkJetBitWidths::kUnassignedSize - (unassigned.to_string().length() - 2), '0'); - word = word + (unassigned.to_string().substr(2, unassigned.to_string().length() - 2)); - word.append(TkJetBitWidths::kXtSize - (nx.to_string().length() - 2), '0'); - word = word + (nx.to_string().substr(2, nx.to_string().length() - 2)); - word.append(TkJetBitWidths::kNtSize - (nt.to_string().length() - 2), '0'); - word = word + (nt.to_string().substr(2, nt.to_string().length() - 2)); - word.append(TkJetBitWidths::kZ0Size - (z0.to_string().length() - 2), '0'); - word = word + (z0.to_string().substr(2, z0.to_string().length() - 2)); - word.append(TkJetBitWidths::kGlbPhiSize - (phi.to_string().length() - 2), '0'); - word = word + (phi.to_string().substr(2, phi.to_string().length() - 2)); - word.append(TkJetBitWidths::kGlbEtaSize - (eta.to_string().length() - 2), '0'); - word = word + (eta.to_string().substr(2, eta.to_string().length() - 2)); - ap_ufixed pt_2 = pt; - ap_uint pt_temp = pt_2 << 5; - word.append(TkJetBitWidths::kPtSize - (pt_temp.to_string().length() - 2), '0'); - word = word + (pt_temp.to_string().substr(2, pt_temp.to_string().length() - 2)); - - tkjetword_bs_t tmp(word); - tkJetWord_ = tmp; - } + TkJetWord(pt_t pt, glbeta_t eta, glbphi_t phi, z0_t z0, nt_t nt, nx_t nx, tkjetunassigned_t unassigned); ~TkJetWord() {} diff --git a/DataFormats/L1Trigger/src/TkJetWord.cc b/DataFormats/L1Trigger/src/TkJetWord.cc new file mode 100644 index 0000000000000..0903ef7d8e835 --- /dev/null +++ b/DataFormats/L1Trigger/src/TkJetWord.cc @@ -0,0 +1,43 @@ +// Class to store the 96-bit TkJet word for L1 Track Trigger. +// Author: Benjamin Radburn-Smith (September 2022) + +#include "DataFormats/L1Trigger/interface/TkJetWord.h" + +namespace l1t { + TkJetWord::TkJetWord(pt_t pt, glbeta_t eta, glbphi_t phi, z0_t z0, nt_t nt, nx_t nx, tkjetunassigned_t unassigned) { + setTkJetWord(pt, eta, phi, z0, nt, nx, unassigned); + } + + void TkJetWord::setTkJetWord(pt_t pt, glbeta_t eta, glbphi_t phi, z0_t z0, nt_t nt, nx_t nx, tkjetunassigned_t unassigned) { + // pack the TkJet word + unsigned int offset = 0; + for (unsigned int b = offset; b < (offset + TkJetBitWidths::kPtSize); b++) { + tkJetWord_.set(b, pt[b - offset]); + } + offset += TkJetBitWidths::kPtSize; + for (unsigned int b = offset; b < (offset + TkJetBitWidths::kGlbEtaSize); b++) { + tkJetWord_.set(b, eta[b - offset]); + } + offset += TkJetBitWidths::kGlbEtaSize; + for (unsigned int b = offset; b < (offset + TkJetBitWidths::kGlbPhiSize); b++) { + tkJetWord_.set(b, phi[b - offset]); + } + offset += TkJetBitWidths::kGlbPhiSize; + for (unsigned int b = offset; b < (offset + TkJetBitWidths::kZ0Size); b++) { + tkJetWord_.set(b, z0[b - offset]); + } + offset += TkJetBitWidths::kZ0Size; + for (unsigned int b = offset; b < (offset + TkJetBitWidths::kNtSize); b++) { + tkJetWord_.set(b, nt[b - offset]); + } + offset += TkJetBitWidths::kNtSize; + for (unsigned int b = offset; b < (offset + TkJetBitWidths::kXtSize); b++) { + tkJetWord_.set(b, nx[b - offset]); + } + offset += TkJetBitWidths::kXtSize; + for (unsigned int b = offset; b < (offset + TkJetBitWidths::kUnassignedSize); b++) { + tkJetWord_.set(b, unassigned[b - offset]); + } + } + +} //namespace l1t \ No newline at end of file diff --git a/DataFormats/L1Trigger/src/classes_def.xml b/DataFormats/L1Trigger/src/classes_def.xml index 0fd97a17634f2..6b4f9444aaf04 100644 --- a/DataFormats/L1Trigger/src/classes_def.xml +++ b/DataFormats/L1Trigger/src/classes_def.xml @@ -309,5 +309,7 @@ + + diff --git a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py index f2c5c54f439c9..02cb8b640241f 100644 --- a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py +++ b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py @@ -178,6 +178,16 @@ def _appendPhase2Digis(obj): 'keep *_l1tEGammaClusterEmuProducer_*_*', 'keep *_l1tVertexFinder_*_*', 'keep *_l1tVertexFinderEmulator_*_*', + 'keep *_l1tTrackJets_*_*', + 'keep *_l1tTrackJetsExtended_*_*', + 'keep *_l1tTrackFastJets_*_*', + 'keep *_l1tTrackerEtMiss_*_*', + 'keep *_l1tTrackerHTMiss_*_*', + 'keep *_l1tTrackJetsEmulation_*_*', + 'keep *_l1tTrackJetsExtendedEmulation_*_*', + 'keep *_l1tTrackerEmuEtMiss_*_*', + 'keep *_l1tTrackerEmuHTMiss_*_*', + 'keep *_l1tTrackerEmuHTMissExtended_*_*', 'keep *_l1tTowerCalibration_*_*', 'keep *_l1tCaloJet_*_*', 'keep *_l1tCaloJetHTT_*_*', diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index e2474fe8a7304..ec92157ec8e37 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -150,14 +150,14 @@ from L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi import * from L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi import * # make the input tags consistent with the choice L1VertexFinder above -l1tTrackJets.L1PVertexCollection = ("L1VertexFinder", "l1vertices") -l1tTrackJetsExtended.L1PVertexCollection = ("L1VertexFinder", "l1vertices") -#L1TrackerEtMiss.L1VertexInputTag = ("L1VertexFinder", "l1vertices") -#L1TrackerEtMissExtended.L1VertexInputTag = ("L1VertexFinder", "l1vertices") +l1tTrackJets.L1PVertexCollection = ("l1tVertexFinder", "l1vertices") +L1TrackFastJets.L1PrimaryVertexTag = ("l1tVertexFinder", "l1vertices") +l1tTrackJetsExtended.L1PVertexCollection = ("l1tVertexFinder", "l1vertices") +l1tTrackerEtMiss.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") +l1tTrackerEtMissExtended.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") _phase2_siml1emulator.add(l1tTrackJets) _phase2_siml1emulator.add(l1tTrackJetsExtended) _phase2_siml1emulator.add(l1tTrackFastJets) - _phase2_siml1emulator.add(l1tTrackerEtMiss) _phase2_siml1emulator.add(l1tTrackerHTMiss) From 167405645fd42e3067bff368c3cea399ab2980fe Mon Sep 17 00:00:00 2001 From: ccaillol Date: Thu, 15 Sep 2022 13:33:41 +0200 Subject: [PATCH 2/8] Updates to event content for tau-jet-MET PR1047 l1toffline (cherry picked from commit 3501c7b6da363566dd484cf41f7e098eaa30e314) --- L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py index 02cb8b640241f..6d806be74b66f 100644 --- a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py +++ b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py @@ -204,6 +204,9 @@ def _appendPhase2Digis(obj): 'keep *_l1tPhase1JetProducer_*_*', 'keep *_l1tPhase1JetCalibrator_*_*', 'keep *_l1tPhase1JetSumsProducer_*_*', + 'keep *_l1tPhase1JetProducer9x9_*_*', + 'keep *_l1tPhase1JetCalibrator9x9_*_*', + 'keep *_l1tPhase1JetSumsProducer9x9_*_*', 'keep *_l1tLayer1Barrel_*_*', 'keep *_l1tLayer1HGCal_*_*', 'keep *_l1tLayer1HGCalNoTK_*_*', @@ -213,6 +216,8 @@ def _appendPhase2Digis(obj): 'keep *_l1tMETPFProducer_*_*', 'keep *_l1tNNTauProducer_*_*', 'keep *_l1tNNTauProducerPuppi_*_*', + 'keep *_HPSPFTauProducerPF_*_*', + 'keep *_HPSPFTauProducerPuppi_*_*', 'keep *_TTStubsFromPhase2TrackerDigis_*_*', 'keep *_TTClustersFromPhase2TrackerDigis_*_*', 'keep *_l1tTTTracksFromExtendedTrackletEmulation_*_*', From 23ef20de14b77a7f180e1fb4405ead00b3e03301 Mon Sep 17 00:00:00 2001 From: ccaillol Date: Thu, 15 Sep 2022 14:08:05 +0200 Subject: [PATCH 3/8] code format (cherry picked from commit 3e7a998d18fff490420f08e82bcf535116fa0990) --- DataFormats/L1Trigger/src/TkJetWord.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DataFormats/L1Trigger/src/TkJetWord.cc b/DataFormats/L1Trigger/src/TkJetWord.cc index 0903ef7d8e835..2464c4a2db941 100644 --- a/DataFormats/L1Trigger/src/TkJetWord.cc +++ b/DataFormats/L1Trigger/src/TkJetWord.cc @@ -8,7 +8,8 @@ namespace l1t { setTkJetWord(pt, eta, phi, z0, nt, nx, unassigned); } - void TkJetWord::setTkJetWord(pt_t pt, glbeta_t eta, glbphi_t phi, z0_t z0, nt_t nt, nx_t nx, tkjetunassigned_t unassigned) { + void TkJetWord::setTkJetWord( + pt_t pt, glbeta_t eta, glbphi_t phi, z0_t z0, nt_t nt, nx_t nx, tkjetunassigned_t unassigned) { // pack the TkJet word unsigned int offset = 0; for (unsigned int b = offset; b < (offset + TkJetBitWidths::kPtSize); b++) { From 7df8f296d694400d333b21003d5f346bb731d2bf Mon Sep 17 00:00:00 2001 From: ccaillol Date: Thu, 15 Sep 2022 15:38:06 +0200 Subject: [PATCH 4/8] fix addon (cherry picked from commit d1362be6c0dc0312743dfa8d6df43de6379f1855) --- L1Trigger/Configuration/python/SimL1Emulator_cff.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index ec92157ec8e37..bef63830fbd8b 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -151,10 +151,10 @@ from L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi import * # make the input tags consistent with the choice L1VertexFinder above l1tTrackJets.L1PVertexCollection = ("l1tVertexFinder", "l1vertices") -L1TrackFastJets.L1PrimaryVertexTag = ("l1tVertexFinder", "l1vertices") +l1tTrackFastJets.L1PrimaryVertexTag = ("l1tVertexFinder", "l1vertices") l1tTrackJetsExtended.L1PVertexCollection = ("l1tVertexFinder", "l1vertices") -l1tTrackerEtMiss.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") -l1tTrackerEtMissExtended.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") +#l1tTrackerEtMiss.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") +#l1tTrackerEtMissExtended.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") _phase2_siml1emulator.add(l1tTrackJets) _phase2_siml1emulator.add(l1tTrackJetsExtended) _phase2_siml1emulator.add(l1tTrackFastJets) From e7b7589b663a029e145055e020171358c3ec9c6e Mon Sep 17 00:00:00 2001 From: ccaillol Date: Mon, 19 Sep 2022 15:18:39 +0200 Subject: [PATCH 5/8] fix to missing modules (cherry picked from commit 57a365d9030520d4c4a6ad23b4720d0b49dd1598) --- L1Trigger/Configuration/python/SimL1Emulator_cff.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py index bef63830fbd8b..ce08dac0c2d44 100644 --- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py +++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py @@ -127,6 +127,7 @@ l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation" l1tVertexFinderEmulator.l1TracksInputTag = ("l1tGTTInputProducer","Level1TTTracksConverted") _phase2_siml1emulator.add(l1tVertexFinder) +_phase2_siml1emulator.add(l1tVertexProducer) _phase2_siml1emulator.add(l1tGTTInputProducer) _phase2_siml1emulator.add(l1tGTTInputProducerExtended) _phase2_siml1emulator.add(l1tVertexFinderEmulator) @@ -155,6 +156,11 @@ l1tTrackJetsExtended.L1PVertexCollection = ("l1tVertexFinder", "l1vertices") #l1tTrackerEtMiss.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") #l1tTrackerEtMissExtended.L1VertexInputTag = ("l1tVertexFinder", "l1vertices") + +from L1Trigger.L1TTrackMatch.l1tTrackSelectionProducer_cfi import * +_phase2_siml1emulator.add(l1tTrackSelectionProducer) +_phase2_siml1emulator.add(l1tTrackSelectionProducerExtended) + _phase2_siml1emulator.add(l1tTrackJets) _phase2_siml1emulator.add(l1tTrackJetsExtended) _phase2_siml1emulator.add(l1tTrackFastJets) @@ -167,7 +173,7 @@ _phase2_siml1emulator.add(l1tTrackJetsExtendedEmulation) from L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi import * -l1tTrackerEmuEtMiss.L1VertexInputTag = ("L1VertexFinderEmulator","l1verticesEmulation") +l1tTrackerEmuEtMiss.L1VertexInputTag = ("l1tVertexFinderEmulator","l1verticesEmulation") _phase2_siml1emulator.add(l1tTrackerEmuEtMiss) from L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi import * From 2f0faab255e16d4790056262595a5c4a257f0afd Mon Sep 17 00:00:00 2001 From: ccaillol Date: Mon, 19 Sep 2022 15:26:32 +0200 Subject: [PATCH 6/8] fix Phase1L1TJets (cherry picked from commit 9e4475eb874f2ecbd494bb8ef0e2a29936891818) --- L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetSumsProducer.cc | 2 +- L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetSumsProducer.cc b/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetSumsProducer.cc index 4b76c8b9e007b..673f74f968c09 100644 --- a/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetSumsProducer.cc +++ b/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetSumsProducer.cc @@ -182,7 +182,7 @@ l1t::EtSum Phase1L1TJetSumsProducer::computeMHT(const edm::Handle("inputJetCollectionTag", - edm::InputTag("Phase1L1TJetCalibrator", "Phase1L1TJetFromPfCandidates")); + edm::InputTag("l1tPhase1JetCalibrator", "Phase1L1TJetFromPfCandidates")); desc.add >("sinPhi"); desc.add >("cosPhi"); desc.add("nBinsPhi", 72); diff --git a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py index b63d3217f6262..a2194054afd1f 100644 --- a/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py +++ b/L1Trigger/L1CaloTrigger/python/Phase1L1TJets_9x9_cff.py @@ -16,7 +16,7 @@ ) l1tPhase1JetSumsProducer9x9 = l1tPhase1JetSumsProducer.clone( - inputJetCollectionTag = ("Phase1L1TJetCalibrator9x9", "Phase1L1TJetFromPfCandidates"), + inputJetCollectionTag = ("l1tPhase1JetCalibrator9x9", "Phase1L1TJetFromPfCandidates"), ) L1TPhase1JetsSequence9x9 = cms.Sequence( From 206f707664356258fd2a3419c1dce9982404ef78 Mon Sep 17 00:00:00 2001 From: ccaillol Date: Mon, 3 Oct 2022 10:37:11 +0200 Subject: [PATCH 7/8] fix tau collection --- L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py index 6d806be74b66f..2a0934164d956 100644 --- a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py +++ b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py @@ -216,8 +216,8 @@ def _appendPhase2Digis(obj): 'keep *_l1tMETPFProducer_*_*', 'keep *_l1tNNTauProducer_*_*', 'keep *_l1tNNTauProducerPuppi_*_*', - 'keep *_HPSPFTauProducerPF_*_*', - 'keep *_HPSPFTauProducerPuppi_*_*', + 'keep *_l1tHPSPFTauProducerPF_*_*', + 'keep *_l1tHPSPFTauProducerPuppi_*_*', 'keep *_TTStubsFromPhase2TrackerDigis_*_*', 'keep *_TTClustersFromPhase2TrackerDigis_*_*', 'keep *_l1tTTTracksFromExtendedTrackletEmulation_*_*', From 3aeb57b81a984205ea7a3be9265b3a48b4928dbb Mon Sep 17 00:00:00 2001 From: ccaillol Date: Mon, 3 Oct 2022 12:39:09 +0200 Subject: [PATCH 8/8] fix input collections --- L1Trigger/L1TTrackMatch/plugins/L1TrackSelectionProducer.cc | 6 +++--- L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/L1Trigger/L1TTrackMatch/plugins/L1TrackSelectionProducer.cc b/L1Trigger/L1TTrackMatch/plugins/L1TrackSelectionProducer.cc index dbe75da651992..a5a7f37645157 100644 --- a/L1Trigger/L1TTrackMatch/plugins/L1TrackSelectionProducer.cc +++ b/L1Trigger/L1TTrackMatch/plugins/L1TrackSelectionProducer.cc @@ -599,10 +599,10 @@ void L1TrackSelectionProducer::produce(edm::StreamID, edm::Event& iEvent, const void L1TrackSelectionProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //L1TrackSelectionProducer edm::ParameterSetDescription desc; - desc.add("l1TracksInputTag", edm::InputTag("TTTracksFromTrackletEmulation", "Level1TTTracks")); - desc.addOptional("l1VerticesInputTag", edm::InputTag("L1VertexFinder", "l1vertices")); + desc.add("l1TracksInputTag", edm::InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks")); + desc.addOptional("l1VerticesInputTag", edm::InputTag("l1tVertexFinder", "l1vertices")); desc.addOptional("l1VerticesEmulationInputTag", - edm::InputTag("L1VertexFinderEmulator", "l1verticesEmulation")); + edm::InputTag("l1tVertexFinderEmulator", "l1verticesEmulation")); desc.add("outputCollectionName", "Level1TTTracksSelected"); { edm::ParameterSetDescription descCutSet; diff --git a/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc b/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc index a95f1a62a7120..d974c36286eac 100644 --- a/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc +++ b/L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc @@ -220,7 +220,7 @@ void HPSPFTauProducer::fillDescriptions(edm::ConfigurationDescriptions& descript desc.add("minSeedJetPt", 30.0); desc.add("maxChargedRelIso", 1.0); desc.add("minSeedChargedPFCandPt", 5.0); - desc.add("srcL1PFCands", edm::InputTag("l1ctLayer1", "PF")); + desc.add("srcL1PFCands", edm::InputTag("l1tLayer1", "PF")); desc.add("stripSizeEta", 0.05); desc.add("maxLeadChargedPFCandEta", 2.4); desc.add("deltaRCleaning", 0.4); @@ -230,7 +230,7 @@ void HPSPFTauProducer::fillDescriptions(edm::ConfigurationDescriptions& descript desc.add("maxSeedChargedPFCandEta", 2.4); desc.add("applyPreselection", false); desc.add("isolationConeSize", 0.4); - desc.add("srcL1Vertices", edm::InputTag("L1VertexFinderEmulator", "l1verticesEmulation")); + desc.add("srcL1Vertices", edm::InputTag("l1tVertexFinderEmulator", "l1verticesEmulation")); desc.add("maxChargedIso", 1000.0); { edm::ParameterSetDescription psd0;