From ca8c56f013e7ff963a2bc7f8b9fcfe919f822009 Mon Sep 17 00:00:00 2001
From: Charles Burton <burton@utexas.edu>
Date: Fri, 8 Nov 2019 20:00:43 +0000
Subject: [PATCH] rename LumiMon to match convention

---
 .../{DQTLumiMonTool.h => DQTLumiMonAlg.h}            | 12 ++++++------
 .../python/{DQTLumiMonTool.py => DQTLumiMonAlg.py}   |  4 ++--
 .../python/DataQualityToolsConfig.py                 |  2 +-
 .../share/DataQualityMon_jobOptions.py               |  2 +-
 .../src/{DQTLumiMonTool.cxx => DQTLumiMonAlg.cxx}    | 10 +++++-----
 .../src/components/DataQualityTools_entries.cxx      |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename DataQuality/DataQualityTools/DataQualityTools/{DQTLumiMonTool.h => DQTLumiMonAlg.h} (82%)
 rename DataQuality/DataQualityTools/python/{DQTLumiMonTool.py => DQTLumiMonAlg.py} (98%)
 rename DataQuality/DataQualityTools/src/{DQTLumiMonTool.cxx => DQTLumiMonAlg.cxx} (93%)

diff --git a/DataQuality/DataQualityTools/DataQualityTools/DQTLumiMonTool.h b/DataQuality/DataQualityTools/DataQualityTools/DQTLumiMonAlg.h
similarity index 82%
rename from DataQuality/DataQualityTools/DataQualityTools/DQTLumiMonTool.h
rename to DataQuality/DataQualityTools/DataQualityTools/DQTLumiMonAlg.h
index 3825b195d1b..ecfafca42af 100644
--- a/DataQuality/DataQualityTools/DataQualityTools/DQTLumiMonTool.h
+++ b/DataQuality/DataQualityTools/DataQualityTools/DQTLumiMonAlg.h
@@ -3,13 +3,13 @@
 */
 
 /**
- * @class DQTLumiMonTool
+ * @class DQTLumiMonAlg
  * @author C. D. Burton <burton@utexas.edu>
  * @date 2019/08/09
  */
 
-#ifndef DQTLUMIMONTOOL_H
-#define DQTLUMIMONTOOL_H
+#ifndef DQTLUMIMONALG_H
+#define DQTLUMIMONALG_H
 
 #include "AthenaMonitoring/AthMonitorAlgorithm.h"
 
@@ -17,10 +17,10 @@
 #include "InDetPrepRawData/PixelClusterContainer.h"
 #include "InDetIdentifier/PixelID.h"
 
