Skip to content

Commit

Permalink
Merge pull request #21987 from gartung/TrackingTools-TransientTrack-r…
Browse files Browse the repository at this point in the history
…eturntype

TrackingTools/TransientTrack: change return type of ESProducer
  • Loading branch information
cmsbuild committed Jan 29, 2018
2 parents 44a08f1 + 5382a05 commit ae20af0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
Expand Up @@ -20,16 +20,15 @@ TransientTrackBuilderESProducer::TransientTrackBuilderESProducer(const edm::Para

TransientTrackBuilderESProducer::~TransientTrackBuilderESProducer() {}

std::shared_ptr<TransientTrackBuilder>
std::unique_ptr<TransientTrackBuilder>
TransientTrackBuilderESProducer::produce(const TransientTrackRecord & iRecord){

edm::ESHandle<MagneticField> magfield;
iRecord.getRecord<IdealMagneticFieldRecord>().get( magfield );
edm::ESHandle<GlobalTrackingGeometry> theTrackingGeometry;
iRecord.getRecord<GlobalTrackingGeometryRecord>().get(theTrackingGeometry);

_builder = std::make_shared<TransientTrackBuilder>(magfield.product(), theTrackingGeometry);
return _builder;
return std::make_unique<TransientTrackBuilder>(magfield.product(), theTrackingGeometry);

}

Expand Down
Expand Up @@ -14,9 +14,8 @@ class TransientTrackBuilderESProducer: public edm::ESProducer{
public:
TransientTrackBuilderESProducer(const edm::ParameterSet & p);
~TransientTrackBuilderESProducer() override;
std::shared_ptr<TransientTrackBuilder> produce(const TransientTrackRecord &);
std::unique_ptr<TransientTrackBuilder> produce(const TransientTrackRecord &);
private:
std::shared_ptr<TransientTrackBuilder> _builder;
edm::ParameterSet pset_;
};

Expand Down

0 comments on commit ae20af0

Please sign in to comment.