Skip to content

Commit

Permalink
Fix QuadrupletSeedMerger to not to obtain SeedCreatorPSet again from …
Browse files Browse the repository at this point in the history
…the SeedCreatorPSet
  • Loading branch information
makortel committed Feb 9, 2015
1 parent c4163dc commit 6a362ba
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions RecoPixelVertexing/PixelTriplets/src/QuadrupletSeedMerger.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,12 @@ namespace {
///
///
///
namespace {
SeedCreator *createSeedCreator(const edm::ParameterSet& cfg) {
edm::ParameterSet creatorPSet = cfg.getParameter<edm::ParameterSet>("SeedCreatorPSet");
return SeedCreatorFactory::get()->create(creatorPSet.getParameter<std::string>("ComponentName") , creatorPSet);
}
}
QuadrupletSeedMerger::QuadrupletSeedMerger(const edm::ParameterSet& iConfig, edm::ConsumesCollector& iC):
QuadrupletSeedMerger(iConfig, nullptr, iC) {}
QuadrupletSeedMerger::QuadrupletSeedMerger(const edm::ParameterSet& iConfig, const edm::ParameterSet& seedCreatorConfig, edm::ConsumesCollector& iC):
QuadrupletSeedMerger(iConfig, createSeedCreator(seedCreatorConfig), iC) {}
QuadrupletSeedMerger(iConfig,
SeedCreatorFactory::get()->create(seedCreatorConfig.getParameter<std::string>("ComponentName") , seedCreatorConfig),
iC) {}
QuadrupletSeedMerger::QuadrupletSeedMerger(const edm::ParameterSet& iConfig, SeedCreator *seedCreator, edm::ConsumesCollector& iC):
theLayerBuilder_(iConfig, iC),
theSeedCreator_(seedCreator)
Expand Down

0 comments on commit 6a362ba

Please sign in to comment.