-class DQTLumiMonTool : public AthMonitorAlgorithm {
+class DQTLumiMonAlg : public AthMonitorAlgorithm {
 public:
-    DQTLumiMonTool(const std::string& name, ISvcLocator* pSvcLocator);
-    virtual ~DQTLumiMonTool();
+    DQTLumiMonAlg(const std::string& name, ISvcLocator* pSvcLocator);
+    virtual ~DQTLumiMonAlg();
     virtual StatusCode initialize() override;
     virtual StatusCode fillHistograms(const EventContext& ctx) const override;
 private:
diff --git a/DataQuality/DataQualityTools/python/DQTLumiMonTool.py b/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
similarity index 98%
rename from DataQuality/DataQualityTools/python/DQTLumiMonTool.py
rename to DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
index 04bc6cd589e..ed65fceafbc 100644
--- a/DataQuality/DataQualityTools/python/DQTLumiMonTool.py
+++ b/DataQuality/DataQualityTools/python/DQTLumiMonAlg.py
@@ -16,9 +16,9 @@ def DQTLumiMonAlgConfig(flags, isOld=False):
     return helper.result()
 
 def DQTLumiMonAlgConfigByTriggerChain(helper, triggerChain='', triggerPath=''):
-    from .DataQualityToolsConf import DQTLumiMonTool
+    from .DataQualityToolsConf import DQTLumiMonAlg
+    monAlg = helper.addAlgorithm(DQTLumiMonAlg, 'DQTLumiMonAlg'+triggerPath)
 
-    monAlg = helper.addAlgorithm(DQTLumiMonTool, 'DQTLumiMonTool'+triggerPath)
     if triggerChain:
         monAlg.TriggerChain = triggerChain
         if not triggerPath:
diff --git a/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py b/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py
index 76ba01d0826..4af4843c9e5 100644
--- a/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py
+++ b/DataQuality/DataQualityTools/python/DataQualityToolsConfig.py
@@ -5,7 +5,7 @@
 def DataQualityToolsConfig(flags):
     from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
     from .DQTDataFlowMonAlg import DQTDataFlowMonAlgConfig
-    from .DQTLumiMonTool import DQTLumiMonAlgConfig
+    from .DQTLumiMonAlg import DQTLumiMonAlgConfig
     from .DQTBackgroundMon import DQTBackgroundMonAlgConfig
     from .DQTDetSynchMonAlg import DQTDetSynchMonAlgConfig
 
diff --git a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
index 1b2e72739f4..205eb918955 100644
--- a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
+++ b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
@@ -131,5 +131,5 @@ if isBeam==True and (DQMonFlags.monManEnvironment != 'tier0Raw') and rec.doInDet
     )
     ManagedAthenaGlobalPhysMon.AthenaMonTools += [ MyDQTGlobalWZFinderTool ];
 
-    from DataQualityTools.DQTLumiMonTool import DQTLumiMonAlgConfig
+    from DataQualityTools.DQTLumiMonAlg import DQTLumiMonAlgConfig
     topSequence += DQTLumiMonAlgConfig(DQMonFlags, isOld=True)
diff --git a/DataQuality/DataQualityTools/src/DQTLumiMonTool.cxx b/DataQuality/DataQualityTools/src/DQTLumiMonAlg.cxx
similarity index 93%
rename from DataQuality/DataQualityTools/src/DQTLumiMonTool.cxx
rename to DataQuality/DataQualityTools/src/DQTLumiMonAlg.cxx
index 42080566906..a1ad0c8ad83 100644
--- a/DataQuality/DataQualityTools/src/DQTLumiMonTool.cxx
+++ b/DataQuality/DataQualityTools/src/DQTLumiMonAlg.cxx
@@ -2,22 +2,22 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "DataQualityTools/DQTLumiMonTool.h"
+#include "DataQualityTools/DQTLumiMonAlg.h"
 
-DQTLumiMonTool::DQTLumiMonTool(const std::string& name, ISvcLocator* pSvcLocator)
+DQTLumiMonAlg::DQTLumiMonAlg(const std::string& name, ISvcLocator* pSvcLocator)
 : AthMonitorAlgorithm(name,pSvcLocator)
 {}
 
-DQTLumiMonTool::~DQTLumiMonTool() {}
+DQTLumiMonAlg::~DQTLumiMonAlg() {}
 
-StatusCode DQTLumiMonTool::initialize(){
+StatusCode DQTLumiMonAlg::initialize(){
     ATH_CHECK( m_VertexContainerKey.initialize() );
     ATH_CHECK( m_PixelClustersKey.initialize() );
     ATH_CHECK( m_PixelIDKey.initialize() );
     return AthMonitorAlgorithm::initialize();
 }
 
-StatusCode DQTLumiMonTool::fillHistograms(const EventContext& ctx) const {
+StatusCode DQTLumiMonAlg::fillHistograms(const EventContext& ctx) const {
     using namespace Monitored;
     auto group = getGroup("default");
 
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
index 7c953bfb9ab..c75d7e7662d 100644
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
+++ b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
@@ -5,7 +5,7 @@
 #include "DataQualityTools/DQTBackgroundMon.h"
 #include "DataQualityTools/DQTDataFlowMonTool.h"
 #include "DataQualityTools/DQTGlobalWZFinderTool.h"
-#include "DataQualityTools/DQTLumiMonTool.h"
+#include "DataQualityTools/DQTLumiMonAlg.h"
 #include "DataQualityTools/DQTDataFlowMonAlg.h"
 #include "DataQualityTools/DQTDetSynchMonAlg.h"
 
@@ -16,7 +16,7 @@ DECLARE_COMPONENT( DQTMuonIDTrackTool )
 DECLARE_COMPONENT( DQTBackgroundMon )
 DECLARE_COMPONENT( DQTDataFlowMonTool )
 DECLARE_COMPONENT( DQTGlobalWZFinderTool )
-DECLARE_COMPONENT( DQTLumiMonTool )
+DECLARE_COMPONENT( DQTLumiMonAlg )
 DECLARE_COMPONENT( DQTDataFlowMonAlg )
 DECLARE_COMPONENT( DQTDetSynchMonAlg )
 
-- 
GitLab