Split TrackSelection and TrackVertexAssociation, Triplicate for GTT, …

…Propagate new workflow to central L1T and GTT configurations, fix l1t broken tags

l1t naming for GTTFileWriter

Remove track vertex association from track selection module.

Separated off track-vertex association into separate plugin.

Partial update to GTT Emulation workflow, switch geometry to D88 which is the Phase2 Baseline in 12_5.

add Alexx's updates to TTTrack_TrackWord.h, update to CMSSW_13 l1t tracks tag, update l1tVertexProducer default

Update GTTFileReader to l1t naming.

Update L1TrackJetEmulatorProducer.cc to accept TVA tracks from l1tTrackVertexAssociationProducer, unify some typedefs with other GTT modules, update l1tTrackJetsEmulation_cfi.py accordingly.

Create separate copies of TS and TVA for the vertex finding, jet finding, and Missing Et. Update names to match VertexFinder configs commonly used.

Add l1tVertexFinderSim and l1tVertexFinderEmu with fastHisto and fastHistoEmulation algorithms, and proper default input tags for easy process.load calls

Update createFirmwareInputFiles_cfg.py for new TS, TVA, VF, JF workflow with new defaults.

VertexFinderEmu to VertexFinderEmulator to sync with common usage

Switch back to L1 in typedef's, update l1tTrackJets_cif.py PV input tag.

l1t naming for L1Trigger/L1TTrackMatch/plugins/L1FastTrackingJetProducer.cc and L1Trigger/L1TTrackMatch/python/l1tFastTrackingJetProducer_cfi.py

fixup l1t naming for GTTFileWriter

TS and TVA split update, split part 1 of commit b17fb0e

Multiple fixes for data flow of consumes and produces for the non-emulator GTT modules.

Try to disable JF internal track selection for firmware inputs.

fixup TrackJet types.

fixup more

fixup l1tTrackJetsEmulation_cfi.py

Simplify configurations for track selection and vertex association through usage of clone.

Remove debugging code from createFirmwareInputFiles_cfg.py

First attempt at update to SimL1Emulator_cff.py based on new TS+VF+TVA workflow and default configurations for GTT.

Fix runTheMatrix.py errors, SimL1Emulator_cff.py

Update to new default on track selection and vertex association for jets, disabling external modules and keeping internal selection active

Port note: file not present in master:
L1Trigger/L1TNtuples/python/l1PhaseIITreeStep1Producer_cfi.py

L1Trigger/Configuration/python/SimL1Emulator_cff.py

@@ -122,16 +122,19 @@
 # ########################################################################
 # Phase-2 L1T - TrackTrigger dependent modules
 # ########################################################################
+
 from L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackSelectionProducer_cfi import *
+from L1Trigger.L1TTrackMatch.l1tTrackVertexAssociationProducer_cfi import *
 from L1Trigger.VertexFinder.l1tVertexProducer_cfi import *
-l1tVertexFinder = l1tVertexProducer.clone()
-l1tVertexFinderEmulator = l1tVertexProducer.clone()
-l1tVertexFinderEmulator.VertexReconstruction.Algorithm = "fastHistoEmulation"
-l1tVertexFinderEmulator.l1TracksInputTag = ("l1tGTTInputProducer","Level1TTTracksConverted")
-_phase2_siml1emulator.add(l1tVertexFinder)
-_phase2_siml1emulator.add(l1tVertexProducer)
+
+# Track Conversion, Track Selection, Vertex Finding
 _phase2_siml1emulator.add(l1tGTTInputProducer)
 _phase2_siml1emulator.add(l1tGTTInputProducerExtended)
+_phase2_siml1emulator.add(l1tTrackSelectionProducer)
+_phase2_siml1emulator.add(l1tTrackSelectionProducerExtended)
+_phase2_siml1emulator.add(l1tVertexFinder)
+_phase2_siml1emulator.add(l1tVertexProducer)
 _phase2_siml1emulator.add(l1tVertexFinderEmulator)
 
 # Emulated GMT Muons (Tk + Stub, Tk + MuonTFT, StandaloneMuon)
