Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove duplicate plugins left by #38761 and #40264 #40646

Merged
merged 2 commits into from
Feb 1, 2023
Merged

remove duplicate plugins left by #38761 and #40264 #40646

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9319fdc
remove duplicate plugins left by #38761 and #40264
missirol Jan 31, 2023
ecce942
add pixelCPEFastESProducerPhase2_cfi to TTRHBuilders_cff
missirol Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions DQM/SiPixelHeterogeneous/plugins/SiPixelCompareVertexSoA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,5 @@ void SiPixelCompareVertexSoA::fillDescriptions(edm::ConfigurationDescriptions& d
desc.add<double>("dzCut", 1.);
descriptions.addWithDefaultLabel(desc);
}
DEFINE_FWK_MODULE(SiPixelCompareVertexSoA);

using SiPixelPhase1CompareVertexSoA = SiPixelCompareVertexSoA;
DEFINE_FWK_MODULE(SiPixelPhase1CompareVertexSoA);
DEFINE_FWK_MODULE(SiPixelCompareVertexSoA);
4 changes: 1 addition & 3 deletions DQM/SiPixelHeterogeneous/plugins/SiPixelMonitorVertexSoA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,5 @@ void SiPixelMonitorVertexSoA::fillDescriptions(edm::ConfigurationDescriptions& d
desc.add<std::string>("topFolderName", "SiPixelHeterogeneous/PixelVertexSoA");
descriptions.addWithDefaultLabel(desc);
}
DEFINE_FWK_MODULE(SiPixelMonitorVertexSoA);

using SiPixelPhase1MonitorVertexSoA = SiPixelMonitorVertexSoA;
DEFINE_FWK_MODULE(SiPixelPhase1MonitorVertexSoA);
DEFINE_FWK_MODULE(SiPixelMonitorVertexSoA);
2 changes: 0 additions & 2 deletions RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelDigisClustersFromSoA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,6 @@ void SiPixelDigisClustersFromSoAT<TrackerTraits>::produce(edm::StreamID,
iEvent.put(clusterPutToken_, std::move(outputClusters));
}

using SiPixelDigisClustersFromSoA = SiPixelDigisClustersFromSoAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelDigisClustersFromSoA);
using SiPixelDigisClustersFromSoAPhase1 = SiPixelDigisClustersFromSoAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelDigisClustersFromSoAPhase1);
using SiPixelDigisClustersFromSoAPhase2 = SiPixelDigisClustersFromSoAT<pixelTopology::Phase2>;
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalTracker/SiPixelClusterizer/python/siPixelClustersPreSplitting_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
clusterThreshold_layer1 = 4000)

# convert the pixel digis (except errors) and clusters to the legacy format
from RecoLocalTracker.SiPixelClusterizer.siPixelDigisClustersFromSoA_cfi import siPixelDigisClustersFromSoA as _siPixelDigisClustersFromSoA
from RecoLocalTracker.SiPixelClusterizer.siPixelDigisClustersFromSoAPhase1_cfi import siPixelDigisClustersFromSoAPhase1 as _siPixelDigisClustersFromSoAPhase1
from RecoLocalTracker.SiPixelClusterizer.siPixelDigisClustersFromSoAPhase2_cfi import siPixelDigisClustersFromSoAPhase2 as _siPixelDigisClustersFromSoAPhase2

siPixelDigisClustersPreSplitting = _siPixelDigisClustersFromSoA.clone()
siPixelDigisClustersPreSplitting = _siPixelDigisClustersFromSoAPhase1.clone()

run3_common.toModify(siPixelDigisClustersPreSplitting,
clusterThreshold_layer1 = 4000)
Expand Down
2 changes: 0 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEFastESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ void PixelCPEFastESProducerT<TrackerTraits>::fillDescriptions(edm::Configuration
descriptions.addWithDefaultLabel(desc);
}

using PixelCPEFastESProducer = PixelCPEFastESProducerT<pixelTopology::Phase1>;
DEFINE_FWK_EVENTSETUP_MODULE(PixelCPEFastESProducer);
using PixelCPEFastESProducerPhase1 = PixelCPEFastESProducerT<pixelTopology::Phase1>;
DEFINE_FWK_EVENTSETUP_MODULE(PixelCPEFastESProducerPhase1);
using PixelCPEFastESProducerPhase2 = PixelCPEFastESProducerT<pixelTopology::Phase2>;
Expand Down
3 changes: 0 additions & 3 deletions RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ void SiPixelRecHitCUDAT<TrackerTraits>::produce(edm::StreamID streamID,
gpuAlgo_.makeHitsAsync(digis, clusters, bs, fcpe->getGPUProductAsync(ctx.stream()), ctx.stream()));
}

using SiPixelRecHitCUDA = SiPixelRecHitCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitCUDA);

using SiPixelRecHitCUDAPhase1 = SiPixelRecHitCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitCUDAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitFromCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ void SiPixelRecHitFromCUDAT<TrackerTraits>::produce(edm::Event& iEvent, edm::Eve
iEvent.emplace(rechitsPutToken_, std::move(output));
}

using SiPixelRecHitFromCUDA = SiPixelRecHitFromCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitFromCUDA);

using SiPixelRecHitFromCUDAPhase1 = SiPixelRecHitFromCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitFromCUDAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitSoAFromCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ void SiPixelRecHitSoAFromCUDAT<TrackerTraits>::produce(edm::Event& iEvent, edm::
iEvent.emplace(hitsPutTokenCPU_, std::move(hits_h_));
}

using SiPixelRecHitSoAFromCUDA = SiPixelRecHitSoAFromCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitSoAFromCUDA);

