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

Jump to bottom

RecoTracker/SiTrackerMRHTools: Change return type of ESProducers. #21994

Merged
merged 1 commit into from Jan 29, 2018
Merged

RecoTracker/SiTrackerMRHTools: Change return type of ESProducers. #21994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ MultiRecHitCollectorESProducer::MultiRecHitCollectorESProducer(const edm::Parame

MultiRecHitCollectorESProducer::~MultiRecHitCollectorESProducer() {}

std::shared_ptr<MultiRecHitCollector>
std::unique_ptr<MultiRecHitCollector>
MultiRecHitCollectorESProducer::produce(const MultiRecHitRecord& iRecord){
std::string mode = "Grouped";
if (conf_.getParameter<std::string>("Mode")=="Simple") mode = "Simple";
Expand All @@ -57,21 +57,20 @@ MultiRecHitCollectorESProducer::produce(const MultiRecHitRecord& iRecord){
std::string propagatorOppositeName = conf_.getParameter<std::string>("propagatorOpposite");
ESHandle<Propagator> propagatorOppositehandle;
iRecord.getRecord<CkfComponentsRecord>().getRecord<TrackingComponentsRecord>().get(propagatorOppositeName, propagatorOppositehandle);
collector_ = std::make_shared<GroupedDAFHitCollector>(measurementhandle.product(),
return std::make_unique<GroupedDAFHitCollector>(measurementhandle.product(),
mrhuhandle.product(),
estimatorhandle.product(),
propagatorhandle.product(),
propagatorOppositehandle.product(), debug);
}
else {
collector_ = std::make_shared<SimpleDAFHitCollector>(trackerTopologyHandle.product(),
return std::make_unique<SimpleDAFHitCollector>(trackerTopologyHandle.product(),
measurementhandle.product(),
mrhuhandle.product(),
estimatorhandle.product(),
propagatorhandle.product(), debug);
}

return collector_;

}

Expand Down
3 changes: 1 addition & 2 deletions RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h
View file
Open in desktop
Expand Up @@ -20,13 +20,12 @@ class MultiRecHitCollectorESProducer: public edm::ESProducer{
public:
MultiRecHitCollectorESProducer(const edm::ParameterSet& iConfig);
~MultiRecHitCollectorESProducer() override;
std::shared_ptr<MultiRecHitCollector> produce(const MultiRecHitRecord &);
std::unique_ptr<MultiRecHitCollector> produce(const MultiRecHitRecord &);

// Set parameter set
void setConf(const edm::ParameterSet& conf){ conf_ = conf; }

private:
std::shared_ptr<MultiRecHitCollector> collector_;
edm::ParameterSet conf_;

};
Expand Down
9 changes: 4 additions & 5 deletions RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.cc
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ SiTrackerMultiRecHitUpdatorESProducer::SiTrackerMultiRecHitUpdatorESProducer(con

SiTrackerMultiRecHitUpdatorESProducer::~SiTrackerMultiRecHitUpdatorESProducer() {}

std::shared_ptr<SiTrackerMultiRecHitUpdator>
std::unique_ptr<SiTrackerMultiRecHitUpdator>
SiTrackerMultiRecHitUpdatorESProducer::produce(const MultiRecHitRecord & iRecord){
std::vector<double> annealingProgram = pset_.getParameter<std::vector<double> >("AnnealingProgram");
float Chi2Cut1D = pset_.getParameter<double>("ChiSquareCut1D");
Expand All @@ -35,10 +35,9 @@ SiTrackerMultiRecHitUpdatorESProducer::produce(const MultiRecHitRecord & iRecord
iRecord.getRecord<CkfComponentsRecord>().getRecord<TrackingComponentsRecord>().get(hitpropagator, hhitpropagator);

bool debug = pset_.getParameter<bool>("Debug");
//_updator = std::make_shared<SiTrackerMultiRecHitUpdator>(pDD.product(), pp, sp, mp, annealingProgram);
_updator = std::make_shared<SiTrackerMultiRecHitUpdator>(hbuilder.product(),hhitpropagator.product(), Chi2Cut1D, Chi2Cut2D, annealingProgram, debug);
// _updator = std::make_shared<SiTrackerMultiRecHitUpdator>(hhitpropagator.product(),annealingProgram);
return _updator;
//_updator = std::make_unique<SiTrackerMultiRecHitUpdator>(pDD.product(), pp, sp, mp, annealingProgram);
// _updator = std::make_unique<SiTrackerMultiRecHitUpdator>(hhitpropagator.product(),annealingProgram);
return std::make_unique<SiTrackerMultiRecHitUpdator>(hbuilder.product(),hhitpropagator.product(), Chi2Cut1D, Chi2Cut2D, annealingProgram, debug);
}


3 changes: 1 addition & 2 deletions RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h
View file
Open in desktop
Expand Up @@ -12,9 +12,8 @@ class SiTrackerMultiRecHitUpdatorESProducer: public edm::ESProducer{
public:
SiTrackerMultiRecHitUpdatorESProducer(const edm::ParameterSet & p);
~SiTrackerMultiRecHitUpdatorESProducer() override;
std::shared_ptr<SiTrackerMultiRecHitUpdator> produce(const MultiRecHitRecord &);
std::unique_ptr<SiTrackerMultiRecHitUpdator> produce(const MultiRecHitRecord &);
private:
std::shared_ptr<SiTrackerMultiRecHitUpdator> _updator;
edm::ParameterSet pset_;
};

Expand Down