@@ -157,30 +160,32 @@
 from L1Trigger.L1TTrackMatch.l1tTrackFastJets_cfi import *
 from L1Trigger.L1TTrackMatch.l1tTrackerEtMiss_cfi import *
 from L1Trigger.L1TTrackMatch.l1tTrackerHTMiss_cfi import *
-# make the input tags consistent with the choice L1VertexFinder above
-l1tTrackJets.L1PVertexInputTag  = ("l1tVertexFinderEmulator","l1verticesEmulation")
-l1tTrackFastJets.L1PrimaryVertexTag  = ("l1tVertexFinder", "l1vertices")
-l1tTrackJetsExtended.L1PVertexInputTag  = ("l1tVertexFinderEmulator","l1verticesEmulation")
-#l1tTrackerEtMiss.L1VertexInputTag = ("l1tVertexFinder", "l1vertices")
-#l1tTrackerEtMissExtended.L1VertexInputTag = ("l1tVertexFinder", "l1vertices")
 
-from L1Trigger.L1TTrackMatch.l1tTrackSelectionProducer_cfi import *
-_phase2_siml1emulator.add(l1tTrackSelectionProducer)
-_phase2_siml1emulator.add(l1tTrackSelectionProducerExtended)
+#Selected and Associated tracks for Jets and Emulated Jets
+_phase2_siml1emulator.add(l1tTrackSelectionProducerForJets)
+_phase2_siml1emulator.add(l1tTrackSelectionProducerExtendedForJets)
+_phase2_siml1emulator.add(l1tTrackVertexAssociationProducerForJets)
+_phase2_siml1emulator.add(l1tTrackVertexAssociationProducerExtendedForJets)
+
+#Selected and Associated tracks for EtMiss and Emulated EtMiss
+_phase2_siml1emulator.add(l1tTrackSelectionProducerForEtMiss)
+_phase2_siml1emulator.add(l1tTrackSelectionProducerExtendedForEtMiss)
+_phase2_siml1emulator.add(l1tTrackVertexAssociationProducerForEtMiss)
+_phase2_siml1emulator.add(l1tTrackVertexAssociationProducerExtendedForEtMiss)
 
+#Track Jets, Track Only Et Miss, Track Only HT Miss
 _phase2_siml1emulator.add(l1tTrackJets)
 _phase2_siml1emulator.add(l1tTrackJetsExtended)
 _phase2_siml1emulator.add(l1tTrackFastJets)
 _phase2_siml1emulator.add(l1tTrackerEtMiss)
 _phase2_siml1emulator.add(l1tTrackerHTMiss)
 
-#Emulated tracker objects
+#Emulated Track Jets, Track Only Et Miss, Track Only HT Miss
 from L1Trigger.L1TTrackMatch.l1tTrackJetsEmulation_cfi import *
 _phase2_siml1emulator.add(l1tTrackJetsEmulation)
 _phase2_siml1emulator.add(l1tTrackJetsExtendedEmulation)
 
 from L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi import *
-l1tTrackerEmuEtMiss.L1VertexInputTag = ("l1tVertexFinderEmulator","l1verticesEmulation")
 _phase2_siml1emulator.add(l1tTrackerEmuEtMiss)
 
 from L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi import *

L1Trigger/DemonstratorTools/python/GTTFileReader_cff.py → L1Trigger/DemonstratorTools/python/l1tGTTFileReader_cfi.py

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-GTTFileReader = cms.EDProducer('GTTFileReader',
+l1tGTTFileReader = cms.EDProducer('GTTFileReader',
   files = cms.vstring("gttOutput_0.txt"), #, "gttOutput_1.txt"),
   format = cms.untracked.string("APx")
-)
+)

