Merge branch 'master-LumiMonName' into 'master'

rename LumiMon to match convention

See merge request atlas/athena!27799

DataQuality/DataQualityTools/DataQualityTools/DQTLumiMonTool.h → 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:

DataQuality/DataQualityTools/python/DQTLumiMonTool.py → 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:

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
 

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)

DataQuality/DataQualityTools/src/DQTLumiMonTool.cxx → 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");
 

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 )