using SiPixelRecHitSoAFromCUDAPhase1 = SiPixelRecHitSoAFromCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitSoAFromCUDAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitSoAFromLegacy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,6 @@ void SiPixelRecHitSoAFromLegacyT<TrackerTraits>::produce(edm::StreamID streamID,
iEvent.put(std::move(legacyOutput));
}

using SiPixelRecHitSoAFromLegacy = SiPixelRecHitSoAFromLegacyT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitSoAFromLegacy);

using SiPixelRecHitSoAFromLegacyPhase1 = SiPixelRecHitSoAFromLegacyT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SiPixelRecHitSoAFromLegacyPhase1);

Expand Down
2 changes: 1 addition & 1 deletion RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# 2. Pixel Generic CPE
#
from RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi import *
from RecoLocalTracker.SiPixelRecHits.pixelCPEFastESProducer_cfi import *
from RecoLocalTracker.SiPixelRecHits.pixelCPEFastESProducerPhase1_cfi import *
from RecoLocalTracker.SiPixelRecHits.pixelCPEFastESProducerPhase2_cfi import *
#
# 3. ESProducer for the Magnetic-field dependent template records
Expand Down
4 changes: 2 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
)

# reconstruct the pixel rechits on the gpu
from RecoLocalTracker.SiPixelRecHits.siPixelRecHitCUDA_cfi import siPixelRecHitCUDA as _siPixelRecHitCUDA
from RecoLocalTracker.SiPixelRecHits.siPixelRecHitCUDAPhase1_cfi import siPixelRecHitCUDAPhase1 as _siPixelRecHitCUDAPhase1
from RecoLocalTracker.SiPixelRecHits.siPixelRecHitCUDAPhase2_cfi import siPixelRecHitCUDAPhase2 as _siPixelRecHitCUDAPhase2
siPixelRecHitsPreSplittingCUDA = _siPixelRecHitCUDA.clone(
siPixelRecHitsPreSplittingCUDA = _siPixelRecHitCUDAPhase1.clone(
beamSpot = "offlineBeamSpotToCUDA"
)
phase2_tracker.toReplaceWith(siPixelRecHitsPreSplittingCUDA,_siPixelRecHitCUDAPhase2.clone(
Expand Down
3 changes: 0 additions & 3 deletions RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackDumpCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ void PixelTrackDumpCUDAT<TrackerTraits>::analyze(edm::StreamID streamID,
}
}

using PixelTrackDumpCUDA = PixelTrackDumpCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelTrackDumpCUDA);

using PixelTrackDumpCUDAPhase1 = PixelTrackDumpCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelTrackDumpCUDAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackProducerFromSoA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,6 @@ void PixelTrackProducerFromSoAT<TrackerTraits>::produce(edm::StreamID streamID,
iEvent.put(std::move(indToEdmP));
}

using PixelTrackProducerFromSoA = PixelTrackProducerFromSoAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelTrackProducerFromSoA);

using PixelTrackProducerFromSoAPhase1 = PixelTrackProducerFromSoAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelTrackProducerFromSoAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackSoAFromCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ void PixelTrackSoAFromCUDAT<TrackerTraits>::produce(edm::Event& iEvent, edm::Eve
assert(!tracks_h_.buffer());
}

using PixelTrackSoAFromCUDA = PixelTrackSoAFromCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelTrackSoAFromCUDA);

using PixelTrackSoAFromCUDAPhase1 = PixelTrackSoAFromCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelTrackSoAFromCUDAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoPixelVertexing/PixelTriplets/plugins/CAHitNtupletCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ void CAHitNtupletCUDAT<TrackerTraits>::produce(edm::StreamID streamID,
}
}

using CAHitNtupletCUDA = CAHitNtupletCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(CAHitNtupletCUDA);

using CAHitNtupletCUDAPhase1 = CAHitNtupletCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(CAHitNtupletCUDAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ void PixelVertexProducerCUDAT<TrackerTraits>::produce(edm::StreamID streamID,
}
}

using PixelVertexProducerCUDA = PixelVertexProducerCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelVertexProducerCUDA);

using PixelVertexProducerCUDAPhase1 = PixelVertexProducerCUDAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(PixelVertexProducerCUDAPhase1);

Expand Down
3 changes: 0 additions & 3 deletions RecoTracker/TkSeedGenerator/plugins/SeedProducerFromSoA.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ void SeedProducerFromSoAT<TrackerTraits>::produce(edm::StreamID streamID,
iEvent.put(std::move(result));
}

using SeedProducerFromSoA = SeedProducerFromSoAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SeedProducerFromSoA);

using SeedProducerFromSoAPhase1 = SeedProducerFromSoAT<pixelTopology::Phase1>;
DEFINE_FWK_MODULE(SeedProducerFromSoAPhase1);

Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TransientTrackingRecHit/python/TTRHBuilders_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from RecoTracker.TkSeedingLayers.TTRHBuilderWithoutAngle4PixelPairs_cfi import *
from RecoTracker.TkSeedingLayers.TTRHBuilderWithoutAngle4PixelTriplets_cfi import *
#TransientTRH builder with template
from RecoLocalTracker.SiPixelRecHits.pixelCPEFastESProducer_cfi import *
from RecoLocalTracker.SiPixelRecHits.pixelCPEFastESProducerPhase1_cfi import *
from RecoLocalTracker.SiPixelRecHits.PixelCPETemplateReco_cfi import *
from RecoLocalTracker.SiPixelRecHits.PixelCPEClusterRepair_cfi import *
from RecoLocalTracker.Phase2TrackerRecHits.Phase2StripCPEESProducer_cfi import *
Expand Down