Merge pull request cms-sw#2683 from matteosan1/topic_bugfix_photonproducer

ktf · ktf · commit 579e365d13d8 · 2014-03-01T10:42:10.000+01:00
move delete of energy corrector in destructor
diff --git a/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/PhotonProducer.cc
@@ -141,7 +141,7 @@ PhotonProducer::PhotonProducer(const edm::ParameterSet& config) :
 
 PhotonProducer::~PhotonProducer() 
 {
-
+  delete thePhotonEnergyCorrector_;
   //delete energyCorrectionF;
 }
 
@@ -162,7 +162,6 @@ void  PhotonProducer::endRun (edm::Run const& r, edm::EventSetup const & theEven
 
   delete thePhotonIsolationCalculator_;
   delete thePhotonMIPHaloTagger_;
-  delete thePhotonEnergyCorrector_;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ PhotonProducer::PhotonProducer(const edm::ParameterSet& config) :`
`141`	`141`
`142`	`142`	`PhotonProducer::~PhotonProducer()`
`143`	`143`	`{`
`144`		`-`
	`144`	`+ delete thePhotonEnergyCorrector_;`
`145`	`145`	`//delete energyCorrectionF;`
`146`	`146`	`}`
`147`	`147`
`@@ -162,7 +162,6 @@ void PhotonProducer::endRun (edm::Run const& r, edm::EventSetup const & theEven`
`162`	`162`
`163`	`163`	`delete thePhotonIsolationCalculator_;`
`164`	`164`	`delete thePhotonMIPHaloTagger_;`
`165`		`- delete thePhotonEnergyCorrector_;`
`166`	`165`	`}`
`167`	`166`
`168`	`167`