Skip to content
Snippets Groups Projects
Commit 202124d9 authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'constcnv.TrigT1CaloByteStream-20201114' into 'master' 

TrigT1CaloByteStream: Use AthConstConverter.

See merge request atlas/athena!38259
parents b03aac60 3233fc37
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 138 additions and 252 deletions
Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
+ 4
− 5
View file @ 202124d9
......@@ -31,8 +31,7 @@
namespace LVL1BS {
CpByteStreamCnv::CpByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamCnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpByteStreamCnv" ),
m_tool("LVL1BS::CpByteStreamTool/CpByteStreamTool")
{
}
......@@ -66,12 +65,12 @@ StatusCode CpByteStreamCnv::initialize()
// createRep should create the bytestream from RDOs.
StatusCode CpByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
StatusCode CpByteStreamCnv::createRepConst( DataObject* pObj,
IOpaqueAddress*& pAddr ) const
{
LVL1::CPBSCollection* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to CPBSCollection";
ATH_MSG_ERROR( " Cannot cast to CPBSCollection" );
return StatusCode::FAILURE;
}
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h
+ 6
− 11
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -31,7 +30,7 @@ class CpByteStreamTool;
* @author Peter Faulkner
*/
class CpByteStreamCnv: public Converter {
class CpByteStreamCnv: public AthConstConverter {
friend class CnvFactory<CpByteStreamCnv>;
......@@ -41,22 +40,18 @@ protected:
public:
~CpByteStreamCnv();
virtual ~CpByteStreamCnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create ByteStream from Cp Container
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
virtual StatusCode createRepConst(DataObject* pObj, IOpaqueAddress*& pAddr) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpByteStreamTool> m_tool;
};
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
+ 4
− 5
View file @ 202124d9
......@@ -31,8 +31,7 @@
namespace LVL1BS {
CpByteStreamV1Cnv::CpByteStreamV1Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamV1Cnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpByteStreamV1Cnv" ),
m_tool("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool")
{
}
......@@ -66,12 +65,12 @@ StatusCode CpByteStreamV1Cnv::initialize()
// createRep should create the bytestream from RDOs.
StatusCode CpByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
StatusCode CpByteStreamV1Cnv::createRepConst( DataObject* pObj,
IOpaqueAddress*& pAddr ) const
{
LVL1::CPBSCollectionV1* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
REPORT_ERROR (StatusCode::FAILURE) << "Cannot cast to CPBSCollectionV1";
ATH_MSG_ERROR( "Cannot cast to CPBSCollectionV1" );
return StatusCode::FAILURE;
}
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
+ 6
− 10
View file @ 202124d9
......@@ -7,8 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -30,26 +30,22 @@ class CpByteStreamV1Tool;
* @author Peter Faulkner
*/
class CpByteStreamV1Cnv: public Converter {
class CpByteStreamV1Cnv: public AthConstConverter {
public:
CpByteStreamV1Cnv(ISvcLocator* svcloc);
~CpByteStreamV1Cnv();
virtual ~CpByteStreamV1Cnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create ByteStream from Cp Container
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
virtual StatusCode createRepConst(DataObject* pObj, IOpaqueAddress*& pAddr) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpByteStreamV1Tool> m_tool;
};
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
+ 4
− 5
View file @ 202124d9
......@@ -31,8 +31,7 @@
namespace LVL1BS {
CpByteStreamV2Cnv::CpByteStreamV2Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamV2Cnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpByteStreamV2Cnv" ),
m_tool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool")
{
}
......@@ -67,12 +66,12 @@ StatusCode CpByteStreamV2Cnv::initialize()
// createRep should create the bytestream from RDOs.
StatusCode CpByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
StatusCode CpByteStreamV2Cnv::createRepConst ( DataObject* pObj,
IOpaqueAddress*& pAddr ) const
{
LVL1::CPBSCollectionV2* cp = 0;
if( !SG::fromStorable( pObj, cp ) ) {
REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to CPBSCollectionV2";
ATH_MSG_ERROR( " Cannot cast to CPBSCollectionV2" );
return StatusCode::FAILURE;
}
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
+ 6
− 11
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -31,26 +30,22 @@ class CpByteStreamV2Tool;
* @author Peter Faulkner
*/
class CpByteStreamV2Cnv: public Converter {
class CpByteStreamV2Cnv: public AthConstConverter {
public:
CpByteStreamV2Cnv(ISvcLocator* svcloc);
~CpByteStreamV2Cnv();
virtual ~CpByteStreamV2Cnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create ByteStream from Cp Container
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
virtual StatusCode createRepConst (DataObject* pObj, IOpaqueAddress*& pAddr) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpByteStreamV2Tool> m_tool;
};
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
+ 7
− 15
View file @ 202124d9
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_CPREADBYTESTREAMV1CNV_H
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -32,34 +31,27 @@ class CpByteStreamV1Tool;
*/
template <typename Container>
class CpReadByteStreamV1Cnv: public Converter {
class CpReadByteStreamV1Cnv: public AthConstConverter {
public:
CpReadByteStreamV1Cnv(ISvcLocator* svcloc);
~CpReadByteStreamV1Cnv();
virtual ~CpReadByteStreamV1Cnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create Container from ByteStream
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
virtual StatusCode createObjConst(IOpaqueAddress* pAddr, DataObject*& pObj) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpByteStreamV1Tool> m_tool;
/// Service for reading bytestream
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
bool m_debug;
};
} // end namespace
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
+ 8
− 14
View file @ 202124d9
......@@ -28,10 +28,9 @@ namespace LVL1BS {
template <typename Container>
CpReadByteStreamV1Cnv<Container>::CpReadByteStreamV1Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamV1Cnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpReadByteStreamV1Cnv" ),
m_tool("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name)
m_robDataProvider("ROBDataProviderSvc", name())
{
}
......@@ -60,8 +59,6 @@ long CpReadByteStreamV1Cnv<Container>::storageType()
template <typename Container>
StatusCode CpReadByteStreamV1Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
ATH_CHECK( Converter::initialize() );
ATH_CHECK( m_tool.retrieve() );
ATH_CHECK( m_robDataProvider.retrieve() );
......@@ -72,21 +69,19 @@ StatusCode CpReadByteStreamV1Cnv<Container>::initialize()
// createObj should create the RDO from bytestream.
template <typename Container>
StatusCode CpReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
StatusCode CpReadByteStreamV1Cnv<Container>::createObjConst ( IOpaqueAddress* pAddr,
DataObject*& pObj ) const
{
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
ATH_MSG_ERROR( " Can not cast to ByteStreamAddress " );
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
}
ATH_MSG_DEBUG( " Creating Objects " << nm );
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs());
......@@ -97,9 +92,8 @@ StatusCode CpReadByteStreamV1Cnv<Container>::createObj( IOpaqueAddress* pAddr,
// size check
auto collection = std::make_unique<Container>();
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
ATH_MSG_DEBUG( " Number of ROB fragments is " << robFrags.size() );
if (robFrags.size() == 0) {
pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
+ 9
− 16
View file @ 202124d9
......@@ -34,12 +34,10 @@
namespace LVL1BS {
CpReadByteStreamV1V2Cnv::CpReadByteStreamV1V2Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamV1V2Cnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpReadByteStreamV1V2Cnv" ),
m_tool1("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
m_tool2("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_debug(false)
m_robDataProvider("ROBDataProviderSvc", name())
{
}
......@@ -64,8 +62,6 @@ long CpReadByteStreamV1V2Cnv::storageType()
StatusCode CpReadByteStreamV1V2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
ATH_CHECK( Converter::initialize() );
ATH_CHECK( m_tool1.retrieve() );
ATH_CHECK( m_tool2.retrieve() );
......@@ -76,21 +72,19 @@ StatusCode CpReadByteStreamV1V2Cnv::initialize()
// createObj should create the RDO from bytestream.
StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
StatusCode CpReadByteStreamV1V2Cnv::createObjConst( IOpaqueAddress* pAddr,
DataObject*& pObj ) const
{
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
ATH_MSG_ERROR( " Can not cast to ByteStreamAddress " );
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
}
ATH_MSG_DEBUG( " Creating Objects " << nm );
// get SourceIDs
const std::vector<uint32_t>& vID1(m_tool1->sourceIDs());
......@@ -104,10 +98,9 @@ StatusCode CpReadByteStreamV1V2Cnv::createObj( IOpaqueAddress* pAddr,
// size check
auto towerCollection = std::make_unique<DataVector<LVL1::CPMTower> >();
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags1.size()
<< ", " << robFrags2.size();
}
ATH_MSG_DEBUG( " Number of ROB fragments is " << robFrags1.size()
<< ", " << robFrags2.size() );
if (robFrags1.size() == 0 && robFrags2.size() == 0) {
pObj = SG::asStorable(std::move(towerCollection)) ;
return StatusCode::SUCCESS;
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
+ 6
− 14
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -35,27 +34,23 @@ class CpByteStreamV2Tool;
* @author Peter Faulkner
*/
class CpReadByteStreamV1V2Cnv: public Converter {
class CpReadByteStreamV1V2Cnv: public AthConstConverter {
public:
CpReadByteStreamV1V2Cnv(ISvcLocator* svcloc);
~CpReadByteStreamV1V2Cnv();
virtual ~CpReadByteStreamV1V2Cnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create CPM Towers from ByteStream
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
virtual StatusCode createObjConst (IOpaqueAddress* pAddr, DataObject*& pObj) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work pre-LS1
ToolHandle<LVL1BS::CpByteStreamV1Tool> m_tool1;
/// Tool that does the actual work post-LS1
......@@ -63,9 +58,6 @@ private:
/// Service for reading bytestream
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
bool m_debug;
};
} // end namespace
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
+ 6
− 14
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -32,34 +31,27 @@ class CpByteStreamV2Tool;
*/
template <typename Container>
class CpReadByteStreamV2Cnv: public Converter {
class CpReadByteStreamV2Cnv: public AthConstConverter {
public:
CpReadByteStreamV2Cnv(ISvcLocator* svcloc);
~CpReadByteStreamV2Cnv();
virtual ~CpReadByteStreamV2Cnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create Container from ByteStream
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
virtual StatusCode createObjConst(IOpaqueAddress* pAddr, DataObject*& pObj) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpByteStreamV2Tool> m_tool;
/// Service for reading bytestream
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
bool m_debug;
};
} // end namespace
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
+ 7
− 12
View file @ 202124d9
......@@ -28,11 +28,9 @@ namespace LVL1BS {
template <typename Container>
CpReadByteStreamV2Cnv<Container>::CpReadByteStreamV2Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamV2Cnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpReadByteStreamV2Cnv" ),
m_tool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_debug(false)
m_robDataProvider("ROBDataProviderSvc", name())
{
}
......@@ -61,8 +59,6 @@ long CpReadByteStreamV2Cnv<Container>::storageType()
template <typename Container>
StatusCode CpReadByteStreamV2Cnv<Container>::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
ATH_CHECK( Converter::initialize() );
ATH_CHECK( m_tool.retrieve() );
ATH_CHEKC( m_robDataProvider.retrieve() );
......@@ -73,13 +69,13 @@ StatusCode CpReadByteStreamV2Cnv<Container>::initialize()
// createObj should create the RDO from bytestream.
template <typename Container>
StatusCode CpReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
StatusCode CpReadByteStreamV2Cnv<Container>::createObjConst ( IOpaqueAddress* pAddr,
DataObject*& pObj ) const
{
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
ATH_MSG_ERROR( " Can not cast to ByteStreamAddress " );
return StatusCode::FAILURE;
}
......@@ -94,9 +90,8 @@ StatusCode CpReadByteStreamV2Cnv<Container>::createObj( IOpaqueAddress* pAddr,
// size check
auto collection = std::make_unique<Container>();
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
ATH_MSG_DEBUG( " Number of ROB fragments is " << robFrags.size() );
if (robFrags.size() == 0) {
pObj = SG::asStorable(std::move(collection)) ;
return StatusCode::SUCCESS;
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
+ 12
− 20
View file @ 202124d9
......@@ -33,11 +33,9 @@
namespace LVL1BS {
CpmRoiByteStreamCnv::CpmRoiByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpmRoiByteStreamCnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpmRoiByteStreamCnv" ),
m_tool("LVL1BS::CpmRoiByteStreamTool/CpmRoiByteStreamTool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_debug(false)
m_robDataProvider("ROBDataProviderSvc", name())
{
}
......@@ -62,16 +60,13 @@ long CpmRoiByteStreamCnv::storageType()
StatusCode CpmRoiByteStreamCnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
ATH_CHECK( Converter::initialize() );
ATH_CHECK( m_tool.retrieve() );
// Get ROBDataProvider
StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
REPORT_MESSAGE (MSG::WARNING) << "Failed to retrieve service "
<< m_robDataProvider;
ATH_MSG_WARNING( "Failed to retrieve service " << m_robDataProvider );
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
}
......@@ -81,21 +76,19 @@ StatusCode CpmRoiByteStreamCnv::initialize()
// createObj should create the RDO from bytestream.
StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
StatusCode CpmRoiByteStreamCnv::createObjConst( IOpaqueAddress* pAddr,
DataObject*& pObj ) const
{
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
ATH_MSG_ERROR( " Can not cast to ByteStreamAddress " );
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
}
ATH_MSG_DEBUG( " Creating Objects " << nm );
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
......@@ -106,9 +99,8 @@ StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
// size check
auto roiCollection = std::make_unique<DataVector<LVL1::CPMRoI> >();
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
ATH_MSG_DEBUG( " Number of ROB fragments is " << robFrags.size() );
if (robFrags.size() == 0) {
pObj = SG::asStorable(std::move(roiCollection)) ;
return StatusCode::SUCCESS;
......@@ -123,12 +115,12 @@ StatusCode CpmRoiByteStreamCnv::createObj( IOpaqueAddress* pAddr,
// createRep should create the bytestream from RDOs.
StatusCode CpmRoiByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
StatusCode CpmRoiByteStreamCnv::createRepConst( DataObject* pObj,
IOpaqueAddress*& pAddr ) const
{
DataVector<LVL1::CPMRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to DataVector<CPMRoI>";
ATH_MSG_ERROR( " Cannot cast to DataVector<CPMRoI>" );
return StatusCode::FAILURE;
}
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h
+ 7
− 15
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -32,7 +31,7 @@ class CpmRoiByteStreamTool;
* @author Peter Faulkner
*/
class CpmRoiByteStreamCnv: public Converter {
class CpmRoiByteStreamCnv: public AthConstConverter {
friend class CnvFactory<CpmRoiByteStreamCnv>;
......@@ -42,32 +41,25 @@ protected:
public:
~CpmRoiByteStreamCnv();
virtual ~CpmRoiByteStreamCnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create CPM RoIs from ByteStream
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
virtual StatusCode createObjConst(IOpaqueAddress* pAddr, DataObject*& pObj) const override;
/// Create ByteStream from CPM RoIs
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
virtual StatusCode createRepConst(DataObject* pObj, IOpaqueAddress*& pAddr) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpmRoiByteStreamTool> m_tool;
/// Service for reading bytestream
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
bool m_debug;
};
} // end namespace
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
+ 10
− 19
View file @ 202124d9
......@@ -33,11 +33,9 @@
namespace LVL1BS {
CpmRoiByteStreamV1Cnv::CpmRoiByteStreamV1Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpmRoiByteStreamV1Cnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpmRoiByteStreamV1Cnv" ),
m_tool("LVL1BS::CpmRoiByteStreamV1Tool/CpmRoiByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_debug(false)
m_robDataProvider("ROBDataProviderSvc", name())
{
}
......@@ -62,16 +60,13 @@ long CpmRoiByteStreamV1Cnv::storageType()
StatusCode CpmRoiByteStreamV1Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
ATH_CHECK( Converter::initialize() );
ATH_CHECK( m_tool.retrieve() );
// Get ROBDataProvider
StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
REPORT_MESSAGE (MSG::WARNING) << "Failed to retrieve service "
<< m_robDataProvider;
ATH_MSG_WARNING ("Failed to retrieve service " << m_robDataProvider );
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
}
......@@ -81,21 +76,19 @@ StatusCode CpmRoiByteStreamV1Cnv::initialize()
// createObj should create the RDO from bytestream.
StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
StatusCode CpmRoiByteStreamV1Cnv::createObjConst( IOpaqueAddress* pAddr,
DataObject*& pObj ) const
{
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
ATH_MSG_ERROR( " Can not cast to ByteStreamAddress " );
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
}
ATH_MSG_DEBUG( " Creating Objects " << nm );
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
......@@ -106,9 +99,7 @@ StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
// size check
auto roiCollection = std::make_unique<DataVector<LVL1::CPMRoI> >();
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Number of ROB fragments is " << robFrags.size();
}
ATH_MSG_DEBUG( " Number of ROB fragments is " << robFrags.size() );
if (robFrags.size() == 0) {
pObj = SG::asStorable(std::move(roiCollection)) ;
return StatusCode::SUCCESS;
......@@ -123,8 +114,8 @@ StatusCode CpmRoiByteStreamV1Cnv::createObj( IOpaqueAddress* pAddr,
// createRep should create the bytestream from RDOs.
StatusCode CpmRoiByteStreamV1Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
StatusCode CpmRoiByteStreamV1Cnv::createRepConst( DataObject* pObj,
IOpaqueAddress*& pAddr ) const
{
DataVector<LVL1::CPMRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
+ 7
− 15
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -32,36 +31,29 @@ class CpmRoiByteStreamV1Tool;
* @author Peter Faulkner
*/
class CpmRoiByteStreamV1Cnv: public Converter {
class CpmRoiByteStreamV1Cnv: public AthConstConverter {
public:
CpmRoiByteStreamV1Cnv(ISvcLocator* svcloc);
~CpmRoiByteStreamV1Cnv();
virtual ~CpmRoiByteStreamV1Cnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create CPM RoIs from ByteStream
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
virtual StatusCode createObjConst(IOpaqueAddress* pAddr, DataObject*& pObj) const override;
/// Create ByteStream from CPM RoIs
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
virtual StatusCode createRepConst(DataObject* pObj, IOpaqueAddress*& pAddr) const override ;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpmRoiByteStreamV1Tool> m_tool;
/// Service for reading bytestream
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
bool m_debug;
};
} // end namespace
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
+ 12
− 20
View file @ 202124d9
......@@ -33,11 +33,9 @@
namespace LVL1BS {
CpmRoiByteStreamV2Cnv::CpmRoiByteStreamV2Cnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("CpmRoiByteStreamV2Cnv"),
: AthConstConverter( storageType(), classID(), svcloc, "CpmRoiByteStreamV2Cnv" ),
m_tool("LVL1BS::CpmRoiByteStreamV2Tool/CpmRoiByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
m_debug(false)
m_robDataProvider("ROBDataProviderSvc", name())
{
}
......@@ -62,16 +60,13 @@ long CpmRoiByteStreamV2Cnv::storageType()
StatusCode CpmRoiByteStreamV2Cnv::initialize()
{
m_debug = msgSvc()->outputLevel(m_name) <= MSG::DEBUG;
ATH_CHECK( Converter::initialize() );
ATH_CHECK( m_tool.retrieve() );
// Get ROBDataProvider
StatusCode sc = m_robDataProvider.retrieve();
if ( sc.isFailure() ) {
REPORT_MESSAGE (MSG::WARNING) << "Failed to retrieve service "
<< m_robDataProvider;
ATH_MSG_WARNING( "Failed to retrieve service " << m_robDataProvider );
// return is disabled for Write BS which does not require ROBDataProviderSvc
// return sc ;
}
......@@ -81,21 +76,19 @@ StatusCode CpmRoiByteStreamV2Cnv::initialize()
// createObj should create the RDO from bytestream.
StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
DataObject*& pObj )
StatusCode CpmRoiByteStreamV2Cnv::createObjConst ( IOpaqueAddress* pAddr,
DataObject*& pObj ) const
{
ByteStreamAddress *pBS_Addr;
pBS_Addr = dynamic_cast<ByteStreamAddress *>( pAddr );
if ( !pBS_Addr ) {
REPORT_ERROR (StatusCode::FAILURE) << " Can not cast to ByteStreamAddress ";
ATH_MSG_ERROR( " Can not cast to ByteStreamAddress " );
return StatusCode::FAILURE;
}
const std::string nm = *( pBS_Addr->par() );
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) << " Creating Objects " << nm;
}
ATH_MSG_DEBUG( " Creating Objects " << nm );
// get SourceIDs
const std::vector<uint32_t>& vID(m_tool->sourceIDs(nm));
......@@ -106,9 +99,8 @@ StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
// size check
auto roiCollection = std::make_unique<DataVector<LVL1::CPMTobRoI> >();
if (m_debug) {
REPORT_MESSAGE (MSG::DEBUG) <<" Number of ROB fragments is " << robFrags.size();
}
ATH_MSG_DEBUG( " Number of ROB fragments is " << robFrags.size() );
if (robFrags.size() == 0) {
pObj = SG::asStorable(std::move(roiCollection)) ;
return StatusCode::SUCCESS;
......@@ -123,12 +115,12 @@ StatusCode CpmRoiByteStreamV2Cnv::createObj( IOpaqueAddress* pAddr,
// createRep should create the bytestream from RDOs.
StatusCode CpmRoiByteStreamV2Cnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
StatusCode CpmRoiByteStreamV2Cnv::createRepConst( DataObject* pObj,
IOpaqueAddress*& pAddr ) const
{
DataVector<LVL1::CPMTobRoI>* roiCollection = 0;
if( !SG::fromStorable( pObj, roiCollection ) ) {
REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to DataVector<CPMTobRoI>";
ATH_MSG_ERROR( " Cannot cast to DataVector<CPMTobRoI>" );
return StatusCode::FAILURE;
}
......
Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
+ 7
− 15
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -32,36 +31,29 @@ class CpmRoiByteStreamV2Tool;
* @author Peter Faulkner
*/
class CpmRoiByteStreamV2Cnv: public Converter {
class CpmRoiByteStreamV2Cnv: public AthConstConverter {
public:
CpmRoiByteStreamV2Cnv(ISvcLocator* svcloc);
~CpmRoiByteStreamV2Cnv();
virtual ~CpmRoiByteStreamV2Cnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create CPM RoIs from ByteStream
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
virtual StatusCode createObjConst(IOpaqueAddress* pAddr, DataObject*& pObj) const override;
/// Create ByteStream from CPM RoIs
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
virtual StatusCode createRepConst(DataObject* pObj, IOpaqueAddress*& pAddr) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::CpmRoiByteStreamV2Tool> m_tool;
/// Service for reading bytestream
ServiceHandle<IROBDataProviderSvc> m_robDataProvider;
/// Message log
bool m_debug;
};
} // end namespace
......
Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
+ 4
− 5
View file @ 202124d9
......@@ -31,8 +31,7 @@
namespace LVL1BS {
JepByteStreamCnv::JepByteStreamCnv( ISvcLocator* svcloc )
: Converter( storageType(), classID(), svcloc ),
m_name("JepByteStreamCnv"),
: AthConstConverter( storageType(), classID(), svcloc, "JepByteStreamCnv" ),
m_tool("LVL1BS::JepByteStreamTool/JepByteStreamTool")
{
}
......@@ -66,12 +65,12 @@ StatusCode JepByteStreamCnv::initialize()
// createRep should create the bytestream from RDOs.
StatusCode JepByteStreamCnv::createRep( DataObject* pObj,
IOpaqueAddress*& pAddr )
StatusCode JepByteStreamCnv::createRepConst ( DataObject* pObj,
IOpaqueAddress*& pAddr ) const
{
LVL1::JEPBSCollection* jep = 0;
if( !SG::fromStorable( pObj, jep ) ) {
REPORT_ERROR (StatusCode::FAILURE) << " Cannot cast to JEPBSCollection";
ATH_MSG_ERROR( " Cannot cast to JEPBSCollection" );
return StatusCode::FAILURE;
}
......
Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h
+ 6
− 11
View file @ 202124d9
......@@ -7,9 +7,8 @@
#include <string>
#include "AthenaBaseComps/AthConstConverter.h"
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/Converter.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
......@@ -31,7 +30,7 @@ class JepByteStreamTool;
* @author Peter Faulkner
*/
class JepByteStreamCnv: public Converter {
class JepByteStreamCnv: public AthConstConverter {
friend class CnvFactory<JepByteStreamCnv>;
......@@ -41,22 +40,18 @@ protected:
public:
~JepByteStreamCnv();
virtual ~JepByteStreamCnv();
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// Create ByteStream from JEP Container
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
virtual StatusCode createRepConst (DataObject* pObj, IOpaqueAddress*& pAddr) const override;
// Storage type and class ID
virtual long repSvcType() const { return i_repSvcType(); }
virtual long repSvcType() const override { return i_repSvcType(); }
static long storageType();
static const CLID& classID();
private:
/// Converter name
std::string m_name;
/// Tool that does the actual work
ToolHandle<LVL1BS::JepByteStreamTool> m_tool;
};
......
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