Merge pull request #39401 from cecilecaillol/l1t-1048

[L1T] Phase-2, include missing collections in outputs
cms-sw · Oct 4, 2022 · 0d421b5 · 0d421b5
2 parents fa27d11 + 3c4146e
commit 0d421b5
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 29 deletions.
diff --git 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 <vector>
 #include <ap_int.h>
 #include <cassert>
@@ -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<kPtSize + 5, kPtMagSize + 5, AP_TRN, AP_SAT> pt_2 = pt;
-      ap_uint<kPtSize> 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
@@ -0,0 +1,44 @@
+// 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
diff --git a/DataFormats/L1Trigger/src/classes_def.xml b/DataFormats/L1Trigger/src/classes_def.xml
@@ -309,5 +309,7 @@
   </class>
   <class name="std::vector<l1t::TkJetWord>"/>
   <class name="edm::Wrapper<std::vector<l1t::TkJetWord> >"/>
+  <class name="edm::Wrapper<l1t::TkJetWordCollection>"/>
+  <class name="std::bitset<70>"/>
 
 </lcgdict>
diff --git 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_*_*',
@@ -194,6 +204,9 @@ def _appendPhase2Digis(obj):
         'keep *_l1tPhase1JetProducer_*_*', 
         'keep *_l1tPhase1JetCalibrator_*_*',
         'keep *_l1tPhase1JetSumsProducer_*_*',
+        'keep *_l1tPhase1JetProducer9x9_*_*', 
+        'keep *_l1tPhase1JetCalibrator9x9_*_*',
+        'keep *_l1tPhase1JetSumsProducer9x9_*_*',
         'keep *_l1tLayer1Barrel_*_*',
         'keep *_l1tLayer1HGCal_*_*',
         'keep *_l1tLayer1HGCalNoTK_*_*',
@@ -203,6 +216,8 @@ def _appendPhase2Digis(obj):
         'keep *_l1tMETPFProducer_*_*',
         'keep *_l1tNNTauProducer_*_*',
         'keep *_l1tNNTauProducerPuppi_*_*',
+        'keep *_l1tHPSPFTauProducerPF_*_*',
+        'keep *_l1tHPSPFTauProducerPuppi_*_*',
         'keep *_TTStubsFromPhase2TrackerDigis_*_*',
         'keep *_TTClustersFromPhase2TrackerDigis_*_*',
         'keep *_l1tTTTracksFromExtendedTrackletEmulation_*_*',

diff --git 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)
@@ -150,14 +151,19 @@
 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")
+l1tTrackFastJets.L1PrimaryVertexTag  = ("l1tVertexFinder", "l1vertices")
+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)
-
 _phase2_siml1emulator.add(l1tTrackerEtMiss)
 _phase2_siml1emulator.add(l1tTrackerHTMiss)
 

diff --git a/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetSumsProducer.cc b/L1Trigger/L1CaloTrigger/plugins/Phase1L1TJetSumsProducer.cc
@@ -182,7 +182,7 @@ l1t::EtSum Phase1L1TJetSumsProducer::computeMHT(const edm::Handle<std::vector<re
 void Phase1L1TJetSumsProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("inputJetCollectionTag",
-                          edm::InputTag("Phase1L1TJetCalibrator", "Phase1L1TJetFromPfCandidates"));
+                          edm::InputTag("l1tPhase1JetCalibrator", "Phase1L1TJetFromPfCandidates"));
   desc.add<std::vector<double> >("sinPhi");
   desc.add<std::vector<double> >("cosPhi");
   desc.add<unsigned int>("nBinsPhi", 72);

diff --git 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(