Commit f5c194f9 authored by Charles Burton's avatar Charles Burton Committed by Walter Lampl
Browse files

Migrate Monitoring Inclusions

parent 02c4711a
......@@ -36,7 +36,7 @@ atlas_depends_on_subdirs(
LArCalorimeter/LArRawConditions
LumiBlock/LumiBlockComps
Trigger/TrigAnalysis/TrigAnalysisInterfaces
Control/AthenaMonitoring )
Control/AthenaMonitoringKernel )
# External dependencies:
find_package( AIDA )
......@@ -59,7 +59,7 @@ atlas_add_library( CaloRecLib
StoreGateLib LArToolsLib LumiBlockCompsLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES}
${EIGEN_LIBRARIES} AthAllocators IdDictParser EventKernel
FourMom NavFourMom AthenaMonitoringLib )
FourMom NavFourMom AthenaMonitoringKernelLib )
atlas_add_component( CaloRec
src/components/*.cxx
......
......@@ -3,7 +3,7 @@
*/
#include "CaloBCIDAvgAlg.h"
#include "AthenaMonitoring/Monitored.h"
#include "AthenaMonitoringKernel/Monitored.h"
//#define DONTDO
......
......@@ -18,7 +18,7 @@
#include "LArCabling/LArOnOffIdMapping.h"
#include "LumiBlockData/LuminosityCondData.h"
#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
#include "AthenaMonitoring/GenericMonitoringTool.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
class CaloBCIDAvgAlg : public AthReentrantAlgorithm {
public:
......
......@@ -10,13 +10,13 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
Control/AthenaMonitoring )
Control/AthenaMonitoringKernel )
# Component(s) in the package:
atlas_add_component( AthExMonitored
src/*.cxx
src/components/*.cxx
LINK_LIBRARIES GaudiKernel AthenaBaseComps AthenaMonitoringLib)
LINK_LIBRARIES GaudiKernel AthenaBaseComps AthenaMonitoringKernelLib)
# Install files from the package:
atlas_install_joboptions( share/*.py )
......
......@@ -7,7 +7,7 @@ job = AlgSequence()
from AthExMonitored.AthExMonitoredConf import MonitoredAlg
job += MonitoredAlg('MonAlg')
from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
monTool = GenericMonitoringTool('MonTool')
......
......@@ -3,7 +3,7 @@
*/
#include "MonitoredAlg.h"
#include "AthenaMonitoring/Monitored.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include <vector>
#include <cmath>
......
......@@ -8,7 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaMonitoring/GenericMonitoringTool.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
#include <string>
......
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
\ No newline at end of file
#include "AthenaMonitoringKernel/Monitored.h"
\ No newline at end of file
#include "AthenaMonitoringKernel/OHLockedHist.h"
\ No newline at end of file
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,defineHistogram # noqa: F401
......@@ -13,7 +13,7 @@
// ********************************************************************
#include "DataQualityTools/DQTDataFlowMonAlg.h"
#include "AthenaMonitoring/Monitored.h"
#include "AthenaMonitoringKernel/Monitored.h"
using xAOD::EventInfo;
......
......@@ -26,7 +26,7 @@
#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "TProfile.h"
#include "AthenaMonitoring/Monitored.h"
#include "AthenaMonitoringKernel/Monitored.h"
#if ROOT_VERSION_CODE >= ROOT_VERSION(6,0,0)
# define CAN_REBIN(hist) hist->SetCanExtend(TH1::kAllAxes)
......
......@@ -10,7 +10,7 @@ atlas_depends_on_subdirs(
PRIVATE
GaudiKernel
Control/AthenaBaseComps
Control/AthenaMonitoring
Control/AthenaMonitoringKernel
Event/ByteStreamCnvSvcBase
Event/ByteStreamCnvSvc
Event/ByteStreamData
......@@ -29,7 +29,7 @@ atlas_add_component(
${TDAQ-COMMON_INCLUDE_DIRS}
PRIVATE_LINK_LIBRARIES
${TDAQ-COMMON_LIBRARIES} AthenaBaseComps ByteStreamData
AthenaMonitoringLib ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib
AthenaMonitoringKernelLib ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib
GaudiKernel xAODEventInfo TrigKernel )
# Install files from the package
......
......@@ -3,7 +3,7 @@
#
from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConf import TrigByteStreamInputSvc as _TrigByteStreamInputSvc
from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
class TrigByteStreamInputSvc(_TrigByteStreamInputSvc):
def __init__(self, name='TrigByteStreamInputSvc'):
......
......@@ -9,7 +9,7 @@
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "ByteStreamData/RawEvent.h"
#include "AthenaKernel/SlotSpecificObj.h"
#include "AthenaMonitoring/Monitored.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include <memory.h>
// Forward declarations
......
......@@ -10,10 +10,11 @@ atlas_depends_on_subdirs( PRIVATE
Control/AthenaBaseComps
Control/AthenaInterprocess
Control/AthenaKernel
Control/AthenaMonitoring
Control/AthenaMonitoringKernel
Control/CxxUtils
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
Database/RDBAccessSvc
Event/ByteStreamCnvSvcBase
Event/ByteStreamData
Event/EventInfoUtils
......@@ -38,7 +39,7 @@ atlas_add_component( TrigServices
${TDAQ-COMMON_INCLUDE_DIRS} ${TDAQ_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES
${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} ${CORAL_LIBRARIES}
AthenaBaseComps AthenaInterprocess AthenaKernel AthenaMonitoringLib AthenaPoolUtilities
AthenaBaseComps AthenaInterprocess AthenaKernel AthenaMonitoringKernelLib AthenaPoolUtilities
ByteStreamCnvSvcBaseLib ByteStreamData EventInfoUtils GaudiKernel StoreGateLib TrigKernel
TrigOutputHandlingLib TrigSteeringEvent xAODEventInfo )
......
......@@ -13,7 +13,7 @@ class TrigCOOLUpdateHelper(_TrigCOOLUpdateHelper):
def __init__(self, name='TrigCOOLUpdateHelper'):
super(TrigCOOLUpdateHelper, self).__init__(name)
from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
self.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name)
self.MonTool.defineHistogram('TIME_CoolFolderUpdate', path='EXPERT', type='TH1F',
title='Time for conditions update;time [ms]',
......@@ -94,7 +94,7 @@ class HltROBDataProviderSvc(_HltROBDataProviderSvc):
def __init__(self, name='ROBDataProviderSvc'):
super(HltROBDataProviderSvc, self).__init__(name)
from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool,defineHistogram
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,defineHistogram
self.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name)
self.MonTool.Histograms = [
defineHistogram('TIME_ROBReserveData', path='EXPERT', type='TH1F',
......
......@@ -13,7 +13,7 @@
// Athena includes
#include "AthenaInterprocess/Incidents.h"
#include "AthenaKernel/AthStatusCode.h"
#include "AthenaMonitoring/OHLockedHist.h"
#include "AthenaMonitoringKernel/OHLockedHist.h"
#include "ByteStreamData/ByteStreamMetadata.h"
#include "ByteStreamData/ByteStreamMetadataContainer.h"
#include "EventInfoUtils/EventInfoFromxAOD.h"
......
......@@ -17,7 +17,7 @@
// Framework includes
#include "AthenaBaseComps/AthService.h"
#include "AthenaKernel/SlotSpecificObj.h"
#include "AthenaMonitoring/Monitored.h"
#include "AthenaMonitoringKernel/Monitored.h"
// STL includes
#include <string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment