Merge pull request #49324 from mmusich/mm_cleanUpTrackeringAlpakaSpecialization

Clean-up specializations of `PixelTrackProducerFromSoAAlpaka` and `SiPixelRecHitFromSoAAlpaka`

Author: cmsbuild

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

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-hltPhase2PixelTracksCAExtension = cms.EDProducer("PixelTrackProducerFromSoAAlpakaPhase2",
+hltPhase2PixelTracksCAExtension = cms.EDProducer("PixelTrackProducerFromSoAAlpaka",
     beamSpot = cms.InputTag("hltOnlineBeamSpot"),
     minNumberOfHits = cms.int32(0),
     minQuality = cms.string('tight'),

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

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-hltPhase2PixelTracks = cms.EDProducer("PixelTrackProducerFromSoAAlpakaPhase2",
+hltPhase2PixelTracks = cms.EDProducer("PixelTrackProducerFromSoAAlpaka",
     beamSpot = cms.InputTag("hltOnlineBeamSpot"),
     minNumberOfHits = cms.int32(0),
     minQuality = cms.string('tight'),
@@ -31,4 +31,4 @@
     mightGet = cms.optional.untracked.vstring,
     passLabel = cms.string('hltPhase2PixelTracks')
 )
-phase2LegacyPixelTracks.toReplaceWith(hltPhase2PixelTracks, _hltPhase2PixelTracksLegacy)
+phase2LegacyPixelTracks.toReplaceWith(hltPhase2PixelTracks, _hltPhase2PixelTracksLegacy)

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

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-hltSiPixelRecHits = cms.EDProducer('SiPixelRecHitFromSoAAlpakaPhase2',
+hltSiPixelRecHits = cms.EDProducer('SiPixelRecHitFromSoAAlpaka',
     pixelRecHitSrc = cms.InputTag('hltPhase2SiPixelRecHitsSoA'),
     src = cms.InputTag('hltSiPixelClusters'),
 )

RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitFromSoAAlpaka.cc

@@ -177,13 +177,5 @@ void SiPixelRecHitFromSoAAlpaka::produce(edm::StreamID streamID,
   iEvent.emplace(rechitsPutToken_, std::move(output));
 }
 
-using SiPixelRecHitFromSoAAlpakaPhase1 = SiPixelRecHitFromSoAAlpaka;
-using SiPixelRecHitFromSoAAlpakaPhase2 = SiPixelRecHitFromSoAAlpaka;
-using SiPixelRecHitFromSoAAlpakaHIonPhase1 = SiPixelRecHitFromSoAAlpaka;
-
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(SiPixelRecHitFromSoAAlpaka);
-// Keeping these to ease the migration of the HLT menu
-DEFINE_FWK_MODULE(SiPixelRecHitFromSoAAlpakaPhase1);
-DEFINE_FWK_MODULE(SiPixelRecHitFromSoAAlpakaPhase2);
-DEFINE_FWK_MODULE(SiPixelRecHitFromSoAAlpakaHIonPhase1);

RecoTracker/PixelTrackFitting/plugins/PixelTrackProducerFromSoAAlpaka.cc

@@ -508,12 +508,3 @@ void PixelTrackProducerFromSoAAlpaka::produce(edm::StreamID streamID,
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(PixelTrackProducerFromSoAAlpaka);
-
-// (also) for HLT migration, could be removed once done
-using PixelTrackProducerFromSoAAlpakaPhase1 = PixelTrackProducerFromSoAAlpaka;
-using PixelTrackProducerFromSoAAlpakaPhase2 = PixelTrackProducerFromSoAAlpaka;
-using PixelTrackProducerFromSoAAlpakaHIonPhase1 = PixelTrackProducerFromSoAAlpaka;
-
-DEFINE_FWK_MODULE(PixelTrackProducerFromSoAAlpakaPhase1);
-DEFINE_FWK_MODULE(PixelTrackProducerFromSoAAlpakaPhase2);
-DEFINE_FWK_MODULE(PixelTrackProducerFromSoAAlpakaHIonPhase1);