Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X

cmkuo · Mar 1, 2014 · 40f23a8 · 40f23a8
2 parents 4f78c52 + 579e365
commit 40f23a8
Showing 1 changed file with 1 addition and 2 deletions.
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_;
 }