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

A few fixes for Tracking stuffs: do not delete at endRun what is created in the constructor #1721

Merged
merged 2 commits into from Dec 9, 2013
Merged

A few fixes for Tracking stuffs: do not delete at endRun what is created in the constructor #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b80298f
A few fixes for Tracking stuffs: do not delete at endRun what is crea…
perrotta Dec 8, 2013
c9007a8
cleanup
perrotta Dec 8, 2013
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
2 changes: 1 addition & 1 deletion RecoPixelVertexing/PixelTrackFitting/src/PixelTrackReconstruction.cc
View file
Open in desktop
Expand Up @@ -58,6 +58,7 @@ PixelTrackReconstruction::PixelTrackReconstruction(const ParameterSet& cfg,

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

Expand All @@ -67,7 +68,6 @@ void PixelTrackReconstruction::halt()
delete theFitter; theFitter=0;
delete theCleaner; theCleaner=0;
delete theGenerator; theGenerator=0;
delete theRegionProducer; theRegionProducer=0;
delete theMerger_; theMerger_=0;
}

Expand Down
2 changes: 1 addition & 1 deletion ...rsionSeedGenerators/interface/PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo.h
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ class PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo{
public:
PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo(const edm::ParameterSet &,
edm::ConsumesCollector && iC);
~PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo(){};
~PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo();

void init();
void clear();
Expand Down
2 changes: 1 addition & 1 deletion ...versionSeedGenerators/interface/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.h
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ class PhotonConversionTrajectorySeedProducerFromSingleLegAlgo{

PhotonConversionTrajectorySeedProducerFromSingleLegAlgo(const edm::ParameterSet &,
edm::ConsumesCollector && iC);
~PhotonConversionTrajectorySeedProducerFromSingleLegAlgo(){};
~PhotonConversionTrajectorySeedProducerFromSingleLegAlgo();

void init();
void clear();
Expand Down
7 changes: 5 additions & 2 deletions ...ConversionSeedGenerators/src/PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo.cc
View file
Open in desktop
Expand Up @@ -37,14 +37,17 @@ PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo(const edm::ParameterSe
init();
}

PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo::~PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo() {
if(theRegionProducer!=NULL)
delete theRegionProducer;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete NULL is a valid no-op by C++ standard.

}

void PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo::
clear(){
if(theHitsGenerator!=NULL)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete NULL is a valid no-op by C++ standard.

delete theHitsGenerator;
if(theSeedCreator!=NULL)
delete theSeedCreator;
if(theRegionProducer!=NULL)
delete theRegionProducer;
}

void PhotonConversionTrajectorySeedProducerFromQuadrupletsAlgo::
Expand Down
7 changes: 5 additions & 2 deletions ...r/ConversionSeedGenerators/src/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc
View file
Open in desktop
Expand Up @@ -36,14 +36,17 @@ PhotonConversionTrajectorySeedProducerFromSingleLegAlgo(const edm::ParameterSet
init();
}

PhotonConversionTrajectorySeedProducerFromSingleLegAlgo::~PhotonConversionTrajectorySeedProducerFromSingleLegAlgo() {
if(theRegionProducer!=NULL)
delete theRegionProducer;
}

void PhotonConversionTrajectorySeedProducerFromSingleLegAlgo::
clear(){
if(theHitsGenerator!=NULL)
delete theHitsGenerator;
if(theSeedCreator!=NULL)
delete theSeedCreator;
if(theRegionProducer!=NULL)
delete theRegionProducer;
}

void PhotonConversionTrajectorySeedProducerFromSingleLegAlgo::
Expand Down
3 changes: 1 addition & 2 deletions RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromRegionHitsEDProducer.cc
View file
Open in desktop
Expand Up @@ -53,10 +53,10 @@ SeedGeneratorFromRegionHitsEDProducer::SeedGeneratorFromRegionHitsEDProducer(

SeedGeneratorFromRegionHitsEDProducer::~SeedGeneratorFromRegionHitsEDProducer()
{
delete theRegionProducer;
}

void SeedGeneratorFromRegionHitsEDProducer::endRun(edm::Run const&run, const edm::EventSetup& es) {
delete theRegionProducer;
delete theGenerator;
}

Expand All @@ -80,7 +80,6 @@ void SeedGeneratorFromRegionHitsEDProducer::beginRun(edm::Run const&run, const e
SeedCreator * aCreator = SeedCreatorFactory::get()->create( creatorName, creatorPSet);

theGenerator = new SeedGeneratorFromRegionHits(hitsGenerator, aComparitor, aCreator);

}

void SeedGeneratorFromRegionHitsEDProducer::produce(edm::Event& ev, const edm::EventSetup& es)
Expand Down