Migrate LST inputs to SoA collections

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>

Validation/RecoTrack/interface/trackFromSeedFitFailed.h → 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/sequences/HLTInitialStepSequence_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

RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py

@@ -426,11 +426,10 @@
 _HighPtTripletStepTask_LST = HighPtTripletStepTask.copy()
 from RecoLocalTracker.Phase2TrackerRecHits.Phase2TrackerRecHits_cfi import siPhase2RecHits
 from RecoTracker.LST.lstSeedTracks_cff import lstInitialStepSeedTracks,lstHighPtTripletStepSeedTracks
-from RecoTracker.LST.lstPixelSeedInputProducer_cfi import lstPixelSeedInputProducer
-from RecoTracker.LST.lstPhase2OTHitsInputProducer_cfi import lstPhase2OTHitsInputProducer
+from RecoTracker.LST.lstInputProducer_cfi import lstInputProducer
 from RecoTracker.LST.lstProducerTask_cff import *
 
-_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInitialStepSeedTracks, lstHighPtTripletStepSeedTracks, lstPixelSeedInputProducer, lstPhase2OTHitsInputProducer,
+_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInitialStepSeedTracks, lstHighPtTripletStepSeedTracks, lstInputProducer,
                                lstProducerTask, highPtTripletStepLSTpTracks, highPtTripletStepLSTT5Tracks, highPtTripletStepSelectorLSTT5)
 (trackingPhase2PU140 & trackingLST).toReplaceWith(HighPtTripletStepTask, _HighPtTripletStepTask_LST)
 

RecoTracker/LST/plugins/BuildFile.xml

@@ -20,13 +20,14 @@
   <use name="TrackingTools/Records"/>
   <use name="TrackingTools/TrajectoryState"/>
   <use name="TrackingTools/TransientTrackingRecHit"/>
-  <use name="Validation/RecoTrack"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
 <!-- alpaka-based portable plugins -->
 <library file="alpaka/*.cc" name="RecoTrackerLSTPluginsPortable">
   <use name="alpaka"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="TrackingTools/TrajectoryState"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/Utilities"/>

RecoTracker/LST/plugins/LSTOutputConverter.cc

@@ -13,7 +13,7 @@
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "RecoTracker/LST/interface/LSTPhase2OTHitsInput.h"
+#include "RecoTracker/LSTCore/interface/LSTInputHostCollection.h"
 #include "RecoTracker/LST/interface/LSTOutput.h"
 #include "RecoTracker/TkSeedingLayers/interface/SeedingHitSet.h"
 
@@ -36,7 +36,7 @@ class LSTOutputConverter : public edm::stream::EDProducer<> {
   void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
 
   const edm::EDGetTokenT<LSTOutput> lstOutputToken_;
-  const edm::EDGetTokenT<LSTPhase2OTHitsInput> lstPhase2OTHitsInputToken_;
+  const edm::EDGetTokenT<lst::LSTInputHostCollection> lstInputToken_;
   const edm::EDGetTokenT<TrajectorySeedCollection> lstPixelSeedToken_;
   const bool includeT5s_;
   const bool includeNonpLSTSs_;
@@ -58,7 +58,7 @@ class LSTOutputConverter : public edm::stream::EDProducer<> {
 
 LSTOutputConverter::LSTOutputConverter(edm::ParameterSet const& iConfig)
     : lstOutputToken_(consumes(iConfig.getParameter<edm::InputTag>("lstOutput"))),
-      lstPhase2OTHitsInputToken_{consumes(iConfig.getParameter<edm::InputTag>("phase2OTHits"))},
+      lstInputToken_{consumes(iConfig.getParameter<edm::InputTag>("lstInput"))},
       lstPixelSeedToken_{consumes(iConfig.getParameter<edm::InputTag>("lstPixelSeeds"))},
       includeT5s_(iConfig.getParameter<bool>("includeT5s")),
       includeNonpLSTSs_(iConfig.getParameter<bool>("includeNonpLSTSs")),
@@ -89,8 +89,8 @@ void LSTOutputConverter::fillDescriptions(edm::ConfigurationDescriptions& descri
   edm::ParameterSetDescription desc;
 
   desc.add<edm::InputTag>("lstOutput", edm::InputTag("lstProducer"));
-  desc.add<edm::InputTag>("phase2OTHits", edm::InputTag("lstPhase2OTHitsInputProducer"));
-  desc.add<edm::InputTag>("lstPixelSeeds", edm::InputTag("lstPixelSeedInputProducer"));
+  desc.add<edm::InputTag>("lstInput", edm::InputTag("lstInputProducer"));
+  desc.add<edm::InputTag>("lstPixelSeeds", edm::InputTag("lstInputProducer"));
   desc.add<bool>("includeT5s", true);
   desc.add<bool>("includeNonpLSTSs", false);
   desc.add("propagatorAlong", edm::ESInputTag{"", "PropagatorWithMaterial"});
@@ -113,7 +113,7 @@ void LSTOutputConverter::fillDescriptions(edm::ConfigurationDescriptions& descri
 void LSTOutputConverter::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // Setup
   auto const& lstOutput = iEvent.get(lstOutputToken_);
-  auto const& phase2OTRecHits = iEvent.get(lstPhase2OTHitsInputToken_);
+  auto const& lstInputHC = iEvent.get(lstInputToken_);
   auto const& pixelSeeds = iEvent.get(lstPixelSeedToken_);
   auto const& mf = iSetup.getData(mfToken_);
   auto const& propAlo = iSetup.getData(propagatorAlongToken_);
@@ -137,7 +137,7 @@ void LSTOutputConverter::produce(edm::Event& iEvent, const edm::EventSetup& iSet
   outputpTTC.reserve(lstTC_len.size());
   outputpLSTC.reserve(lstTC_len.size());
 
-  auto const& OTHits = phase2OTRecHits.hits();
+  auto OTHits = lstInputHC.const_view<lst::HitsBaseSoA>().hits();
 
   LogDebug("LSTOutputConverter") << "lstTC size " << lstTC_len.size();
   for (unsigned int i = 0; i < lstTC_len.size(); i++) {