Merge pull request #47793 from SegmentLinking/ariostas/lst_inputs

Migrate LST inputs to SoA collections

Author: cmsbuild

DQM/TrackingMonitorSource/python/TrackingSourceConfig_Tier0_cff.py

@@ -397,7 +397,7 @@ def _copyIfExists(mod, pset, name):
 
 from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
 trackingLST.toModify(locals()["TrackSeedMonhighPtTripletStep"],
-    SeedProducer = "lstPixelSeedInputProducer"
+    SeedProducer = "lstInputProducer"
 )
 
 TrackingDQMSourceTier0 += TrackSeedMonSequence

DataFormats/Common/src/classes_def.xml

@@ -207,4 +207,5 @@
 
  <class name="edm::StdArray<short, 4>"/>
  <class name="edm::StdArray<unsigned short, 11>"/>
+ <class name="edm::StdArray<unsigned int, 4>"/>
 </lcgdict>

…Track/interface/trackFromSeedFitFailed.h …kReco/interface/trackFromSeedFitFailed.hValidation/RecoTrack/interface/trackFromSeedFitFailed.h renamed to DataFormats/TrackReco/interface/trackFromSeedFitFailed.h Validation/RecoTrack/interface/trackFromSeedFitFailed.h renamed to DataFormats/TrackReco/interface/trackFromSeedFitFailed.h

@@ -1,5 +1,5 @@
-#ifndef Validation_RecoTrack_trackFomSeedFitFailed_h
-#define Validation_RecoTrack_trackFomSeedFitFailed_h
+#ifndef DataFormats_TrackReco_trackFomSeedFitFailed_h
+#define DataFormats_TrackReco_trackFomSeedFitFailed_h
 
 #include "DataFormats/TrackReco/interface/Track.h"
 

HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py

@@ -26,8 +26,8 @@
 
 _hltInitialStepTrackCandidatesLST = cms.EDProducer('LSTOutputConverter',
     lstOutput = cms.InputTag('hltLST'),
-    phase2OTHits = cms.InputTag('hltPhase2OTHitsInputLST'),
-    lstPixelSeeds = cms.InputTag('hltPixelSeedInputLST'),
+    lstInput = cms.InputTag('hltInputLST'),
+    lstPixelSeeds = cms.InputTag('hltInputLST'),
     includeT5s = cms.bool(True),
     includeNonpLSTSs = cms.bool(False),
     propagatorAlong = cms.ESInputTag('', 'PropagatorWithMaterial'),

HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrajectorySeedsLST_cfi.py

@@ -2,8 +2,8 @@
 
 hltInitialStepTrajectorySeedsLST = cms.EDProducer('LSTOutputConverter',
     lstOutput = cms.InputTag('hltLST'),
-    phase2OTHits = cms.InputTag('hltPhase2OTHitsInputLST'),
-    lstPixelSeeds = cms.InputTag('hltPixelSeedInputLST'),
+    lstInput = cms.InputTag('hltInputLST'),
+    lstPixelSeeds = cms.InputTag('hltInputLST'),
     includeT5s = cms.bool(True),
     includeNonpLSTSs = cms.bool(True),
     propagatorAlong = cms.ESInputTag('', 'PropagatorWithMaterial'),

HLTrigger/Configuration/python/HLT_75e33/modules/hltInputLST_cfi.py

@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+hltInputLST = cms.EDProducer('LSTInputProducer@alpaka',
+    ptCut = cms.double(0.8),
+    phase2OTRecHits = cms.InputTag('hltSiPhase2RecHits'),
+    beamSpot = cms.InputTag('hltOnlineBeamSpot'),
+    seedTracks = cms.VInputTag(
+      'hltInitialStepSeedTracksLST',
+      'hltHighPtTripletStepSeedTracksLST'
+    ),
+    alpaka = cms.untracked.PSet(
+        backend = cms.untracked.string('')
+    )
+)
+
+_hltInputLSTSingleIterPatatrack = hltInputLST.clone(
+    seedTracks = ['hltInitialStepSeedTracksLST']
+)
+
+from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
+singleIterPatatrack.toReplaceWith(hltInputLST, _hltInputLSTSingleIterPatatrack)

HLTrigger/Configuration/python/HLT_75e33/modules/hltLST_cfi.py

@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 hltLST = cms.EDProducer('LSTProducer@alpaka',
-    pixelSeedInput = cms.InputTag('hltPixelSeedInputLST'),
-    phase2OTHitsInput = cms.InputTag('hltPhase2OTHitsInputLST'),
+    lstInput = cms.InputTag('hltInputLST'),
     verbose = cms.bool(False),
+    ptCut = cms.double(0.8),
     nopLSDupClean = cms.bool(False),
     tcpLSTriplets = cms.bool(False),
     mightGet = cms.optional.untracked.vstring,

HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2OTHitsInputLST_cfi.py

@@ -11,9 +11,8 @@
 from ..modules.hltInitialStepSeedTracksLST_cfi import *
 from ..sequences.HLTHighPtTripletStepSeedingSequence_cfi import *
 from ..modules.hltHighPtTripletStepSeedTracksLST_cfi import *
-from ..modules.hltPixelSeedInputLST_cfi import *
 from ..modules.hltSiPhase2RecHits_cfi import *
-from ..modules.hltPhase2OTHitsInputLST_cfi import *
+from ..modules.hltInputLST_cfi import *
 from ..modules.hltLST_cfi import *
 from ..modules.hltInitialStepTrackspTTCLST_cfi import *
 from ..modules.hltInitialStepTrackspLSTCLST_cfi import *
@@ -27,9 +26,8 @@
     +hltInitialStepSeedTracksLST
     +HLTHighPtTripletStepSeedingSequence
     +hltHighPtTripletStepSeedTracksLST
-    +hltPixelSeedInputLST
     +hltSiPhase2RecHits # Probably need to move elsewhere in the final setup
-    +hltPhase2OTHitsInputLST # Probably need to move elsewhere in the final setup
+    +hltInputLST
     +hltLST
     +hltInitialStepTrackCandidates
     +hltInitialStepTrackspTTCLST
@@ -55,9 +53,8 @@
 _HLTInitialStepSequenceSingleIterPatatrackLSTSeeding = cms.Sequence(
      hltInitialStepSeeds
     +hltInitialStepSeedTracksLST
-    +hltPixelSeedInputLST
     +hltSiPhase2RecHits # Probably need to move elsewhere in the final setup
-    +hltPhase2OTHitsInputLST # Probably need to move elsewhere in the final setup
+    +hltInputLST
     +hltLST
     +hltInitialStepTrajectorySeedsLST
     +hltInitialStepTrackCandidates