Merge pull request #7 from cms-hlt-phase2/l1t-phase2all

L1t phase2all
cms-sw · Aug 18, 2022 · 0731750 · 0731750
2 parents fb2bed1 + 7662e95
commit 0731750
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/DataFormats/HLTReco/BuildFile.xml b/DataFormats/HLTReco/BuildFile.xml
@@ -11,6 +11,7 @@
 <use name="DataFormats/TauReco"/>
 <use name="DataFormats/L1TParticleFlow"/>
 <use name="DataFormats/L1TCorrelator"/>
+<use name="DataFormats/L1TMuonPhase2"/>
 <use name="DataFormats/GsfTrackReco"/>
 <export>
   <lib name="1"/>

diff --git a/DataFormats/HLTReco/src/classes_def.xml b/DataFormats/HLTReco/src/classes_def.xml
@@ -43,18 +43,16 @@
   </class>
 
   <class name="trigger::TriggerObjectCollection"/>
-  <class name="trigger::TriggerRefsCollections" ClassVersion="18">
-   <version ClassVersion="18" checksum="2974272653"/>
-   <version ClassVersion="17" checksum="3691847911"/>
+  <class name="trigger::TriggerRefsCollections" ClassVersion="17">
+   <version ClassVersion="17" checksum="2974272653"/>
    <version ClassVersion="16" checksum="3574724031"/>
    <version ClassVersion="15" checksum="1920377523"/>
    <version ClassVersion="14" checksum="874193725"/>
    <version ClassVersion="13" checksum="3831523881"/>
    <version ClassVersion="12" checksum="4231679693"/>
   </class>
-  <class name="trigger::TriggerFilterObjectWithRefs" ClassVersion="17">
-   <version ClassVersion="17" checksum="1634484558"/>
-   <version ClassVersion="16" checksum="2972887532"/>
+  <class name="trigger::TriggerFilterObjectWithRefs" ClassVersion="16">
+   <version ClassVersion="16" checksum="1634484558"/>
    <version ClassVersion="15" checksum="2946786356"/>
    <version ClassVersion="14" checksum="4087045168"/>
    <version ClassVersion="13" checksum="2951644382"/>
@@ -71,19 +69,17 @@
    <version ClassVersion="11" checksum="3351458717"/>
    <version ClassVersion="10" checksum="1112210423"/>
   </class>
-  <class name="trigger::TriggerEventWithRefs::TriggerFilterObject" ClassVersion="18">
-   <version ClassVersion="18" checksum="3926145865"/>
-   <version ClassVersion="17" checksum="3502028356"/>
+  <class name="trigger::TriggerEventWithRefs::TriggerFilterObject" ClassVersion="17">
+   <version ClassVersion="17" checksum="3926145865"/>
    <version ClassVersion="16" checksum="752200108"/>
    <version ClassVersion="15" checksum="450435068"/>
    <version ClassVersion="14" checksum="1673531968"/>
    <version ClassVersion="13" checksum="1672519577"/>
    <version ClassVersion="12" checksum="2301242282"/>
   </class>
   <class name="std::vector<trigger::TriggerEventWithRefs::TriggerFilterObject>"/>
-  <class name="trigger::TriggerEventWithRefs" ClassVersion="17">
-   <version ClassVersion="17" checksum="3502028356"/>
-   <version ClassVersion="16" checksum="122066446"/>
+  <class name="trigger::TriggerEventWithRefs" ClassVersion="16">
+   <version ClassVersion="16" checksum="3502028356"/>
    <version ClassVersion="15" checksum="3947606822"/>
    <version ClassVersion="14" checksum="2001321210"/>
    <version ClassVersion="13" checksum="1258968436"/>

diff --git 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(  )
 )
diff --git a/HLTrigger/HLTcore/plugins/BuildFile.xml b/HLTrigger/HLTcore/plugins/BuildFile.xml
@@ -9,6 +9,7 @@
   <use name="DataFormats/Provenance"/>
   <use name="DataFormats/RecoCandidate"/>
   <use name="DataFormats/TauReco"/>
+  <use name="DataFormats/L1TMuonPhase2"/>
   <use name="HLTrigger/HLTcore"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>

diff --git a/HLTrigger/HLTfilters/plugins/BuildFile.xml b/HLTrigger/HLTfilters/plugins/BuildFile.xml
@@ -14,6 +14,7 @@
 <use name="DataFormats/METReco"/>
 <use name="DataFormats/RecoCandidate"/>
 <use name="DataFormats/TauReco"/>
+<use name="DataFormats/L1TMuonPhase2"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>

diff --git 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<int>(passingMuons.size()) >= min_N_);
   return accept;