InDetPhysValMonitoring: interface and service pointer migration

Migrate to auto-declaring interfaces and use ServiceHandle.

InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/HistogramDefinitionSvc.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -16,7 +16,6 @@
 #include <map>
 #include "AthenaBaseComps/AthService.h"
 #include <memory>
-template <class TYPE> class SvcFactory;
 
 class IReadHistoDef;
 class ISvcLocator;
@@ -24,8 +23,7 @@ class StatusCode;
 class InterfaceID;
 
 
-class HistogramDefinitionSvc :virtual public IHistogramDefinitionSvc, public AthService{
-friend class SvcFactory<HistogramDefinitionSvc>;
+class HistogramDefinitionSvc : public extends<AthService, IHistogramDefinitionSvc> {
 public:
     HistogramDefinitionSvc(const std::string &name, ISvcLocator * svc);
     virtual ~HistogramDefinitionSvc();
@@ -33,8 +31,6 @@ public:
     //@{
     virtual StatusCode initialize();
     virtual StatusCode finalize();
-    //interfaceID() implementation is in the baseclass
-    virtual StatusCode queryInterface(const InterfaceID & riid, void** ppvInterface );
     //@}
     SingleHistogramDefinition definition(const std::string &name, const std::string & dirName="") const final;
     std::string histoType(const std::string &name, const std::string & dirName="") const final;

InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/IHistogramDefinitionSvc.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -19,9 +19,9 @@ class SingleHistogramDefinition;
 ///Interface class to get the histogram definition for a named histogram in a given directory
 class IHistogramDefinitionSvc:virtual public IInterface{
 public:
-	///reimplemented from IInterface
-	static const InterfaceID & interfaceID();
-  ///Format of the data source holding the histogram definition
+    DeclareInterfaceID(IHistogramDefinitionSvc,1,0);
+
+    ///Format of the data source holding the histogram definition
 	enum Formats{UNKNOWN,TEXT_XML,TEXT_PLAIN,NFORMATS};
 	///Virtual destructor does nothing
 	virtual ~IHistogramDefinitionSvc(){}
@@ -54,9 +54,5 @@ public:
 	//virtual bool initialise()=0;
 	
 };
-inline const InterfaceID & IHistogramDefinitionSvc::interfaceID(){
-  static const InterfaceID IID("IHistogramDefinitionSvc",1,0);
-  return IID;
-}
 
 #endif

InnerDetector/InDetValidation/InDetPhysValMonitoring/src/HistogramDefinitionSvc.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -23,7 +23,7 @@ namespace {
 
 
 HistogramDefinitionSvc::HistogramDefinitionSvc(const std::string& name, ISvcLocator* pSvcLocator) :
-  AthService(name, pSvcLocator), m_format{UNKNOWN}, m_reader{} {
+  base_class(name, pSvcLocator), m_format{UNKNOWN}, m_reader{} {
   declareProperty("DefinitionSource", m_source);
   declareProperty("DefinitionFormat", m_formatString = "text/plain");
 }
@@ -221,17 +221,3 @@ bool
 HistogramDefinitionSvc::formatOk() {
   return (m_format < NFORMATS)and(m_format >= 0);
 }
-
-StatusCode
-HistogramDefinitionSvc::queryInterface(const InterfaceID& riid, void** ppvInterface) {
-  if (IIncidentListener::interfaceID().versionMatch(riid)) {
-    *ppvInterface = dynamic_cast<IIncidentListener*>(this);
-  } else if (IHistogramDefinitionSvc::interfaceID().versionMatch(riid)) {
-    *ppvInterface = dynamic_cast<IHistogramDefinitionSvc*>(this);
-  } else {
-    // Interface is not directly available : try out a base class
-    return AthService::queryInterface(riid, ppvInterface);
-  }
-  addRef();
-  return StatusCode::SUCCESS;
-}

InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPlotBase.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -8,15 +8,10 @@
  **/
 
 #include "InDetPlotBase.h"
-// bring Athena/Gaudi utilities in scope
-#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/IToolSvc.h"
-// #include <iostream>
+#include "AthenaBaseComps/AthCheckMacros.h"
+
 #include "TEfficiency.h"
-// to retrieve HistogramDefinitionSvc
-#include "InDetPhysValMonitoring/HistogramDefinitionSvc.h"
+
 #include <cmath>
 
 namespace {
@@ -38,8 +33,10 @@ namespace {
 
 
 InDetPlotBase::InDetPlotBase(InDetPlotBase* pParent, const std::string& dirName) :
-  PlotBase(pParent, dirName), AthMessaging("InDetPlotBase"), m_histoDefSvc(nullptr) {
-  // nop
+  PlotBase(pParent, dirName),
+  AthMessaging("InDetPlotBase"),
+  m_histoDefSvc("HistogramDefinitionSvc", "InDetPlotBase")
+{
 }
 
 void
@@ -152,19 +149,11 @@ InDetPlotBase::fillHisto(TEfficiency* eff2d, const float xvalue, const float yva
 /**/
 SingleHistogramDefinition
 InDetPlotBase::retrieveDefinition(const std::string& histoIdentifier, const std::string& folder, const std::string & nameOverride) {
-  SingleHistogramDefinition s; // invalid result
-
-  if (not m_histoDefSvc) {
-    ISvcLocator* svcLoc = Gaudi::svcLocator();
-    StatusCode sc = svcLoc->service("HistogramDefinitionSvc", m_histoDefSvc);
-    if (sc.isFailure()) {
-      ATH_MSG_FATAL("failed to retrieve HistogramDefinitionSvc in " << __FILE__);
-      throw std::runtime_error("Could initialise the HistogramDefinitionSvc");
-      return s;
-    }
-  }
+
+  ATH_CHECK( m_histoDefSvc.retrieve(), {} );
+
   bool folderDefault = (folder.empty() or folder == "default");
-  s = m_histoDefSvc->definition(histoIdentifier, folder);
+  SingleHistogramDefinition s = m_histoDefSvc->definition(histoIdentifier, folder);
   // "default" and empty string should be equivalent
   if (folderDefault and s.empty()) {
     const std::string otherDefault = (folder.empty()) ? ("default") : "";

InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPlotBase.h

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef INDETPHYSVALMONITORING_INDETPLOTBASE
@@ -11,7 +11,9 @@
  **/
 #include "TrkValHistUtils/PlotBase.h"
 #include "AthenaBaseComps/AthMessaging.h"
+#include "GaudiKernel/ServiceHandle.h"
 #include "InDetPhysValMonitoring/SingleHistogramDefinition.h" // to make available to children
+#include "InDetPhysValMonitoring/IHistogramDefinitionSvc.h"
 
 #include <string>
 
@@ -83,7 +85,7 @@ protected:
   }
 
 private:
-  IHistogramDefinitionSvc* m_histoDefSvc;
+  ServiceHandle<IHistogramDefinitionSvc> m_histoDefSvc;
 };