Skip to content
Snippets Groups Projects
Commit 6ccc9c2b authored by Takashi Yamanaka's avatar Takashi Yamanaka
Browse files

Merge branch 'depr.TrigT1ResultByteStream-20170415' into 'master' 

TrigT1ResultByteStream: Avoid deprecated gaudi method.

See merge request !983
parents 5d074e25 8ef14d92
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 195 deletions
Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
+ 7
− 20
View file @ 6ccc9c2b
......@@ -54,24 +54,16 @@ StatusCode RecRoIBResultByteStreamCnv< ROBF >::initialize() {
//
// Initialise the base class:
//
StatusCode sc = Converter::initialize();
if( sc.isFailure() ) {
return sc;
}
ATH_CHECK( Converter::initialize() );
MsgStream log( messageService(), "RecRoIBResultByteStreamCnv" );
MsgStream log( msgSvc(), "RecRoIBResultByteStreamCnv" );
log << MSG::DEBUG << "In initialize()" << endmsg;
//
// Get RecRoIBResultByteStreamTool:
//
sc = m_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Couldn't retrieve RecRoIBResultByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Retrieved RecRoIBResultByteStreamTool" << endmsg;
}
ATH_CHECK( m_tool.retrieve() );
log << MSG::DEBUG << "Retrieved RecRoIBResultByteStreamTool" << endmsg;
return StatusCode::SUCCESS;
......@@ -85,7 +77,7 @@ StatusCode RecRoIBResultByteStreamCnv< ROBF >::initialize() {
template< class ROBF >
StatusCode RecRoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) {
MsgStream log( messageService(), "RecRoIBResultByteStreamCnv" );
MsgStream log( msgSvc(), "RecRoIBResultByteStreamCnv" );
log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddressL1R *pAddrL1;
......@@ -100,13 +92,8 @@ StatusCode RecRoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr,
const std::vector< ROBF >& robs = pAddrL1->getPointers();
// Convert to Object
StatusCode sc = m_tool->convert( robs, result );
if( sc.isFailure() ) {
log << MSG::ERROR << "Couldn't Create Objects: " << *( pAddrL1->par() ) << endmsg;
return sc;
} else {
log << MSG::DEBUG << " Created Objects: " << *( pAddrL1->par() ) << endmsg;
}
ATH_CHECK( m_tool->convert( robs, result ) );
log << MSG::DEBUG << " Created Objects: " << *( pAddrL1->par() ) << endmsg;
pObj = SG::asStorable( result );
return StatusCode::SUCCESS;
......
Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
+ 9
− 26
View file @ 6ccc9c2b
......@@ -54,35 +54,22 @@ StatusCode RoIBResultByteStreamCnv< ROBF >::initialize() {
//
// Initialise the base class:
//
StatusCode sc = Converter::initialize();
if( sc.isFailure() ) {
return sc;
}
ATH_CHECK( Converter::initialize() );
MsgStream log( messageService(), "RoIBResultByteStreamCnv" );
MsgStream log( msgSvc(), "RoIBResultByteStreamCnv" );
log << MSG::DEBUG << "In initialize()" << endmsg;
//
// Get ByteStreamCnvSvc:
//
sc = m_ByteStreamCnvSvc.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get ByteStreamCnvSvc" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to ByteStreamCnvSvc" << endmsg;
}
ATH_CHECK( m_ByteStreamCnvSvc.retrieve() );
log << MSG::DEBUG << "Connected to ByteStreamCnvSvc" << endmsg;
//
// Get RoIBResultByteStreamTool:
//
sc = m_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get RoIBResultByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to RoIBResultByteStreamTool" << endmsg;
}
ATH_CHECK( m_tool.retrieve() );
log << MSG::DEBUG << "Connected to RoIBResultByteStreamTool" << endmsg;
return StatusCode::SUCCESS;
}
......@@ -95,7 +82,7 @@ StatusCode RoIBResultByteStreamCnv< ROBF >::initialize() {
template< class ROBF >
StatusCode RoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) {
MsgStream log( messageService(), "RoIBResultByteStreamCnv" );
MsgStream log( msgSvc(), "RoIBResultByteStreamCnv" );
log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddressL1R *pAddrL1;
......@@ -110,11 +97,7 @@ StatusCode RoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, Da
const std::vector< ROBF >& robs = pAddrL1->getPointers();
// Convert to Object
StatusCode sc = m_tool->convert( robs, result );
if( sc.isFailure() ) {
log << MSG::ERROR << "Couldn't convert the robs into RoIBResult" << endmsg;
return sc;
}
ATH_CHECK( m_tool->convert( robs, result ) );
log << MSG::DEBUG << " Created Objects: " << *( pAddrL1->par() ) <<endmsg;
......@@ -131,7 +114,7 @@ StatusCode RoIBResultByteStreamCnv< ROBF >::createObj( IOpaqueAddress* pAddr, Da
template< class ROBF >
StatusCode RoIBResultByteStreamCnv< ROBF >::createRep( DataObject* pObj, IOpaqueAddress*& pAddr ) {
MsgStream log( messageService(), "RoIBResultByteStreamCnv" );
MsgStream log( msgSvc(), "RoIBResultByteStreamCnv" );
log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamCnvSvc->getRawEvent();
......
Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
+ 11
− 33
View file @ 6ccc9c2b
......@@ -5,8 +5,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IRegistry.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
......@@ -63,41 +61,27 @@ StatusCode CTPByteStreamCnv::initialize() {
//
// Initialise the base class:
//
StatusCode sc = Converter::initialize();
if( sc.isFailure() ) {
return sc;
}
ATH_CHECK( Converter::initialize() );
MsgStream log( messageService(), "CTPByteStreamCnv" );
MsgStream log( msgSvc(), "CTPByteStreamCnv" );
log << MSG::DEBUG << "CTPByteStreamCnv in initialize() " << endmsg;
//
// Get ByteStreamCnvSvc:
//
sc = m_ByteStreamEventAccess.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to ByteStreamEventAccess interface" << endmsg;
}
ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
log << MSG::DEBUG << "Connected to ByteStreamEventAccess interface" << endmsg;
//
// Get CTPByteStreamTool:
//
sc = m_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get CTPByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endmsg;
}
ATH_CHECK( m_tool.retrieve() );
log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endmsg;
//
// Get ROBDataProvider:
//
sc = m_robDataProvider.retrieve();
if( sc.isFailure() ) {
if( m_robDataProvider.retrieve().isFailure() ) {
log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endmsg;
// return is disabled for Write BS which does not requre ROBDataProviderSvc
} else {
......@@ -119,8 +103,7 @@ StatusCode CTPByteStreamCnv::initialize() {
*/
StatusCode CTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) {
MsgStream log( messageService(), "CTPByteStreamCnv" );
MsgStream log( msgSvc(), "CTPByteStreamCnv" );
log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
......@@ -167,14 +150,10 @@ StatusCode CTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj
IROBDataProviderSvc::VROBFRAG::const_iterator it = robFrags.begin();
CTP_RDO* result = 0;
StatusCode sc = m_tool->convert( ROBData( *it ).getROBFragment(), result );
if ( sc.isFailure() ) {
log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endmsg;
return sc;
}
ATH_CHECK( m_tool->convert( ROBData( *it ).getROBFragment(), result ) );
pObj = SG::asStorable( result ) ;
return sc;
return StatusCode::SUCCESS;
}
/**
......@@ -184,8 +163,7 @@ StatusCode CTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj
*/
StatusCode CTPByteStreamCnv::createRep( DataObject* pObj, IOpaqueAddress*& pAddr ) {
MsgStream log( messageService(), "CTPByteStreamCnv" );
MsgStream log( msgSvc(), "CTPByteStreamCnv" );
log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
......
Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
+ 16
− 60
View file @ 6ccc9c2b
......@@ -4,9 +4,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IRegistry.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
......@@ -77,63 +74,40 @@ StatusCode MuCTPIByteStreamCnv::initialize() {
//
// Initialise the base class:
//
StatusCode sc = Converter::initialize();
if( sc.isFailure() ) {
return sc;
}
ATH_CHECK( Converter::initialize() );
MsgStream log( messageService(), "MuCTPIByteStreamCnv" );
MsgStream log( msgSvc(), "MuCTPIByteStreamCnv" );
log << MSG::DEBUG << "MuCTPIByteStreamCnv in initialize() " << endmsg;
//
// Get ByteStreamCnvSvc:
//
sc = m_ByteStreamEventAccess.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get ByteStreamEventAccess interface" << endmsg;
return sc;
}
ATH_CHECK( m_ByteStreamEventAccess.retrieve() );
//
// Get MuCTPIByteStreamTool:
//
sc = m_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get MuCTPIByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to MuCTPIByteStreamTool" << endmsg;
}
ATH_CHECK( m_tool.retrieve() );
log << MSG::DEBUG << "Connected to MuCTPIByteStreamTool" << endmsg;
#ifdef CTP_MUCTPI_HAVE_SAME_ROS
//
// Get CTPByteStreamTool:
//
sc = m_ctp_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get CTPByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endmsg;
}
ATH_CHECK( m_ctp_tool.retrieve() );
log << MSG::DEBUG << "Connected to CTPByteStreamTool" << endmsg;
//
// Get RecCTPByteStreamTool:
//
sc = m_ctp_rec_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get RecCTPByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endmsg;
}
ATH_CHECK( m_ctp_rec_tool.retrieve() );
log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endmsg;
#endif
//
// Get ROBDataProvider:
//
sc = m_robDataProvider.retrieve();
if( sc.isFailure() ) {
if( m_robDataProvider.retrieve().isFailure() ) {
log << MSG::WARNING << "Can't get ROBDataProviderSvc" << endmsg;
// return is disabled for Write BS which does not requre ROBDataProviderSvc
} else {
......@@ -155,8 +129,7 @@ StatusCode MuCTPIByteStreamCnv::initialize() {
*/
StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) {
MsgStream log( messageService(), "MuCTPIByteStreamCnv" );
MsgStream log( msgSvc(), "MuCTPIByteStreamCnv" );
log << MSG::DEBUG << "createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
......@@ -247,32 +220,15 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p
CTP_RDO* ctp_result = 0;
CTP_RIO* ctp_rio_result = 0;
sc = m_ctp_tool->convert( ROBData( *it ).getROBFragment(), ctp_result );
if ( sc.isFailure() ) {
log << MSG::ERROR << "Failed to create CTP_RDO " << endmsg;
return sc;
}
ATH_CHECK( m_ctp_tool->convert( ROBData( *it ).getROBFragment(), ctp_result ) );
SG::asStorable( ctp_result ) ;
sc = m_storeGate->record( ctp_result, "CTP_RDO" );
if( sc.isFailure() ) {
log << MSG::ERROR << "Cannot record CTP_RDO " << endmsg;
return sc;
}
ATH_CHECK( m_storeGate->record( ctp_result, "CTP_RDO" ) );
sc = m_ctp_rec_tool->convert( ROBData( *it ).getROBFragment(), ctp_rio_result, log );
if( sc.isFailure() ) {
log << MSG::ERROR << "Failed to create CTP_RIO object" << endmsg;
return sc;
}
ATH_CHECK( m_ctp_rec_tool->convert( ROBData( *it ).getROBFragment(), ctp_rio_result, log ) );
SG::asStorable( ctp_rio_result ) ;
sc = m_storeGate->record( ctp_rio_result, "CTP_RIO" );
if( sc.isFailure() ) {
log << MSG::ERROR << "Cannot record CTP_RIO " << endmsg;
return sc;
}
ATH_CHECK( m_storeGate->record( ctp_rio_result, "CTP_RIO" ) );
}
}
......@@ -288,7 +244,7 @@ StatusCode MuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p
*/
StatusCode MuCTPIByteStreamCnv::createRep( DataObject* pObj, IOpaqueAddress*& pAddr ) {
MsgStream log( messageService(), "MuCTPIByteStreamCnv" );
MsgStream log( msgSvc(), "MuCTPIByteStreamCnv" );
log << MSG::DEBUG << "createRep() called" << endmsg;
RawEventWrite* re = m_ByteStreamEventAccess->getRawEvent();
......
Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
+ 9
− 29
View file @ 6ccc9c2b
......@@ -5,8 +5,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IRegistry.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
#include "ByteStreamData/RawEvent.h"
#include "ByteStreamData/ROBData.h"
......@@ -62,35 +60,22 @@ StatusCode RecCTPByteStreamCnv::initialize() {
//
// Initialise the base class:
//
StatusCode sc = Converter::initialize();
if( sc.isFailure() ) {
return sc;
}
ATH_CHECK( Converter::initialize() );
MsgStream log( messageService(), "RecCTPByteStreamCnv" );
MsgStream log( msgSvc(), "RecCTPByteStreamCnv" );
log << MSG::DEBUG << "RecCTPByteStreamCnv in initialize()" << endmsg;
//
// Get RecCTPByteStreamTool:
//
sc = m_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get RecCTPByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endmsg;
}
ATH_CHECK( m_tool.retrieve() );
log << MSG::DEBUG << "Connected to RecCTPByteStreamTool" << endmsg;
//
// Get ROBDataProvider:
//
sc = m_robDataProvider.retrieve();
if( sc.isFailure() ) {
log << MSG::FATAL << "Can't get ROBDataProviderSvc" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg;
}
ATH_CHECK( m_robDataProvider.retrieve() );
log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg;
//
// Create CTPSrcIdMap:
......@@ -107,8 +92,7 @@ StatusCode RecCTPByteStreamCnv::initialize() {
*/
StatusCode RecCTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) {
MsgStream log( messageService(), "RecCTPByteStreamCnv" );
MsgStream log( msgSvc(), "RecCTPByteStreamCnv" );
log << MSG::DEBUG << "RecCTPByteStreamCnv::createObj() called" << endmsg;
ByteStreamAddress *pBS_Addr;
......@@ -148,12 +132,8 @@ StatusCode RecCTPByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& p
IROBDataProviderSvc::VROBFRAG::const_iterator it = robFrags.begin();
CTP_RIO * result = 0;
StatusCode sc = m_tool->convert( ROBData( *it ).getROBFragment(), result );
if ( sc.isFailure() ) {
log << MSG::ERROR << " Failed to create Objects: " << *( pBS_Addr->par() ) << endmsg;
return sc;
}
ATH_CHECK( m_tool->convert( ROBData( *it ).getROBFragment(), result ) );
pObj = SG::asStorable( result );
return sc;
return StatusCode::SUCCESS;
}
Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
+ 8
− 27
View file @ 6ccc9c2b
......@@ -5,8 +5,6 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IRegistry.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
#include "ByteStreamData/ROBData.h"
......@@ -61,35 +59,22 @@ StatusCode RecMuCTPIByteStreamCnv::initialize() {
//
// Initialise the base class:
//
StatusCode sc = Converter::initialize();
if ( sc.isFailure() ) {
return sc;
}
ATH_CHECK( Converter::initialize() );
MsgStream log( messageService(), "RecMuCTPIByteStreamCnv" );
MsgStream log( msgSvc(), "RecMuCTPIByteStreamCnv" );
log << MSG::DEBUG << "RecMuCTPIByteStreamCnv in initialize()" << endmsg;
//
// Get RecMuCTPIByteStreamTool:
//
sc = m_tool.retrieve();
if( sc.isFailure() ) {
log << MSG::ERROR << "Can't get RecMuCTPIByteStreamTool" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to RecMuCTPIByteStreamTool" << endmsg;
}
ATH_CHECK( m_tool.retrieve() );
log << MSG::DEBUG << "Connected to RecMuCTPIByteStreamTool" << endmsg;
//
// Get ROBDataProvider:
//
sc = m_robDataProvider.retrieve();
if( sc.isFailure() ) {
log << MSG::ERROR << "Can't get ROBDataProviderSvc" << endmsg;
return sc;
} else {
log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg;
}
ATH_CHECK( m_robDataProvider.retrieve() );
log << MSG::DEBUG << "Connected to ROBDataProviderSvc" << endmsg;
//
// Create MuCTPISrcIdMap:
......@@ -107,7 +92,7 @@ StatusCode RecMuCTPIByteStreamCnv::initialize() {
*/
StatusCode RecMuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*& pObj ) {
MsgStream log( messageService(), "RecMuCTPIByteStreamCnv" );
MsgStream log( msgSvc(), "RecMuCTPIByteStreamCnv" );
log << MSG::DEBUG << "executing createObj()" << endmsg;
ByteStreamAddress *pBS_Addr;
......@@ -150,11 +135,7 @@ StatusCode RecMuCTPIByteStreamCnv::createObj( IOpaqueAddress* pAddr, DataObject*
IROBDataProviderSvc::VROBFRAG::const_iterator it = robFrags.begin();
MuCTPI_RIO* result;
// Convert to Object
StatusCode sc = m_tool->convert( ROBData( *it ).getROBFragment(), result );
if ( sc.isFailure() ) {
log << MSG::ERROR << " Failed to create Objects " << *( pBS_Addr->par() ) << endmsg;
return sc;
}
ATH_CHECK( m_tool->convert( ROBData( *it ).getROBFragment(), result ) );
pObj = SG::asStorable( result ) ;
return StatusCode::SUCCESS;
......
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