move delete of energy corrector in destructor
Merge pull request #2683 from matteosan1/topic_bugfix_photonproducer

move delete of energy corrector in destructor
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X