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

Fix segfault in PixelTrackReconstruction #2571

Merged
merged 1 commit into from Feb 21, 2014
Merged

Fix segfault in PixelTrackReconstruction #2571

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
4 changes: 2 additions & 2 deletions RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackReconstruction.h
View file
Open in desktop
Expand Up @@ -34,8 +34,8 @@ class PixelTrackReconstruction {
std::unique_ptr<PixelTrackFilter> theFilter;
PixelTrackCleaner * theCleaner;
std::unique_ptr<OrderedHitsGenerator> theGenerator;
TrackingRegionProducer* theRegionProducer;
QuadrupletSeedMerger *theMerger_;
std::unique_ptr<TrackingRegionProducer> theRegionProducer;
std::unique_ptr<QuadrupletSeedMerger> theMerger_;
};
#endif

11 changes: 4 additions & 7 deletions RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc
View file
Open in desktop
Expand Up @@ -35,15 +35,15 @@ using edm::ParameterSet;

PixelTrackReconstruction::PixelTrackReconstruction(const ParameterSet& cfg,
edm::ConsumesCollector && iC)
: theConfig(cfg), theFitter(0), theCleaner(0), theRegionProducer(0), theMerger_(0)
: theConfig(cfg), theFitter(0), theCleaner(0)
{
if ( cfg.exists("SeedMergerPSet") ) {
edm::ParameterSet mergerPSet = theConfig.getParameter<edm::ParameterSet>( "SeedMergerPSet" );
std::string seedmergerTTRHBuilderLabel = mergerPSet.getParameter<std::string>( "ttrhBuilderLabel" );
edm::ParameterSet seedmergerLayerList = mergerPSet.getParameter<edm::ParameterSet>( "layerList" );
bool seedmergerAddTriplets = mergerPSet.getParameter<bool>( "addRemainingTriplets" );
bool seedmergerMergeTriplets = mergerPSet.getParameter<bool>( "mergeTriplets" );
theMerger_ = new QuadrupletSeedMerger(seedmergerLayerList, iC);
theMerger_.reset(new QuadrupletSeedMerger(seedmergerLayerList, iC));
theMerger_->setMergeTriplets( seedmergerMergeTriplets );
theMerger_->setAddRemainingTriplets( seedmergerAddTriplets );
theMerger_->setTTRHBuilderLabel( seedmergerTTRHBuilderLabel );
Expand All @@ -65,21 +65,18 @@ PixelTrackReconstruction::PixelTrackReconstruction(const ParameterSet& cfg,

ParameterSet regfactoryPSet = theConfig.getParameter<ParameterSet>("RegionFactoryPSet");
std::string regfactoryName = regfactoryPSet.getParameter<std::string>("ComponentName");
theRegionProducer = TrackingRegionProducerFactory::get()->create(regfactoryName,regfactoryPSet, std::move(iC));
theRegionProducer.reset(TrackingRegionProducerFactory::get()->create(regfactoryName,regfactoryPSet, std::move(iC)));
}

PixelTrackReconstruction::~PixelTrackReconstruction()
{
delete theRegionProducer; theRegionProducer = nullptr;
halt();
}

void PixelTrackReconstruction::halt()
{
delete theFitter; theFitter=0;
delete theCleaner; theCleaner=0;
delete theRegionProducer; theRegionProducer=0;
delete theMerger_; theMerger_=0;
}

void PixelTrackReconstruction::init(const edm::EventSetup& es)
Expand All @@ -93,7 +90,7 @@ void PixelTrackReconstruction::init(const edm::EventSetup& es)
std::string cleanerName = cleanerPSet.getParameter<std::string>("ComponentName");
if (cleanerName != "none") theCleaner = PixelTrackCleanerFactory::get()->create( cleanerName, cleanerPSet);

if ( theMerger_ !=0 ) {
if (theMerger_) {
theMerger_->update( es );
}
}
Expand Down