Import ElectronPhotonFourMomentumCorrection r21.2->r22

Importing ElectronPhotonFourMomentumCorrection from r21.2 -> r22

• Minimal CMakeLists.txt cleanup
• Whitespace fixes & removing editor specific characters
• Copyright -> 2020 increase

Compilation appears fine, but package not thoroughly tested yet. (tested with AB,r29 given today's nightly issues)

Tagging: @lheinric , @okiverny

PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/CalibratedEgammaProvider.cxx

@@ -11,7 +11,7 @@
 
 #include "xAODBase/IParticleHelpers.h"
 
-#include "GaudiKernel/IJobOptionsSvc.h"
+#include "Gaudi/Interfaces/IOptionsSvc.h"
 
 namespace CP {
 
@@ -30,10 +30,8 @@ StatusCode CalibratedEgammaProvider::initialize() {
 
   if(m_tool.empty()) { //set up a default tool with the es2012c calibration
       m_tool.setTypeAndName("CP::EgammaCalibrationAndSmearingTool/AutoConfiguredEgammaCalibTool");
-      ServiceHandle<IJobOptionsSvc> josvc("JobOptionsSvc",name());
-      std::string fullToolName = "ToolSvc.AutoConfiguredEgammaCalibTool";
-      StringProperty pESModel("esModel","es2012c");
-      CHECK( josvc->addPropertyToCatalogue(fullToolName,pESModel) );
+      ServiceHandle<Gaudi::Interfaces::IOptionsSvc> josvc("JobOptionsSvc",name());
+      josvc->set("ToolSvc.AutoConfiguredEgammaCalibTool.esModel", "es2012c");
   }
 
    ATH_CHECK(m_tool.retrieve());