Commit d3a22571 authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (MuonByteStream-03-06-07)

        * Tagging MuonByteStream-03-06-07.
	* AthenaBaseComps migration.
parent 37036972
################################################################################
# Package: MuonByteStream
################################################################################
# Declare the package name:
atlas_subdir( MuonByteStream )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Event/ByteStreamCnvSvcBase
Event/ByteStreamData
GaudiKernel
MuonSpectrometer/MuonCnv/MuonCSC_CnvTools
MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces
PRIVATE
Control/CLIDSvc
Control/SGTools
Control/StoreGate
MuonSpectrometer/MuonCablings/CSCcabling
MuonSpectrometer/MuonCablings/RPCcablingInterface
MuonSpectrometer/MuonCnv/MuonMDT_CnvTools
MuonSpectrometer/MuonCnv/MuonRPC_CnvTools
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonRDO )
# External dependencies:
find_package( tdaq-common )
# Component(s) in the package:
atlas_add_component( MuonByteStream
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel SGTools StoreGateLib SGtests CSCcablingLib RPCcablingInterfaceLib MuonIdHelpersLib MuonRDO )
# Install files from the package:
atlas_install_headers( MuonByteStream )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
......@@ -6,14 +6,14 @@
#define MUONBYTESTREAM_MDTRAWDATAPROVIDER_H
// Base class
#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
namespace Muon {
class IMuonRawDataProviderTool;
class MdtRawDataProvider : public Algorithm
class MdtRawDataProvider : public AthAlgorithm
{
public:
......@@ -34,8 +34,6 @@ public:
private:
MsgStream m_log;
ToolHandle<Muon::IMuonRawDataProviderTool> m_rawDataTool;
};
} // ns end
......
......@@ -6,14 +6,14 @@
#define MUONBYTESTREAM_RPCRAWDATAPROVIDER_H
// Base class
#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
namespace Muon {
class IMuonRawDataProviderTool;
class RpcRawDataProvider : public Algorithm
class RpcRawDataProvider : public AthAlgorithm
{
public:
......@@ -35,7 +35,6 @@ public:
private:
MsgStream m_log;
ToolHandle<Muon::IMuonRawDataProviderTool> m_rawDataTool;
};
} // ns end
......
......@@ -6,7 +6,7 @@
#define MUONBYTESTREAM_TGCRAWDATAPROVIDER_H
// Base class
#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -16,7 +16,7 @@ namespace Muon
{
class IMuonRawDataProviderTool;
class TgcRawDataProvider : public Algorithm
class TgcRawDataProvider : public AthAlgorithm
{
public:
......@@ -36,7 +36,6 @@ public:
~TgcRawDataProvider();
private:
MsgStream m_log;
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
ToolHandle<Muon::IMuonRawDataProviderTool> m_rawDataTool;
std::vector<uint32_t> m_robIds;
......
......@@ -10,8 +10,7 @@
Muon::MdtRawDataProvider::MdtRawDataProvider(const std::string& name,
ISvcLocator* pSvcLocator) :
Algorithm(name, pSvcLocator),
m_log (msgSvc(), name),
AthAlgorithm(name, pSvcLocator),
m_rawDataTool ("MdtRawDataProviderTool")
{
declareProperty ("ProviderTool", m_rawDataTool);
......@@ -27,15 +26,8 @@ Muon::MdtRawDataProvider::~MdtRawDataProvider(){
StatusCode Muon::MdtRawDataProvider::initialize() {
m_log << MSG::INFO << "MdtRawDataProvider::initialize" << endreq;
// Get MdtRawDataProviderTool
if (m_rawDataTool.retrieve().isFailure()) {
m_log << MSG::FATAL << "Failed to retrieve serive " << m_rawDataTool << endreq;
return StatusCode::FAILURE;
} else
m_log << MSG::INFO << "Retrieved service " << m_rawDataTool << endreq;
ATH_MSG_INFO( "MdtRawDataProvider::initialize" );
ATH_CHECK( m_rawDataTool.retrieve() );
return StatusCode::SUCCESS;
}
......@@ -46,15 +38,13 @@ StatusCode Muon::MdtRawDataProvider::finalize() {
// Execute
StatusCode Muon::MdtRawDataProvider::execute() {
m_log.setLevel( outputLevel() );
m_log << MSG::VERBOSE << "MdtRawDataProvider::execute" << endreq;
ATH_MSG_VERBOSE( "MdtRawDataProvider::execute" );
// ask MdtRawDataProviderTool to decode it and to fill the IDC
if (m_rawDataTool->convert().isFailure())
m_log << MSG::ERROR << "BS conversion into RDOs failed" << endreq;
ATH_MSG_ERROR( "BS conversion into RDOs failed" );
// m_log << MSG::INFO << "Number of Collections in IDC " << m_container->numberOfCollections() << endreq;
// ATH_MSG_INFO( "Number of Collections in IDC " << m_container->numberOfCollections() );
return StatusCode::SUCCESS;
}
......
......@@ -10,8 +10,7 @@
Muon::RpcRawDataProvider::RpcRawDataProvider(const std::string& name,
ISvcLocator* pSvcLocator) :
Algorithm(name, pSvcLocator),
m_log (msgSvc(), name),
AthAlgorithm(name, pSvcLocator),
m_rawDataTool ("RpcRawDataProviderTool")
//m_cablingSvc ("IRPCcablingSvc", name)
{
......@@ -27,17 +26,8 @@ Muon::RpcRawDataProvider::~RpcRawDataProvider(){
// Initialize
StatusCode Muon::RpcRawDataProvider::initialize() {
m_log.setLevel( outputLevel() );
m_log << MSG::INFO << "RpcRawDataProvider::initialize" << endreq;
// Get RpcRawDataProviderTool
if (m_rawDataTool.retrieve().isFailure()) {
m_log << MSG::FATAL << "Failed to retrieve serive " << m_rawDataTool << endreq;
return StatusCode::FAILURE;
} else
m_log << MSG::INFO << "Retrieved service " << m_rawDataTool << endreq;
ATH_MSG_INFO( "RpcRawDataProvider::initialize" );
ATH_CHECK( m_rawDataTool.retrieve() );
return StatusCode::SUCCESS;
}
......@@ -48,13 +38,11 @@ StatusCode Muon::RpcRawDataProvider::finalize() {
// Execute
StatusCode Muon::RpcRawDataProvider::execute() {
m_log.setLevel( outputLevel() );
m_log << MSG::VERBOSE << "RpcRawDataProvider::execute" << endreq;
ATH_MSG_VERBOSE( "RpcRawDataProvider::execute" );
// ask RpcRawDataProviderTool to decode it and to fill the IDC
if (m_rawDataTool->convert().isFailure())
m_log << MSG::ERROR << "BS conversion into RDOs failed" << endreq;
ATH_MSG_ERROR( "BS conversion into RDOs failed" );
return StatusCode::SUCCESS;
}
......
......@@ -16,8 +16,7 @@ using eformat::helper::SourceIdentifier;
Muon::TgcRawDataProvider::TgcRawDataProvider(const std::string& name,
ISvcLocator* pSvcLocator) :
Algorithm(name, pSvcLocator),
m_log (msgSvc(), name),
AthAlgorithm(name, pSvcLocator),
m_robDataProvider ("ROBDataProviderSvc",name),
m_rawDataTool ("TgcRawDataProviderTool")
{
......@@ -34,25 +33,9 @@ Muon::TgcRawDataProvider::~TgcRawDataProvider()
StatusCode Muon::TgcRawDataProvider::initialize()
{
m_log << MSG::INFO << "TgcRawDataProvider::initialize" << endreq;
// Get ROBDataProviderSvc
if (m_robDataProvider.retrieve().isFailure())
{
m_log << MSG::FATAL << "Failed to retrieve serive " << m_robDataProvider << endreq;
return StatusCode::FAILURE;
}
else
m_log << MSG::INFO << "Retrieved service " << m_robDataProvider << endreq;
// Get TgcRawDataProviderTool
if (m_rawDataTool.retrieve().isFailure())
{
m_log << MSG::FATAL << "Failed to retrieve serive " << m_rawDataTool << endreq;
return StatusCode::FAILURE;
}
else
m_log << MSG::INFO << "Retrieved service " << m_rawDataTool << endreq;
ATH_MSG_INFO( "TgcRawDataProvider::initialize" );
ATH_CHECK( m_robDataProvider.retrieve() );
ATH_CHECK( m_rawDataTool.retrieve() );
TgcRdoIdHash rdoIdHash;
for (int i = 0; i < rdoIdHash.max(); i++)
......@@ -73,18 +56,17 @@ StatusCode Muon::TgcRawDataProvider::finalize()
StatusCode Muon::TgcRawDataProvider::execute()
{
m_log.setLevel( outputLevel() );
m_log << MSG::VERBOSE << "TgcRawDataProvider::execute" << endreq;
ATH_MSG_VERBOSE( "TgcRawDataProvider::execute" );
// ask ROBDataProviderSvc for the vector of ROBFragment for all TGC ROBIDs
std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> vecOfRobf;
m_robDataProvider->getROBData(m_robIds, vecOfRobf);
m_log << MSG::VERBOSE << "Number of ROB fragments " << vecOfRobf.size() << endreq;
ATH_MSG_VERBOSE( "Number of ROB fragments " << vecOfRobf.size() );
// ask TgcRawDataProviderTool to decode it and to fill the IDC
if (m_rawDataTool->convert(vecOfRobf).isFailure())
m_log << MSG::ERROR << "BS conversion into RDOs failed" << endreq;
ATH_MSG_ERROR( "BS conversion into RDOs failed" );
return StatusCode::SUCCESS;
}
......
Supports Markdown
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