L1Trigger/DemonstratorTools/python/GTTFileWriter_cff.py → L1Trigger/DemonstratorTools/python/l1tGTTFileWriter_cfi.py

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-GTTFileWriter = cms.EDAnalyzer('GTTFileWriter',
+l1tGTTFileWriter = cms.EDAnalyzer('GTTFileWriter',
   tracks = cms.untracked.InputTag("l1tTTTracksFromTrackletEmulation", "Level1TTTracks"),
   convertedTracks = cms.untracked.InputTag("l1tGTTInputProducer", "Level1TTTracksConverted"),
   vertices = cms.untracked.InputTag("l1tVertexProducer", "l1verticesEmulation"),

L1Trigger/DemonstratorTools/test/gtt/createFirmwareInputFiles_cfg.py

@@ -2,7 +2,6 @@
 import FWCore.Utilities.FileUtils as FileUtils
 import FWCore.ParameterSet.VarParsing as VarParsing
 
-
 # PART 1 : PARSE ARGUMENTS
 
 options = VarParsing.VarParsing ('analysis')
@@ -63,36 +62,93 @@
 )
 
 process.load('L1Trigger.L1TTrackMatch.l1tGTTInputProducer_cfi')
+process.load('L1Trigger.L1TTrackMatch.l1tTrackSelectionProducer_cfi')
 process.load('L1Trigger.VertexFinder.l1tVertexProducer_cfi')
-process.load("L1Trigger.L1TTrackMatch.l1tTrackSelectionProducer_cfi")
-process.load("L1Trigger.L1TTrackMatch.l1tTrackJetsEmulation_cfi")
-process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi")
-process.load("L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi")
-process.load('L1Trigger.DemonstratorTools.GTTFileWriter_cff')
-
+process.load('L1Trigger.L1TTrackMatch.l1tTrackVertexAssociationProducer_cfi')
+process.load('L1Trigger.L1TTrackMatch.l1tTrackJetsEmulation_cfi')
+process.load('L1Trigger.L1TTrackMatch.l1tTrackerEmuHTMiss_cfi')
+process.load('L1Trigger.L1TTrackMatch.l1tTrackerEmuEtMiss_cfi')
+process.load('L1Trigger.DemonstratorTools.l1tGTTFileWriter_cfi')
+                                                            
 process.l1tGTTInputProducer.debug = cms.int32(options.debug)
-process.l1tVertexProducer.l1TracksInputTag = cms.InputTag("l1tGTTInputProducer","Level1TTTracksConverted")
-process.l1tVertexProducer.VertexReconstruction.Algorithm = cms.string("fastHistoEmulation")
-process.l1tVertexProducer.VertexReconstruction.VxMinTrackPt = cms.double(0.0)
-process.l1tVertexProducer.debug = options.debug
+
 process.l1tTrackSelectionProducer.processSimulatedTracks = cms.bool(False)
-process.l1tTrackSelectionProducer.l1VerticesEmulationInputTag = cms.InputTag("l1tVertexProducer", "l1verticesEmulation")
-process.l1tTrackSelectionProducer.debug = options.debug
-process.l1tTrackJetsEmulation.VertexInputTag = cms.InputTag("l1tVertexProducer", "l1verticesEmulation")
-process.l1tTrackerEmuEtMiss.L1VertexInputTag = cms.InputTag("l1tVertexProducer", "l1verticesEmulation")
+process.l1tVertexFinderEmulator.VertexReconstruction.VxMinTrackPt = cms.double(0.0)
+process.l1tVertexFinderEmulator.debug = options.debug
+process.l1tTrackVertexAssociationProducer.processSimulatedTracks = cms.bool(False)
+
+process.l1tTrackSelectionProducerForEtMiss.processSimulatedTracks = cms.bool(False)
+process.l1tTrackVertexAssociationProducerForEtMiss.processSimulatedTracks = cms.bool(False)
 process.l1tTrackerEmuEtMiss.debug = options.debug
 
+process.l1tTrackSelectionProducerForJets.processSimulatedTracks = cms.bool(False)
+process.l1tTrackSelectionProducerForJets.cutSet = cms.PSet(
+    ptMin = cms.double(2.0), # pt must be greater than this value, [GeV]
+    absEtaMax = cms.double(2.4), # absolute value of eta must be less than this value
+    absZ0Max = cms.double(15.0), # z0 must be less than this value, [cm]
+    nStubsMin = cms.int32(4), # number of stubs must be greater than or equal to this value
+    nPSStubsMin = cms.int32(0), # the number of stubs in the PS Modules must be greater than or equal to this value
+
+    reducedBendChi2Max = cms.double(2.25), # bend chi2 must be less than this value
+    reducedChi2RZMax = cms.double(5.0), # chi2rz/dof must be less than this value
+    reducedChi2RPhiMax = cms.double(20.0), # chi2rphi/dof must be less than this value
+)
+process.l1tTrackVertexAssociationProducerForJets.processSimulatedTracks = cms.bool(False)
+process.l1tTrackVertexAssociationProducerForJets.cutSet = cms.PSet(
+    #deltaZMaxEtaBounds = cms.vdouble(0.0, absEtaMax.value), # these values define the bin boundaries in |eta|
+    #deltaZMax = cms.vdouble(0.5), # delta z must be less than these values, there will be one less value here than in deltaZMaxEtaBounds, [cm]
+    deltaZMaxEtaBounds = cms.vdouble(0.0, 0.7, 1.0, 1.2, 1.6, 2.0, 2.4), # these values define the bin boundaries in |eta|
+    deltaZMax = cms.vdouble(0.37, 0.50, 0.60, 0.75, 1.00, 1.60), # delta z must be less than these values, there will be one less value here than in deltaZMaxEtaBounds, [cm]
+)
+process.l1tTrackerEmuHTMiss.debug = (options.debug > 0)
+
+#Disable internal track selection
+process.l1tTrackJetsEmulation.MaxDzTrackPV = cms.double(10000.0)
+process.l1tTrackJetsEmulation.trk_zMax = cms.double(10000.0)    # maximum track z
+process.l1tTrackJetsEmulation.trk_ptMax = cms.double(10000.0)    # maximumum track pT before saturation [GeV]
+process.l1tTrackJetsEmulation.trk_ptMin = cms.double(0.0)     # minimum track pt [GeV]
+process.l1tTrackJetsEmulation.trk_etaMax = cms.double(10000.0)    # maximum track eta
+process.l1tTrackJetsEmulation.nStubs4PromptChi2=cms.double(10000.0) #Prompt track quality flags for loose/tight
+process.l1tTrackJetsEmulation.nStubs4PromptBend=cms.double(10000.0)
+process.l1tTrackJetsEmulation.nStubs5PromptChi2=cms.double(10000.0)
+process.l1tTrackJetsEmulation.nStubs5PromptBend=cms.double(10000.0)
+
 if options.debug:
     process.MessageLogger.cerr.INFO.limit = cms.untracked.int32(1000000000)
     process.MessageLogger.suppressInfo = cms.untracked.vstring('CondDBESSource', 'PoolDBESSource')
     process.MessageLogger.cerr.CondDBESSource = cms.untracked.PSet(
         limit = cms.untracked.int32(0)
     )
 
-process.GTTFileWriter.format = cms.untracked.string(options.format)
-# process.GTTFileWriter.outputFilename = cms.untracked.string("myOutputFile.txt")
+process.l1tGTTFileWriter.format = cms.untracked.string(options.format) #FIXME Put all this into the default GTTFileWriter
+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.vertexAssociatedTracks = cms.untracked.InputTag("l1tTrackVertexAssociationProducer", "Level1TTTracksSelectedAssociatedEmulation")
+process.l1tGTTFileWriter.jets = cms.untracked.InputTag("l1tTrackJetsEmulation","L1TrackJets")
+process.l1tGTTFileWriter.htmiss = cms.untracked.InputTag("l1tTrackerEmuHTMiss", "L1TrackerEmuHTMiss")
+process.l1tGTTFileWriter.etmiss = cms.untracked.InputTag("l1tTrackerEmuEtMiss", "L1TrackerEmuEtMiss")
+process.l1tGTTFileWriter.outputCorrelatorFilename = cms.untracked.string("L1GTTOutputToCorrelatorFile")
+process.l1tGTTFileWriter.outputGlobalTriggerFilename = cms.untracked.string("L1GTTOutputToGlobalTriggerFile")
+process.l1tGTTFileWriter.selectedTracksFilename = cms.untracked.string("L1GTTSelectedTracksFile")
+process.l1tGTTFileWriter.vertexAssociatedTracksFilename = cms.untracked.string("L1GTTVertexAssociatedTracksFile")
 
 process.MessageLogger.cerr.FwkReport.reportEvery = 1
 process.Timing = cms.Service("Timing", summaryOnly = cms.untracked.bool(True))
 
-process.p = cms.Path(process.l1tGTTInputProducer * process.l1tVertexProducer * process.l1tTrackSelectionProducer * process.l1tTrackJetsEmulation * process.l1tTrackerEmuHTMiss * process.l1tTrackerEmuEtMiss * process.GTTFileWriter)
+
+process.p = cms.Path(process.l1tGTTFileWriter)
+process.p.associate(cms.Task(process.l1tGTTInputProducer, 
+                             process.l1tTrackSelectionProducer,
+                             process.l1tVertexFinderEmulator, 
+                             process.l1tTrackVertexAssociationProducer,
+                             process.l1tTrackSelectionProducerForJets,
+                             process.l1tTrackVertexAssociationProducerForJets,
+                             process.l1tTrackJetsEmulation, 
+                             process.l1tTrackerEmuHTMiss, 
+                             process.l1tTrackSelectionProducerForEtMiss,
+                             process.l1tTrackVertexAssociationProducerForEtMiss,
+                             process.l1tTrackerEmuEtMiss,
+                         )
+                )

L1Trigger/DemonstratorTools/test/gtt/verifyFirmwareOutput_cfg.py

@@ -38,11 +38,11 @@
 process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(options.maxEvents) )
 
 process.load("L1Trigger.TrackFindingTracklet.L1HybridEmulationTracks_cff")
-process.load('L1Trigger.DemonstratorTools.GTTFileReader_cff')
-process.GTTFileReader.files = cms.vstring("test/gtt/example_vertex_apx.txt")
-process.GTTFileReader.format = cms.untracked.string(options.format)
+process.load('L1Trigger.DemonstratorTools.l1tGTTFileReader_cfi')
+process.l1tGTTFileReader.files = cms.vstring("test/gtt/example_vertex_apx.txt")
+process.l1tGTTFileReader.format = cms.untracked.string(options.format)
 
 process.MessageLogger.cerr.FwkReport.reportEvery = 1
 process.Timing = cms.Service("Timing", summaryOnly = cms.untracked.bool(True))
 
-process.p = cms.Path(process.L1HybridTracks * process.GTTFileReader) # vertex emulator & FW-emulator comparsion module need to be added here
+process.p = cms.Path(process.L1HybridTracks * process.l1tGTTFileReader) # vertex emulator & FW-emulator comparsion module need to be added here

L1Trigger/L1TTrackMatch/plugins/L1TrackJetEmulatorProducer.cc

@@ -25,6 +25,7 @@
 #include "DataFormats/L1Trigger/interface/VertexWord.h"
 
 // system include files
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
@@ -34,6 +35,7 @@
 #include "FWCore/Utilities/interface/StreamID.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "DataFormats/Common/interface/Ref.h"
+#include "DataFormats/Common/interface/RefVector.h"
 
 //own headers
 #include "L1TrackJetClustering.h"
@@ -52,6 +54,7 @@ class L1TrackJetEmulatorProducer : public stream::EDProducer<> {
   ~L1TrackJetEmulatorProducer() override = default;
   typedef TTTrack<Ref_Phase2TrackerDigi_> L1TTTrackType;
   typedef vector<L1TTTrackType> L1TTTrackCollectionType;
+  typedef edm::RefVector<L1TTTrackCollectionType> L1TTTrackRefCollectionType;
   static void fillDescriptions(ConfigurationDescriptions &descriptions);
 
 private:
@@ -96,7 +99,7 @@ class L1TrackJetEmulatorProducer : public stream::EDProducer<> {
   TTTrack_TrackWord trackword;
 
   edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
-  const EDGetTokenT<vector<TTTrack<Ref_Phase2TrackerDigi_>>> trackToken_;
+  const EDGetTokenT<L1TTTrackRefCollectionType> trackToken_;
   const EDGetTokenT<l1t::VertexWordCollection> PVtxToken_;
 };
 
@@ -129,7 +132,7 @@ L1TrackJetEmulatorProducer::L1TrackJetEmulatorProducer(const ParameterSet &iConf
       nDisplacedTracks_(iConfig.getParameter<int>("nDisplacedTracks")),
       dzPVTrk_(iConfig.getParameter<double>("MaxDzTrackPV")),
       tTopoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))),
