diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index ea0a4629f0673..5f79404dacfe6 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -382,11 +382,12 @@ _HighPtTripletStepTask_LST = HighPtTripletStepTask.copy() from RecoLocalTracker.Phase2TrackerRecHits.Phase2TrackerRecHits_cfi import siPhase2RecHits +from RecoTracker.LST.lstSeedTracks_cfi import lstInitialStepSeedTracks,lstHighPtTripletStepSeedTracks from RecoTracker.LST.lstPixelSeedInputProducer_cfi import lstPixelSeedInputProducer from RecoTracker.LST.lstPhase2OTHitsInputProducer_cfi import lstPhase2OTHitsInputProducer from RecoTracker.LST.alpaka_cuda_asyncLSTProducer_cfi import alpaka_cuda_asyncLSTProducer lstProducer = alpaka_cuda_asyncLSTProducer.clone() -_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstPixelSeedInputProducer, lstPhase2OTHitsInputProducer, lstProducer) +_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInitialStepSeedTracks, lstHighPtTripletStepSeedTracks, lstPixelSeedInputProducer, lstPhase2OTHitsInputProducer, lstProducer) (trackingPhase2PU140 & trackingLST).toReplaceWith(HighPtTripletStepTask, _HighPtTripletStepTask_LST) # fast tracking mask producer diff --git a/RecoTracker/LST/interface/LSTOutput.h b/RecoTracker/LST/interface/LSTOutput.h index 148ed86f167f2..f862ddf9b9e29 100644 --- a/RecoTracker/LST/interface/LSTOutput.h +++ b/RecoTracker/LST/interface/LSTOutput.h @@ -9,6 +9,8 @@ class LSTOutput { LSTOutput() = default; ~LSTOutput() = default; + enum LSTTCType { T5 = 4, pT3 = 5, pT5 = 7, pLS = 8 }; + void setLSTOutputTraits(std::vector> hitIdx, std::vector len, std::vector pt, @@ -44,4 +46,3 @@ class LSTOutput { }; #endif - diff --git a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h index 10a6dc4887da1..2d55b467b1d1b 100644 --- a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h +++ b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h @@ -38,4 +38,3 @@ class LSTPhase2OTHitsInput { }; #endif - diff --git a/RecoTracker/LST/interface/LSTPixelSeedInput.h b/RecoTracker/LST/interface/LSTPixelSeedInput.h index 433f726923412..e7ef033360671 100644 --- a/RecoTracker/LST/interface/LSTPixelSeedInput.h +++ b/RecoTracker/LST/interface/LSTPixelSeedInput.h @@ -23,7 +23,6 @@ class LSTPixelSeedInput { std::vector stateTrajGlbPy, std::vector stateTrajGlbPz, std::vector q, - std::vector algo, std::vector> hitIdx) { px_ = px; py_ = py; @@ -39,7 +38,6 @@ class LSTPixelSeedInput { stateTrajGlbPy_ = stateTrajGlbPy; stateTrajGlbPz_ = stateTrajGlbPz; q_ = q; - algo_ = algo; hitIdx_ = hitIdx; } @@ -57,7 +55,6 @@ class LSTPixelSeedInput { std::vector const& stateTrajGlbPy() const { return stateTrajGlbPy_; } std::vector const& stateTrajGlbPz() const { return stateTrajGlbPz_; } std::vector const& q() const { return q_; } - std::vector const& algo() const { return algo_; } std::vector> const& hitIdx() const { return hitIdx_; } private: @@ -75,9 +72,7 @@ class LSTPixelSeedInput { std::vector stateTrajGlbPy_; std::vector stateTrajGlbPz_; std::vector q_; - std::vector algo_; std::vector> hitIdx_; }; #endif - diff --git a/RecoTracker/LST/plugins/BuildFile.xml b/RecoTracker/LST/plugins/BuildFile.xml index 1b98a23c200c0..d754c65f6c0a9 100644 --- a/RecoTracker/LST/plugins/BuildFile.xml +++ b/RecoTracker/LST/plugins/BuildFile.xml @@ -13,7 +13,6 @@ - diff --git a/RecoTracker/LST/plugins/LSTOutputConverter.cc b/RecoTracker/LST/plugins/LSTOutputConverter.cc index f0df55aa13063..3b288d515438a 100644 --- a/RecoTracker/LST/plugins/LSTOutputConverter.cc +++ b/RecoTracker/LST/plugins/LSTOutputConverter.cc @@ -25,7 +25,6 @@ #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h" - class LSTOutputConverter : public edm::global::EDProducer<> { public: explicit LSTOutputConverter(edm::ParameterSet const& iConfig); @@ -39,26 +38,34 @@ class LSTOutputConverter : public edm::global::EDProducer<> { const edm::EDGetTokenT lstOutputToken_; const edm::EDGetTokenT lstPhase2OTHitsInputToken_; const edm::EDGetTokenT lstPixelSeedToken_; + const bool includeT5s_; const edm::ESGetToken mfToken_; edm::ESGetToken propagatorAlongToken_; edm::ESGetToken propagatorOppositeToken_; const edm::ESGetToken tGeomToken_; - //const edm::EDGetTokenT beamSpotToken_; std::unique_ptr seedCreator_; + const edm::EDPutTokenT trajectorySeedPutToken_; const edm::EDPutTokenT trackCandidatePutToken_; const edm::EDPutTokenT> seedStopInfoPutToken_; }; LSTOutputConverter::LSTOutputConverter(edm::ParameterSet const& iConfig) : lstOutputToken_(consumes(iConfig.getUntrackedParameter("lstOutput"))), - lstPhase2OTHitsInputToken_{consumes(iConfig.getUntrackedParameter("phase2OTHits"))}, - lstPixelSeedToken_{consumes(iConfig.getUntrackedParameter("lstPixelSeeds"))}, + lstPhase2OTHitsInputToken_{ + consumes(iConfig.getUntrackedParameter("phase2OTHits"))}, + lstPixelSeedToken_{ + consumes(iConfig.getUntrackedParameter("lstPixelSeeds"))}, + includeT5s_(iConfig.getParameter("includeT5s")), mfToken_(esConsumes()), - propagatorAlongToken_{esConsumes(iConfig.getParameter("propagatorAlong"))}, - propagatorOppositeToken_{esConsumes(iConfig.getParameter("propagatorOpposite"))}, - //beamSpotToken_(consumes(iConfig.getUntrackedParameter("beamSpot"))), + propagatorAlongToken_{ + esConsumes(iConfig.getParameter("propagatorAlong"))}, + propagatorOppositeToken_{esConsumes( + iConfig.getParameter("propagatorOpposite"))}, tGeomToken_(esConsumes()), - seedCreator_(SeedCreatorFactory::get()->create("SeedFromConsecutiveHitsCreator", iConfig.getParameter("SeedCreatorPSet"), consumesCollector())), + seedCreator_(SeedCreatorFactory::get()->create("SeedFromConsecutiveHitsCreator", + iConfig.getParameter("SeedCreatorPSet"), + consumesCollector())), + trajectorySeedPutToken_(produces()), trackCandidatePutToken_(produces()), seedStopInfoPutToken_(produces>()) {} @@ -68,9 +75,9 @@ void LSTOutputConverter::fillDescriptions(edm::ConfigurationDescriptions& descri desc.addUntracked("lstOutput", edm::InputTag("lstProducer")); desc.addUntracked("phase2OTHits", edm::InputTag("lstPhase2OTHitsInputProducer")); desc.addUntracked("lstPixelSeeds", edm::InputTag("lstPixelSeedInputProducer")); + desc.add("includeT5s", true); desc.add("propagatorAlong", edm::ESInputTag{"", "PropagatorWithMaterial"}); desc.add("propagatorOpposite", edm::ESInputTag{"", "PropagatorWithMaterialOpposite"}); - //desc.addUntracked("beamSpot", edm::InputTag("offlineBeamSpot")); edm::ParameterSetDescription psd0; psd0.add("ComponentName", std::string("SeedFromConsecutiveHitsCreator")); @@ -95,7 +102,6 @@ void LSTOutputConverter::produce(edm::StreamID, edm::Event& iEvent, const edm::E const auto& propAlo = iSetup.getData(propagatorAlongToken_); const auto& propOppo = iSetup.getData(propagatorOppositeToken_); const auto& tracker = iSetup.getData(tGeomToken_); - //auto const& bs = iEvent.get(beamSpotToken_); // Vector definitions std::vector> const& lstTC_hitIdx = lstOutput.hitIdx(); @@ -106,28 +112,29 @@ void LSTOutputConverter::produce(edm::StreamID, edm::Event& iEvent, const edm::E std::vector const& lstTC_seedIdx = lstOutput.seedIdx(); std::vector const& lstTC_trackCandidateType = lstOutput.trackCandidateType(); - TrackCandidateCollection output; - output.reserve(lstTC_len.size()); + TrajectorySeedCollection outputTS; + outputTS.reserve(lstTC_len.size()); + TrackCandidateCollection outputTC; + outputTC.reserve(lstTC_len.size()); auto const& OTHits = phase2OTRecHits.hits(); - //auto seedsFromT5 = std::make_unique(); - //GlobalPoint vtxOfBs(bs.x0(), bs.y0(), bs.z0()); - LogDebug("LSTOutputConverter")<<"lstTC size "< recHits; - if (lstTC_seedIdx[i] != - 1) { + if (lstTC_trackCandidateType[i] != LSTOutput::LSTTCType::T5) { for (auto const& hit : seed.recHits()) recHits.push_back(hit.clone()); } - unsigned int const nPixelHits = lstTC_seedIdx[i] == -1 ? 0 : recHits.size(); - for (unsigned int j=nPixelHits; jclone()); recHits.sort([](const auto& a, const auto& b) { @@ -150,57 +157,70 @@ void LSTOutputConverter::produce(edm::StreamID, edm::Event& iEvent, const edm::E } }); - if (lstTC_seedIdx[i] == -1) { // T5 + TrajectorySeedCollection seeds; + if (lstTC_trackCandidateType[i] != LSTOutput::LSTTCType::pLS) { using Hit = SeedingHitSet::ConstRecHitPointer; - std::vector hitsFromT5; - hitsFromT5.reserve(lstTC_len[i]); + std::vector hitsForSeed; + hitsForSeed.reserve(lstTC_len.size()); int nHits = 0; for (auto const& hit : recHits) { - auto hType = tracker.getDetectorType(hit.geographicalId()); - if (hType != TrackerGeometry::ModuleType::Ph2PSP && nHits < 2) - continue; // the first two should be P - hitsFromT5.emplace_back(dynamic_cast(&hit)); + if (lstTC_trackCandidateType[i] == LSTOutput::LSTTCType::T5) { + auto hType = tracker.getDetectorType(hit.geographicalId()); + if (hType != TrackerGeometry::ModuleType::Ph2PSP && nHits < 2) + continue; // the first two should be P + } + hitsForSeed.emplace_back(dynamic_cast(&hit)); nHits++; } - TrajectorySeedCollection seeds; seedCreator_->init(GlobalTrackingRegion(), iSetup, nullptr); - seedCreator_->makeSeed(seeds, hitsFromT5); + seedCreator_->makeSeed(seeds, hitsForSeed); if (seeds.empty()) { - edm::LogInfo("LSTOutputConverter")<<"failed to convert a T5 to a seed"<surface(), &mf); + TrajectoryStateOnSurface tsos = + trajectoryStateTransform::transientState(seed.startingState(), (seed.recHits().end() - 1)->surface(), &mf); auto tsosPair = propOppo.propagateWithPath(tsos, *recHits[0].surface()); if (!tsosPair.first.isValid()) { LogDebug("LSTOutputConverter") << "Propagating to startingState opposite to momentum failed, trying along next"; tsosPair = propAlo.propagateWithPath(tsos, *recHits[0].surface()); } if (tsosPair.first.isValid()) { - PTrajectoryStateOnDet st = trajectoryStateTransform::persistentState(tsosPair.first, recHits[0].det()->geographicalId().rawId()); + PTrajectoryStateOnDet st = + trajectoryStateTransform::persistentState(tsosPair.first, recHits[0].det()->geographicalId().rawId()); - output.emplace_back(TrackCandidate(recHits,seed,st)); + if (lstTC_trackCandidateType[i] == LSTOutput::LSTTCType::T5 && !includeT5s_) { + continue; + } else { + outputTC.emplace_back(TrackCandidate(recHits, seed, st)); + } } else { - edm::LogInfo("LSTOutputConverter")<<"Failed to make a candidate initial state. Seed state is "< { }; LSTPhase2OTHitsInputProducer::LSTPhase2OTHitsInputProducer(edm::ParameterSet const& iConfig) - : phase2OTRecHitToken_(consumes(iConfig.getUntrackedParameter("phase2OTRecHits"))), + : phase2OTRecHitToken_(consumes( + iConfig.getUntrackedParameter("phase2OTRecHits"))), lstPhase2OTHitsInputPutToken_(produces()) {} void LSTPhase2OTHitsInputProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/RecoTracker/LST/plugins/LSTPixelSeedInputProducer.cc b/RecoTracker/LST/plugins/LSTPixelSeedInputProducer.cc index ee6974705827e..6cd86b2d6ac6c 100644 --- a/RecoTracker/LST/plugins/LSTPixelSeedInputProducer.cc +++ b/RecoTracker/LST/plugins/LSTPixelSeedInputProducer.cc @@ -44,7 +44,6 @@ LSTPixelSeedInputProducer::LSTPixelSeedInputProducer(edm::ParameterSet const& iC lstPixelSeedsPutToken_(produces()) { seedTokens_ = edm::vector_transform(iConfig.getUntrackedParameter>("seedTracks"), [&](const edm::InputTag& tag) { return consumes>(tag); }); - } void LSTPixelSeedInputProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { @@ -53,14 +52,13 @@ void LSTPixelSeedInputProducer::fillDescriptions(edm::ConfigurationDescriptions& desc.addUntracked("beamSpot", edm::InputTag("offlineBeamSpot")); desc.addUntracked>( - "seedTracks", - std::vector{edm::InputTag("seedTracksinitialStepSeeds"), - edm::InputTag("seedTrackshighPtTripletStepSeeds")}); + "seedTracks", + std::vector{edm::InputTag("lstInitialStepSeedTracks"), + edm::InputTag("lstHighPtTripletStepSeedTracks")}); descriptions.addWithDefaultLabel(desc); } - void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, const edm::EventSetup& iSetup) const { // Setup const auto& mf = iSetup.getData(mfToken_); @@ -82,7 +80,6 @@ void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, c std::vector see_stateTrajGlbPy; std::vector see_stateTrajGlbPz; std::vector see_q; - std::vector see_algo; std::vector> see_hitIdx; TrajectorySeedCollection see_seeds; @@ -94,21 +91,6 @@ void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, c if (seedTracks.empty()) continue; - // Get seed algo - edm::EDConsumerBase::Labels labels; - labelsForToken(seedToken, labels); - - TString label = labels.module; - //format label to match algoName - label.ReplaceAll("seedTracks", ""); - label.ReplaceAll("Seeds", ""); - label.ReplaceAll("muonSeeded", "muonSeededStep"); - //for HLT seeds // FIXME: Needed? - label.ReplaceAll("FromPixelTracks", ""); - label.ReplaceAll("PFLowPixel", ""); - label.ReplaceAll("hltDoubletRecovery", "pixelPairStep"); //random choice - int algo = reco::TrackBase::algoByName(label.Data()); - // Get seed track refs edm::RefToBaseVector seedTrackRefs; for (edm::View::size_type i = 0; i < seedTracks.size(); ++i) { @@ -117,22 +99,17 @@ void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, c edm::ProductID id = seedTracks[0].seedRef().id(); - LogTrace("TrackingNtuple") << "NEW SEED LABEL: " << label << " size: " << seedTracks.size() << " algo=" << algo - << " ProductID " << id; - for (size_t iSeed = 0; iSeed < seedTrackRefs.size(); ++iSeed) { const auto& seedTrackRef = seedTrackRefs[iSeed]; const auto& seedTrack = *seedTrackRef; const auto& seedRef = seedTrack.seedRef(); const auto& seed = *seedRef; - if (seedRef.id() != id) throw cms::Exception("LogicError") << "All tracks in 'TracksFromSeeds' collection should point to seeds in the same collection. Now the " "element 0 had ProductID " - << id << " while the element " << seedTrackRef.key() << " had " << seedTrackRef.id() - << ". The source collection is " << labels.module << "."; + << id << " while the element " << seedTrackRef.key() << " had " << seedTrackRef.id() << "."; const bool seedFitOk = !trackFromSeedFitFailed(seedTrack); @@ -150,8 +127,7 @@ void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, c const auto clusterKey = clusterRef.cluster_pixel().key(); hitIdx.push_back(clusterKey); } else { - throw cms::Exception("LSTPixelSeedInputProducer") - << "Not pixel hits found!"; + throw cms::Exception("LSTPixelSeedInputProducer") << "Not pixel hits found!"; } } @@ -170,13 +146,26 @@ void LSTPixelSeedInputProducer::produce(edm::StreamID iID, edm::Event& iEvent, c see_stateTrajGlbPy.push_back(stateGlobal.momentum().y()); see_stateTrajGlbPz.push_back(stateGlobal.momentum().z()); see_q.push_back(seedTrack.charge()); - see_algo.push_back(algo); see_hitIdx.push_back(hitIdx); see_seeds.push_back(seed); } } - pixelSeedInput.setLSTPixelSeedTraits(see_px, see_py, see_pz, see_dxy, see_dz, see_ptErr, see_etaErr, see_stateTrajGlbX, see_stateTrajGlbY, see_stateTrajGlbZ, see_stateTrajGlbPx, see_stateTrajGlbPy, see_stateTrajGlbPz, see_q, see_algo, see_hitIdx); + pixelSeedInput.setLSTPixelSeedTraits(see_px, + see_py, + see_pz, + see_dxy, + see_dz, + see_ptErr, + see_etaErr, + see_stateTrajGlbX, + see_stateTrajGlbY, + see_stateTrajGlbZ, + see_stateTrajGlbPx, + see_stateTrajGlbPy, + see_stateTrajGlbPz, + see_q, + see_hitIdx); iEvent.emplace(lstPixelSeedInputPutToken_, std::move(pixelSeedInput)); iEvent.emplace(lstPixelSeedsPutToken_, std::move(see_seeds)); } diff --git a/RecoTracker/LST/plugins/alpaka/LSTProducer.cc b/RecoTracker/LST/plugins/alpaka/LSTProducer.cc index 5e300e756b3bb..4014b1ab2b33e 100644 --- a/RecoTracker/LST/plugins/alpaka/LSTProducer.cc +++ b/RecoTracker/LST/plugins/alpaka/LSTProducer.cc @@ -20,7 +20,7 @@ #ifdef ALPAKA_ACC_GPU_CUDA_ENABLED #include "SDL/LST.h" -#endif // ALPAKA_ACC_GPU_CUDA_ENABLED +#endif // ALPAKA_ACC_GPU_CUDA_ENABLED namespace ALPAKA_ACCELERATOR_NAMESPACE { @@ -28,7 +28,9 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { public: LSTProducer(edm::ParameterSet const& config) : lstPixelSeedInputToken_{consumes(config.getParameter("pixelSeedInput"))}, - lstPhase2OTHitsInputToken_{consumes(config.getParameter("phase2OTHitsInput"))}, + lstPhase2OTHitsInputToken_{ + consumes(config.getParameter("phase2OTHitsInput"))}, + verbose_(config.getParameter("verbose")), lstOutputToken_{produces()} {} void acquire(edm::Event const& event, edm::EventSetup const& setup, edm::WaitingTaskWithArenaHolder task) override { @@ -42,6 +44,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { #ifdef ALPAKA_ACC_GPU_CUDA_ENABLED lst_.eventSetup(); lst_.run(ctx.queue().getNativeHandle(), + verbose_, pixelSeeds.px(), pixelSeeds.py(), pixelSeeds.pz(), @@ -56,20 +59,20 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { pixelSeeds.stateTrajGlbPy(), pixelSeeds.stateTrajGlbPz(), pixelSeeds.q(), - pixelSeeds.algo(), pixelSeeds.hitIdx(), phase2OTHits.detId(), phase2OTHits.x(), phase2OTHits.y(), phase2OTHits.z()); -#endif // ALPAKA_ACC_GPU_CUDA_ENABLED +#endif // ALPAKA_ACC_GPU_CUDA_ENABLED } void produce(edm::Event& event, edm::EventSetup const&) override { // Output LSTOutput lstOutput; - lstOutput.setLSTOutputTraits(lst_.hits(), lst_.len(), lst_.pt(), lst_.eta(), lst_.phi(), lst_.seedIdx(), lst_.trackCandidateType()); - + lstOutput.setLSTOutputTraits( + lst_.hits(), lst_.len(), lst_.pt(), lst_.eta(), lst_.phi(), lst_.seedIdx(), lst_.trackCandidateType()); + event.emplace(lstOutputToken_, std::move(lstOutput)); } @@ -77,17 +80,19 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { edm::ParameterSetDescription desc; desc.add("pixelSeedInput", edm::InputTag{"lstPixelSeedInputProducer"}); desc.add("phase2OTHitsInput", edm::InputTag{"lstPhase2OTHitsInputProducer"}); + desc.add("verbose", 0); descriptions.addWithDefaultLabel(desc); } private: edm::EDGetTokenT lstPixelSeedInputToken_; edm::EDGetTokenT lstPhase2OTHitsInputToken_; + const int verbose_; edm::EDPutTokenT lstOutputToken_; #ifdef ALPAKA_ACC_GPU_CUDA_ENABLED SDL::LST lst_; -#endif // ALPAKA_ACC_GPU_CUDA_ENABLED +#endif // ALPAKA_ACC_GPU_CUDA_ENABLED }; } // namespace ALPAKA_ACCELERATOR_NAMESPACE diff --git a/RecoTracker/LST/python/lstSeedTracks_cfi.py b/RecoTracker/LST/python/lstSeedTracks_cfi.py new file mode 100644 index 0000000000000..7046c616b0054 --- /dev/null +++ b/RecoTracker/LST/python/lstSeedTracks_cfi.py @@ -0,0 +1,15 @@ +import FWCore.ParameterSet.Config as cms + +lstInitialStepSeedTracks = cms.EDProducer( + "TrackFromSeedProducer", + src = cms.InputTag("initialStepSeeds"), + beamSpot = cms.InputTag("offlineBeamSpot"), + TTRHBuilder = cms.string("WithoutRefit") +) + +lstHighPtTripletStepSeedTracks = cms.EDProducer( + "TrackFromSeedProducer", + src = cms.InputTag("highPtTripletStepSeeds"), + beamSpot = cms.InputTag("offlineBeamSpot"), + TTRHBuilder = cms.string("WithoutRefit") +) diff --git a/RecoTracker/LST/python/lst_cff.py b/RecoTracker/LST/python/lst_cff.py index 23b3a8186952e..03bea461c443c 100644 --- a/RecoTracker/LST/python/lst_cff.py +++ b/RecoTracker/LST/python/lst_cff.py @@ -1,5 +1,6 @@ import FWCore.ParameterSet.Config as cms +from RecoTracker.LST.lstSeedTracks_cfi import * from RecoTracker.LST.lstPixelSeedInputProducer_cfi import * from RecoTracker.LST.lstPhase2OTHitsInputProducer_cfi import * from RecoTracker.LST.lstOutputConverter_cfi import * diff --git a/RecoTracker/LST/test/LSTAlpakaTester.py b/RecoTracker/LST/test/LSTAlpakaTester.py index 8bd9044c2e792..49dffcde8def7 100644 --- a/RecoTracker/LST/test/LSTAlpakaTester.py +++ b/RecoTracker/LST/test/LSTAlpakaTester.py @@ -85,8 +85,7 @@ # Tasks and Sequences for LST inputs process.load("RecoTracker.LST.lst_cff") -process.load("Validation.RecoTrack.trackingNtuple_cff") -lstInputTask = cms.Task(process.trackingNtupleSeedSelectors,process.siPhase2RecHits) +lstInputTask = cms.Task(process.lstInitialStepSeedTracks,process.lstHighPtTripletStepSeedTracks,process.siPhase2RecHits) lstInputSequence = cms.Sequence(lstInputTask) # Main LST Producer