From 7d34786bc6be958f422337b974e629e0f739fe9b Mon Sep 17 00:00:00 2001 From: Thiago Tomei Date: Wed, 17 Aug 2022 17:47:41 -0300 Subject: [PATCH 1/6] Update BuildFile.xml --- DataFormats/HLTReco/BuildFile.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/DataFormats/HLTReco/BuildFile.xml b/DataFormats/HLTReco/BuildFile.xml index 6e4c24de1329c..4329d740f10e2 100644 --- a/DataFormats/HLTReco/BuildFile.xml +++ b/DataFormats/HLTReco/BuildFile.xml @@ -11,6 +11,7 @@ + From cf2e7fac32328a2025e8920cee65a0e8f20b1f5b Mon Sep 17 00:00:00 2001 From: Thiago Tomei Date: Wed, 17 Aug 2022 17:48:57 -0300 Subject: [PATCH 2/6] Update BuildFile.xml --- HLTrigger/HLTcore/plugins/BuildFile.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/HLTrigger/HLTcore/plugins/BuildFile.xml b/HLTrigger/HLTcore/plugins/BuildFile.xml index 5b524a1fc1a9b..00f86179be846 100644 --- a/HLTrigger/HLTcore/plugins/BuildFile.xml +++ b/HLTrigger/HLTcore/plugins/BuildFile.xml @@ -9,6 +9,7 @@ + From 4001553db4be13f4effce7a77310fced03afa3a6 Mon Sep 17 00:00:00 2001 From: Thiago Tomei Date: Wed, 17 Aug 2022 17:49:42 -0300 Subject: [PATCH 3/6] Update BuildFile.xml --- HLTrigger/HLTfilters/plugins/BuildFile.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/HLTrigger/HLTfilters/plugins/BuildFile.xml b/HLTrigger/HLTfilters/plugins/BuildFile.xml index 0fa5752dc1a6c..d776b8fec9d3c 100644 --- a/HLTrigger/HLTfilters/plugins/BuildFile.xml +++ b/HLTrigger/HLTfilters/plugins/BuildFile.xml @@ -14,6 +14,7 @@ + From eaa14475f9317f76b9ab5ffe0970a8906e5262a8 Mon Sep 17 00:00:00 2001 From: Thiago Tomei Date: Wed, 17 Aug 2022 17:56:56 -0300 Subject: [PATCH 4/6] Update classes_def.xml Remove intermediate versions of DataFormats/HLTReco/src/classes_def.xml --- DataFormats/HLTReco/src/classes_def.xml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/DataFormats/HLTReco/src/classes_def.xml b/DataFormats/HLTReco/src/classes_def.xml index 7c683ec816624..c0da653aa6527 100644 --- a/DataFormats/HLTReco/src/classes_def.xml +++ b/DataFormats/HLTReco/src/classes_def.xml @@ -43,18 +43,16 @@ - - - + + - - - + + @@ -71,9 +69,8 @@ - - - + + @@ -81,9 +78,8 @@ - - - + + From e782cbb18cbb66a5e7d5bdb94b986298257a445e Mon Sep 17 00:00:00 2001 From: Thiago Tomei Date: Wed, 17 Aug 2022 18:03:14 -0300 Subject: [PATCH 5/6] Update L1TTkMuonFilter.cc Remove unneeded extra object, add once again the objects to the filterproduct. --- HLTrigger/HLTfilters/plugins/L1TTkMuonFilter.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/HLTrigger/HLTfilters/plugins/L1TTkMuonFilter.cc b/HLTrigger/HLTfilters/plugins/L1TTkMuonFilter.cc index b47b4c8e33ab8..36bcb5edabf97 100644 --- a/HLTrigger/HLTfilters/plugins/L1TTkMuonFilter.cc +++ b/HLTrigger/HLTfilters/plugins/L1TTkMuonFilter.cc @@ -120,13 +120,16 @@ bool L1TTkMuonFilter::hltFilter(edm::Event& iEvent, double offlinePt = this->TkMuonOfflineEt(itkMuon->phPt(), itkMuon->phEta()); bool passesQual = !applyQuality_ || qualityCut_(*itkMuon); if (passesQual && offlinePt >= min_Pt_ && itkMuon->phEta() <= max_Eta_ && itkMuon->phEta() >= min_Eta_) { - l1t::TrackerMuonRef ref(l1t::TrackerMuonRef(tkMuons, distance(atrkmuons, itkMuon))); + l1t::TrackerMuonRef ref(tkMuons, distance(atrkmuons, itkMuon)); if (!applyDuplicateRemoval_ || !isDupMuon(ref, passingMuons)) { passingMuons.push_back(ref); } } } - + for (const auto& muon : passingMuons) { + filterproduct.addObject(trigger::TriggerObjectType::TriggerL1TkMu, muon); + } + // return with final filter decision const bool accept(static_cast(passingMuons.size()) >= min_N_); return accept; From 7662e95b3df05059362cef808debc9c667b21055 Mon Sep 17 00:00:00 2001 From: Thiago Tomei Date: Wed, 17 Aug 2022 18:06:45 -0300 Subject: [PATCH 6/6] Update hltTriggerSummaryAOD_cfi.py As of this round, the L1T emulator is run previously (in the "HLT" step) and with modules with different tags ("L1Tk*"). We adapt the hltTriggerSummaryAOD to these conditions. This can, of course, be revisited later. --- .../python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py index 27073fa207160..d31392edeefc5 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltTriggerSummaryAOD_cfi.py @@ -2,7 +2,7 @@ hltTriggerSummaryAOD = cms.EDProducer( "TriggerSummaryProducerAOD", throw = cms.bool( False ), - processName = cms.string( "@" ), - moduleLabelPatternsToMatch = cms.vstring( 'hlt*' ), + processName = cms.string( "HLT" ), + moduleLabelPatternsToMatch = cms.vstring( 'hlt*','L1Tk*' ), moduleLabelPatternsToSkip = cms.vstring( ) )