-      trackToken_(consumes<vector<TTTrack<Ref_Phase2TrackerDigi_>>>(iConfig.getParameter<InputTag>("L1TrackInputTag"))),
+      trackToken_(consumes<L1TTTrackRefCollectionType>(iConfig.getParameter<InputTag>("L1TrackInputTag"))),
       PVtxToken_(consumes<l1t::VertexWordCollection>(iConfig.getParameter<InputTag>("L1PVertexInputTag"))) {
   zStep_ = 2.0 * trkZMax_ / (zBins_ + 1);                 // added +1 in denom
   etaStep_ = glbeta_intern(2.0 * trkEtaMax_ / etaBins_);  //etaStep is the width of an etabin
@@ -148,7 +151,7 @@ void L1TrackJetEmulatorProducer::produce(Event &iEvent, const EventSetup &iSetup
   // Read inputs
   const TrackerTopology &tTopo = iSetup.getData(tTopoToken_);
 
-  edm::Handle<vector<TTTrack<Ref_Phase2TrackerDigi_>>> TTTrackHandle;
+  edm::Handle<L1TTTrackRefCollectionType> TTTrackHandle;
   iEvent.getByToken(trackToken_, TTTrackHandle);
 
   edm::Handle<l1t::VertexWordCollection> PVtx;

L1Trigger/L1TTrackMatch/plugins/L1TrackJetProducer.cc

@@ -17,6 +17,7 @@
 
 // system include files
 #include "DataFormats/Common/interface/Ref.h"
+#include "DataFormats/Common/interface/RefVector.h"
 #include "DataFormats/L1TCorrelator/interface/TkJet.h"
 #include "DataFormats/L1TCorrelator/interface/TkJetFwd.h"
 #include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
@@ -47,6 +48,7 @@ class L1TrackJetProducer : public stream::EDProducer<> {
   ~L1TrackJetProducer() override = default;
   typedef TTTrack<Ref_Phase2TrackerDigi_> L1TTTrackType;
   typedef vector<L1TTTrackType> L1TTTrackCollectionType;
+  typedef edm::RefVector<L1TTTrackCollectionType> L1TTTrackRefCollectionType;
   static void fillDescriptions(ConfigurationDescriptions &descriptions);
 
 private:
@@ -87,7 +89,7 @@ class L1TrackJetProducer : public stream::EDProducer<> {
   const float dzPVTrk_;
 
   edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> tTopoToken_;
-  const EDGetTokenT<vector<TTTrack<Ref_Phase2TrackerDigi_>>> trackToken_;
+  const EDGetTokenT<L1TTTrackRefCollectionType> trackToken_;
   const EDGetTokenT<l1t::VertexWordCollection> PVtxToken_;
 };
 
@@ -119,7 +121,7 @@ L1TrackJetProducer::L1TrackJetProducer(const ParameterSet &iConfig)
       nDisplacedTracks_(iConfig.getParameter<int>("nDisplacedTracks")),
       dzPVTrk_(iConfig.getParameter<double>("MaxDzTrackPV")),
       tTopoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>(edm::ESInputTag("", ""))),
-      trackToken_(consumes<vector<TTTrack<Ref_Phase2TrackerDigi_>>>(iConfig.getParameter<InputTag>("L1TrackInputTag"))),
+      trackToken_(consumes<L1TTTrackRefCollectionType>(iConfig.getParameter<InputTag>("L1TrackInputTag"))),
       PVtxToken_(consumes<l1t::VertexWordCollection>(iConfig.getParameter<InputTag>("L1PVertexInputTag"))) {
   zStep_ = 2.0 * trkZMax_ / (zBins_ + 1);  // added +1 in denom
   etaStep_ = 2.0 * trkEtaMax_ / etaBins_;  //etaStep is the width of an etabin
@@ -137,7 +139,7 @@ void L1TrackJetProducer::produce(Event &iEvent, const EventSetup &iSetup) {
   // Read inputs
   const TrackerTopology &tTopo = iSetup.getData(tTopoToken_);
 
-  edm::Handle<vector<TTTrack<Ref_Phase2TrackerDigi_>>> TTTrackHandle;
+  edm::Handle<L1TTTrackRefCollectionType> TTTrackHandle;
   iEvent.getByToken(trackToken_, TTTrackHandle);
 
   edm::Handle<l1t::VertexWordCollection> PVtx;