diff --git a/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h b/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h
index 796c429292ceec702e36104d84c3a71175398bb2..34e22a0d94a5a60e4a879916e26e1c91f85520a9 100755
--- a/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h
+++ b/Trigger/TrigFTK/TrigFTKByteStream/TrigFTKByteStream/TrigFTKByteStreamCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TrigTrigFTKByteStreamCnv_h
@@ -12,9 +12,6 @@
*
* @brief Gaudi bytestream Converter for the TrigFTK class
*
- *
- * File and Version Information:
- * $Id:
**********************************************************************************/
#include "GaudiKernel/Converter.h"
@@ -24,16 +21,10 @@
#include "TrigFTKByteStream/TrigFTKByteStreamTool.h"
-//#include <string>
-
// forward declarations
class IROBDataProviderSvc;
class IByteStreamEventAccess;
-
-// Externals
-extern unsigned char ByteStream_StorageType;
-
namespace FTK {
class FTKByteStreamTool;
@@ -79,7 +70,7 @@ namespace FTK {
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr); //!< create bytestream from RDOs (TrigFTK)
// Storage type and class ID
- static unsigned char storageType() { return ByteStream_StorageType; } //!< used for the converter
+ static unsigned char storageType() { return ByteStreamAddress::storageType(); } //!< used for the converter
static const CLID& classID(); //!< CLID
long repSvcType() const { return i_repSvcType(); } //!< return repSvcType
diff --git a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx
index 82c13c99b19e84cbdb2627244eadc8a89d181c55..6a5ccd81255d61a46bce4af51a723d7746de0cf5 100755
--- a/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx
+++ b/Trigger/TrigFTK/TrigFTKByteStream/src/TrigFTKByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "ByteStreamData/ROBData.h"
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
FTK::TrigFTKByteStreamCnv::TrigFTKByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(),svcloc),
+ Converter(storageType(), classID(),svcloc),
m_log(0),
m_tool("FTK::TrigFTKByteStreamTool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", "TrigFTKByteStreamCnv"),
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.icc b/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.icc
deleted file mode 100755
index da5df67e347bcb8f7cee62f7e8c3544d8d440112..0000000000000000000000000000000000000000
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamCnv.icc
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- c++ -*-
-
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include "TrigHLTResultByteStream/HLTResultByteStreamTool.h"
-#include "TrigHLTResultByteStream/HLTSrcIdMap.h"
-
-#include "ByteStreamCnvSvcBase/ByteStreamAddressL1R.h"
-#include "ByteStreamData/RawEvent.h"
-//#include "eformat/RawMemoryFragment.h"
-//#include "eformat/RawMemorySimpleFragment.h"
-
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/DataObject.h"
-#include "GaudiKernel/IRegistry.h"
-
-#include "TrigSteeringEvent/HLTResult.h"
-
-#include "StoreGate/StoreGate.h"
-//#include "StoreGate/tools/ClassID_traits.h"
-#include "AthenaKernel/CLASS_DEF.h"
-
-// Tool
-#include "GaudiKernel/IToolSvc.h"
-
-#include <map>
-
-/**
- Constructor
-*/
-template <class ROBF>
-HLT::HLTResultByteStreamCnv<ROBF>::HLTResultByteStreamCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc)
-{
-}
-
-/**
- CLID
-*/
-template <class ROBF>
-const CLID& HLT::HLTResultByteStreamCnv<ROBF>::classID(){
-return ClassID_traits<HLTResult>::ID() ;
-}
-
-
-/**
- Init method gets all necessary services etc.
-*/
-template <class ROBF>
-StatusCode HLT::HLTResultByteStreamCnv<ROBF>::initialize()
-{
- StatusCode sc = Converter::initialize();
- if(StatusCode::SUCCESS!=sc)
- {
- return sc;
- }
-
- m_log = new MsgStream(msgSvc(), "HLTResultByteStreamCnv");
- (*m_log) << MSG::DEBUG<< " initialize " <<endmsg;
-
- // Check ByteStreamCnvSvc
- IService* svc ;
- sc = serviceLocator()->getService("ByteStreamCnvSvc", svc);
- if(sc != StatusCode::SUCCESS ) {
- (*m_log)<<MSG::ERROR << " HLTResultByteStreamCnv: Can't get ByteStreamCnvSvc " <<endmsg;
- return sc ;
- }
-
-/*
- m_eventAccess = dynamic_cast<IByteStreamEventAccess*> (svc);
- if(m_eventAccess == 0 ) {
- (*m_log)<<MSG::ERROR<< " HLTResultByteStreamCnv: Can't cast to IByteStreamEventAccess " <<endmsg;
- return StatusCode::FAILURE ;
- }
-*/
-
-
- //IByteStreamEventAccess* m_eventAccess ;
- sc = service("ByteStreamCnvSvc", m_eventAccess);
- if(m_eventAccess==0){
- (*m_log)<<MSG::ERROR<< " Cant cast to IByteStreamEventAccess " <<endmsg;
- return StatusCode::FAILURE ;
- }
-
-
- /* retrieve Tool */
-
- IToolSvc* toolSvc;
- if(StatusCode::SUCCESS != service("ToolSvc",toolSvc)){
- (*m_log) << MSG::ERROR << " Can't get ToolSvc " << endmsg;
- return StatusCode::FAILURE;
- }
-
- std::string toolType = "HLTResultByteStreamTool" ;
- if(StatusCode::SUCCESS !=toolSvc->retrieveTool(toolType,m_tool))
- {
- (*m_log) << MSG::ERROR << " Can't get ByteStreamTool " << endmsg;
- return StatusCode::FAILURE;
- }
-
- return StatusCode::SUCCESS;
-}
-
-
-/**
- Finalize method gets all necessary services etc.
-*/
-template <class ROBF>
-StatusCode HLT::HLTResultByteStreamCnv<ROBF>::finalize()
-{
- delete m_log;
- return StatusCode::SUCCESS;
-}
-
-/**
- createObj should create the RDO from bytestream.
- */
-template <class ROBF>
-StatusCode
-HLT::HLTResultByteStreamCnv<ROBF>::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
-{
-
-
- ByteStreamAddressL1R *pAddrL2;
- pAddrL2 = dynamic_cast<ByteStreamAddressL1R*>(pAddr);
- if(!pAddrL2) {
- (*m_log) << MSG::ERROR << " Cannot cast to ByteStreamAddress " << endmsg ;
- return StatusCode::FAILURE;
- }
-
- //HLTResult* result ;
- HLTResult* result=new HLTResult();
-
-// const ROBF* rob = (const ROBF*) pAddrL2->getPointer();
- const ROBF* rob = pAddrL2->getPointer();
-
- // Convert to Object
- m_tool->convert(rob, result, m_log);
-
- (*m_log) << MSG::DEBUG<<" Created Objects "<< *(pAddrL2->par())<<endmsg;
-
- pObj = StoreGateSvc::asStorable( result ) ;
- return StatusCode::SUCCESS;
-
-}
-
-/**
- createRep should create the bytestream from RDOs.
- */
-template <class ROBF>
-StatusCode
-HLT::HLTResultByteStreamCnv<ROBF>::createRep(DataObject* pObj, IOpaqueAddress*& pAddr)
-{
-
- RawEvent* re = m_eventAccess->getRawEvent();
-
- HLTResult* result;
- StoreGateSvc::fromStorable(pObj,result);
- if(!result){
- (*m_log) << MSG::ERROR << " Cannot cast to HLTResult " << endmsg ;
- return StatusCode::FAILURE;
- }
-
- std::string nm = pObj->registry()->name();
-
- ByteStreamAddressL1R* addr = new ByteStreamAddressL1R(classID(),nm,"");
-
- pAddr = addr;
-
- return m_tool->convert(result, re, m_log);
-
-}
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx
index f07dcfd148d6852fb93eb0b43c8929b24a429d35..3a51437959444e7fd5961a2a355b7eea01547618 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// ============================================================================
@@ -51,7 +51,7 @@
namespace LVL1BS {
L1TopoByteStreamAuxCnv::L1TopoByteStreamAuxCnv(ISvcLocator* svcloc)
- : Converter(ByteStream_StorageType, classID(), svcloc),
+ : Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "L1TopoByteStreamAuxCnv"),
m_name("L1TopoByteStreamAuxCnv"),
m_readTool("L1TopoByteStreamTool/L1TopoByteStreamTool") {}
@@ -60,11 +60,12 @@ const CLID& L1TopoByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::L1TopoRawDataAuxContainer>::ID();
}
+long L1TopoByteStreamAuxCnv::storageType() {
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode L1TopoByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG("Initializing " << m_name << " - package version "
<< PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h
index 92c22406a88897d1f5a3d67418770bfc0f4a31d2..2567286ab785de006a746421144504292b2ef870 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamAuxCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_L1TOPOBYTESTREAMAUXCNV_H
@@ -25,9 +25,6 @@ class StatusCode;
template <typename>
class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
-
class L1TopoByteStreamTool;
namespace LVL1BS {
@@ -52,8 +49,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType; }
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx
index f57f623cd3a52abe8a9621bf602c246bf2fdc2d1..2acce428a2873ffa454fb9f125eac63e027d845f 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -27,7 +27,7 @@
* base class in the correct way.
*/
L1TopoByteStreamCnv::L1TopoByteStreamCnv(ISvcLocator* svcloc)
- : Converter(ByteStream_StorageType, classID(), svcloc),
+ : Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "L1TopoByteStreamCnv"),
m_tool("L1TopoByteStreamTool"),
m_srcIdMap(0),
@@ -53,6 +53,10 @@ const CLID& L1TopoByteStreamCnv::classID() {
return ClassID_traits<L1TopoRDOCollection>::ID();
}
+long L1TopoByteStreamCnv::storageType() {
+ return ByteStreamAddress::storageType();
+}
+
/**
* Init method gets all necessary services etc.
*/
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h
index 56a840733a0dd41fe72b621ab132359f47d080fb..1e3e06f4011557d74e3d0acc6bfe7cba1c17da78 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamCnv.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef L1TOPOBYTESTREAM_L1TOPOBYTESTREAMCNV_H
@@ -23,9 +23,6 @@
// Forward declaration(s):
class L1TopoSrcIdMap;
-// External(s):
-extern long ByteStream_StorageType;
-
/**
* @short ByteStream converter for the L1TopoRDOCollection
*
@@ -61,9 +58,9 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
/// Function needed by the framework
- virtual long repSvcType() const { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
/// Function needed by the framework
- static long storageType() { return ByteStream_StorageType; }
+ static long storageType();
/// Function needed by the framework
static const CLID& classID();
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx
index 054bb441c64e1a689fde3583763b4b2777acf100..1ea5ad3c01b800ca3d5439d5e62e9b3ff7e0ea9d 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <vector>
@@ -31,7 +31,7 @@
namespace LVL1BS {
L1TopoByteStreamxAODCnv::L1TopoByteStreamxAODCnv(ISvcLocator* svcloc)
- : Converter(ByteStream_StorageType, classID(), svcloc),
+ : Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "L1TopoByteStreamxAODCnv"),
m_name("L1TopoByteStreamxAODCnv") {}
@@ -41,11 +41,11 @@ const CLID& L1TopoByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::L1TopoRawDataContainer>::ID();
}
-// Init method gets all necessary services etc.
+long L1TopoByteStreamxAODCnv::storageType() {
+ return ByteStreamAddress::storageType();
+}
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
+// Init method gets all necessary services etc.
StatusCode L1TopoByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG("Initializing " << m_name << " - package version "
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h
index 56286fb3802de7ba538452f8cbbf4feebccb0889..4a42a813844690ca5e3b7b96fd797c75f4345298 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/src/L1TopoByteStreamxAODCnv.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_L1TOPOBYTESTREAMXAODCNV_H
@@ -23,8 +23,6 @@ class StatusCode;
template <typename>
class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -47,8 +45,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType; }
- static long storageType() { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
old mode 100755
new mode 100644
index 4e7d20f1e3dc7d26784257f9793521730555e847..e93d5ae36e174e267e513e79ee120e4bcd3aad21
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
CpByteStreamCnv::CpByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamCnv"),
m_tool("LVL1BS::CpByteStreamTool/CpByteStreamTool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& CpByteStreamCnv::classID()
return ClassID_traits<LVL1::CPBSCollection>::ID();
}
+long CpByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpByteStreamCnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h
old mode 100755
new mode 100644
index 361ded10ce81f4b1354783200b88cb74b770fec4..3f995f7dea0dc807147e21c95321457daa57a1f0
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamCnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
index 73bcb78f9632e6c3485a27ef207ddcb552a9043e..206890ac88dc95991a01148cae49fa175aeb6c62 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
@@ -92,9 +92,6 @@ CpByteStreamTool::~CpByteStreamTool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpByteStreamTool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
old mode 100755
new mode 100644
index d74d1ed1f7e5aa0ed6a1015ab85bea657abc1e0d..38b8c76ceca91d324ffa1153335acaca4ee7daa2
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
CpByteStreamV1Cnv::CpByteStreamV1Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamV1Cnv"),
m_tool("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& CpByteStreamV1Cnv::classID()
return ClassID_traits<LVL1::CPBSCollectionV1>::ID();
}
+long CpByteStreamV1Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpByteStreamV1Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
old mode 100755
new mode 100644
index 533a95936a251423d3bf4650a07decd7312a6073..ecc81b558ff1080fab980573f769cda50ea68a11
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -44,8 +42,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
index 72f6127c1af30a1938e038add25cc6e8a5f7eef5..f0e5e78582629b67bed6b238f5252c03ca575f2f 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
@@ -98,9 +98,6 @@ CpByteStreamV1Tool::~CpByteStreamV1Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpByteStreamV1Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
old mode 100755
new mode 100644
index 3767d88840795961ca141dd5488f6c04e8180fd9..569094b68d74c159e6d9a313a0e375f97d8de82f
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
CpByteStreamV2Cnv::CpByteStreamV2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpByteStreamV2Cnv"),
m_tool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& CpByteStreamV2Cnv::classID()
return ClassID_traits<LVL1::CPBSCollectionV2>::ID();
}
+long CpByteStreamV2Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpByteStreamV2Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
old mode 100755
new mode 100644
index 777ce4366ca569211055409d655c925903af9d83..1ea5ead440796023be35bc3d45958b1ea7c1f48f
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -44,8 +42,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
index aa146ebe7e0fa4649bbae00a8cc6ef0a7703ed73..7a4330c21e977ba9466ff1353a88f7ae729eb597 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
@@ -101,9 +101,6 @@ CpByteStreamV2Tool::~CpByteStreamV2Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpByteStreamV2Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.h
old mode 100755
new mode 100644
index b5968927e5a47e4b03f7afa4e809483fcb6e6d70..7a745443ff47d3829da373f87f32a6e26bc8212e
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -51,8 +49,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
old mode 100755
new mode 100644
index 5b7606dd1c8abff1665a2076c296cdccb218d2c0..303e0273900f4349c6715822ed6cb93cfe7bec08
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamCnv.icc
@@ -27,7 +27,7 @@ namespace LVL1BS {
template <typename Container>
CpReadByteStreamCnv<Container>::CpReadByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamCnv"),
m_tool("LVL1BS::CpByteStreamTool/CpByteStreamTool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -48,11 +48,14 @@ const CLID& CpReadByteStreamCnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+template <typename Container>
+long CpReadByteStreamCnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode CpReadByteStreamCnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
old mode 100755
new mode 100644
index d4ac573ef3d7ec83c12c623a49e3c42a7e8d1026..bf34a314dd9457c8caa8e6f18af940f89692f047
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -45,8 +43,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
old mode 100755
new mode 100644
index d9ed99c4f0bde07eee9f5f1a94407321c46c5462..eb9b9eeceb1c204b43947dd0fd766d156912f130
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1Cnv.icc
@@ -27,7 +27,7 @@ namespace LVL1BS {
template <typename Container>
CpReadByteStreamV1Cnv<Container>::CpReadByteStreamV1Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamV1Cnv"),
m_tool("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -48,11 +48,14 @@ const CLID& CpReadByteStreamV1Cnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+template <typename Container>
+long CpReadByteStreamV1Cnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode CpReadByteStreamV1Cnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
old mode 100755
new mode 100644
index 99b584b0b51c411e0514aaef1e76d35d954b39b4..9a5b91ff89914788fcc164694c10567c73ce15ac
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.cxx
@@ -33,7 +33,7 @@
namespace LVL1BS {
CpReadByteStreamV1V2Cnv::CpReadByteStreamV1V2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamV1V2Cnv"),
m_tool1("LVL1BS::CpByteStreamV1Tool/CpByteStreamV1Tool"),
m_tool2("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
@@ -53,11 +53,13 @@ const CLID& CpReadByteStreamV1V2Cnv::classID()
return ClassID_traits<DataVector<LVL1::CPMTower> >::ID();
}
+long CpReadByteStreamV1V2Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpReadByteStreamV1V2Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
old mode 100755
new mode 100644
index 874cfcca17b4d8ff4d517c261b28a554a2d338e6..6b2087b61b043a5a41a74cc290334ef251ce7421
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV1V2Cnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -49,8 +47,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
old mode 100755
new mode 100644
index ffef3abf3a7921e67c4253e8d15c35713050b8c8..ee6fa1ac8ed3e971bd964e06b30325cf22a957e5
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -45,8 +43,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
old mode 100755
new mode 100644
index c772bbf604b5c13ab1b0f988d02556e0d281914f..404d8925284be9b70a21825ea3e31efde2b31a90
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpReadByteStreamV2Cnv.icc
@@ -27,7 +27,7 @@ namespace LVL1BS {
template <typename Container>
CpReadByteStreamV2Cnv<Container>::CpReadByteStreamV2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpReadByteStreamV2Cnv"),
m_tool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -48,11 +48,14 @@ const CLID& CpReadByteStreamV2Cnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+template <typename Container>
+long CpReadByteStreamV2Cnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode CpReadByteStreamV2Cnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
old mode 100755
new mode 100644
index 36a62aed64717bafb3cd8f5b683725c716d3c7ab..daedba54f63a2a071e3a449305a673013f2d82e0
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CpmRoiByteStreamCnv::CpmRoiByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpmRoiByteStreamCnv"),
m_tool("LVL1BS::CpmRoiByteStreamTool/CpmRoiByteStreamTool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -52,11 +52,13 @@ const CLID& CpmRoiByteStreamCnv::classID()
return ClassID_traits<DataVector<LVL1::CPMRoI> >::ID();
}
+long CpmRoiByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmRoiByteStreamCnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h
old mode 100755
new mode 100644
index 0626179e1dd3d8e0b6ce698bfd9b96f168aa97eb..bfab7240320793db37fef2fca7edadba6ce45b1f
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -53,8 +51,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx
index 165bbb8c1dfb027f910e1899ff6fbef31f63a65e..2ab9fd571828b86b8b8bf2211df82f35cf2a2593 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamTool.cxx
@@ -75,9 +75,6 @@ CpmRoiByteStreamTool::~CpmRoiByteStreamTool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmRoiByteStreamTool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
old mode 100755
new mode 100644
index acd6f32bae00948ad60c328c7d907610d692a180..44878ee3482062c9b47cbcd0b163ba88dd23e72b
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CpmRoiByteStreamV1Cnv::CpmRoiByteStreamV1Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpmRoiByteStreamV1Cnv"),
m_tool("LVL1BS::CpmRoiByteStreamV1Tool/CpmRoiByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -52,11 +52,13 @@ const CLID& CpmRoiByteStreamV1Cnv::classID()
return ClassID_traits<DataVector<LVL1::CPMRoI> >::ID();
}
+long CpmRoiByteStreamV1Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmRoiByteStreamV1Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
old mode 100755
new mode 100644
index 3a39bec7b0fbf94dec694a1e2ee4d689fd2ade98..5f5463f2d7278071618337980350b304ed1f1663
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Cnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -47,8 +45,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx
index 17f8a15f775ddc5d0961aa6728efd10844064915..5778110f761ed0852b7030eb60d8e82ccd052540 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV1Tool.cxx
@@ -81,9 +81,6 @@ CpmRoiByteStreamV1Tool::~CpmRoiByteStreamV1Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmRoiByteStreamV1Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
old mode 100755
new mode 100644
index 34387b8f8ee04103b7214692b58dbe2847acc0f1..a34558df2e8b0aeefd5536853c07f4cc9897e2d0
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CpmRoiByteStreamV2Cnv::CpmRoiByteStreamV2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("CpmRoiByteStreamV2Cnv"),
m_tool("LVL1BS::CpmRoiByteStreamV2Tool/CpmRoiByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -52,11 +52,13 @@ const CLID& CpmRoiByteStreamV2Cnv::classID()
return ClassID_traits<DataVector<LVL1::CPMTobRoI> >::ID();
}
+long CpmRoiByteStreamV2Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmRoiByteStreamV2Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
old mode 100755
new mode 100644
index 84f842664b373b703decde9a0febbfac38f77b21..6f80a49e0af6b2c81b6f4af84aefba2ad1297ca1
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Cnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -47,8 +45,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx
index 3acc6eea1936883aa2d0d7fdcc0d27e833fefe40..270c25c0818764ad40e0c783c15a892c8b1a91cf 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpmRoiByteStreamV2Tool.cxx
@@ -86,9 +86,6 @@ CpmRoiByteStreamV2Tool::~CpmRoiByteStreamV2Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmRoiByteStreamV2Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
old mode 100755
new mode 100644
index be58aba4a706da52021c90c0ab0a05fd10aa51e9..b1bb4cebd7d9df3f348c4c420c5f20760fecc6e3
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
JepByteStreamCnv::JepByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepByteStreamCnv"),
m_tool("LVL1BS::JepByteStreamTool/JepByteStreamTool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& JepByteStreamCnv::classID()
return ClassID_traits<LVL1::JEPBSCollection>::ID();
}
+long JepByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepByteStreamCnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h
old mode 100755
new mode 100644
index 36b4009d76208f548082464572acffd50868009d..c09e547c2bd74819aada8a971257036fb10cbfb4
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamCnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
index 5d2a3274cee2879b32f0c8c94016dd31290cf9fb..87a9bd94b0d5400a9e9266e7b57d64b3a19e4a98 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
@@ -97,9 +97,6 @@ JepByteStreamTool::~JepByteStreamTool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepByteStreamTool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
old mode 100755
new mode 100644
index ff5e4487c02a866bfbe7dfccc37834c5ca9f57c8..acd48877dd647e82c900c1c27675dc0fc568a3e9
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
JepByteStreamV1Cnv::JepByteStreamV1Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepByteStreamV1Cnv"),
m_tool("LVL1BS::JepByteStreamV1Tool/JepByteStreamV1Tool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& JepByteStreamV1Cnv::classID()
return ClassID_traits<LVL1::JEPBSCollectionV1>::ID();
}
+long JepByteStreamV1Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepByteStreamV1Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
old mode 100755
new mode 100644
index 28ade26af1993f485c1c140c6666ad8c2751daeb..b7242d9814287909cdb4520eb63439fd45e7ec1a
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -44,8 +42,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
index 800714bf6358589cccf1a7a93af7a4f9f373c13e..3c01bc8b1cf4f83a0e9145e5ffe1daf856cc6c2b 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
@@ -103,9 +103,6 @@ JepByteStreamV1Tool::~JepByteStreamV1Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepByteStreamV1Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
old mode 100755
new mode 100644
index bc9b1cd7b15558a2e5f294423cf3b20a7f811698..e4c469825fd63f57ac823eb60c6b1e926b6bff46
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
JepByteStreamV2Cnv::JepByteStreamV2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepByteStreamV2Cnv"),
m_tool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& JepByteStreamV2Cnv::classID()
return ClassID_traits<LVL1::JEPBSCollectionV2>::ID();
}
+long JepByteStreamV2Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepByteStreamV2Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
old mode 100755
new mode 100644
index 27c1cc8ce6142f1335d4b8e6c329a9877ee26c65..9b438874c5a6a078aa6857aaed709c3160903423
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -44,8 +42,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
index 5c29b9cfbcde64ca686671063aad32011ed47ff3..421ba532a0bab60f7ae49807910b83f360d9cf78 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
@@ -105,9 +105,6 @@ JepByteStreamV2Tool::~JepByteStreamV2Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepByteStreamV2Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.h
old mode 100755
new mode 100644
index 4556068a8e101252e77246a589fc3756d26d35ce..b3a0a0e911a4602f5cfea83717df2176515f7e0e
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -51,8 +49,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
old mode 100755
new mode 100644
index f11594141cb5dc990a2b8f7f2f3ad3c5951c40d4..59ac60b26053fd703bc29232ef6e23f261af768f
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamCnv.icc
@@ -27,7 +27,7 @@ namespace LVL1BS {
template <typename Container>
JepReadByteStreamCnv<Container>::JepReadByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepReadByteStreamCnv"),
m_tool("LVL1BS::JepByteStreamTool/JepByteStreamTool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -48,11 +48,13 @@ const CLID& JepReadByteStreamCnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+long JepReadByteStreamCnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode JepReadByteStreamCnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
old mode 100755
new mode 100644
index 08e5805e47199fd34b7a377844f1eecf18ead66f..4d128e9fd83daa095d085dcb2689084a073a6ea2
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -46,8 +44,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
old mode 100755
new mode 100644
index 7a2ca6ec281b03896b596edcee57381e5900bab0..ae49f932598dd02a2b1d1b77b337ff00f1db4016
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1Cnv.icc
@@ -27,7 +27,7 @@ namespace LVL1BS {
template <typename Container>
JepReadByteStreamV1Cnv<Container>::JepReadByteStreamV1Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepReadByteStreamV1Cnv"),
m_tool("LVL1BS::JepByteStreamV1Tool/JepByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -48,11 +48,14 @@ const CLID& JepReadByteStreamV1Cnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+template <typename Container>
+long JepReadByteStreamV1Cnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode JepReadByteStreamV1Cnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
old mode 100755
new mode 100644
index 5c138d4ce6ced7a9dda540ceb245f2198d848766..2a0acf8560adeb4df9a5d47681d8e4e18cb77dbc
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
old mode 100755
new mode 100644
index a2d7d84b76a8a18e039a65ddf0edf3f6d6559564..b1a71bb45d4b6c9d48c0c114e0d937b542381732
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV1V2Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -31,7 +31,7 @@ namespace LVL1BS {
template <typename Container>
JepReadByteStreamV1V2Cnv<Container>::JepReadByteStreamV1V2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepReadByteStreamV1V2Cnv"),
m_tool1("LVL1BS::JepByteStreamV1Tool/JepByteStreamV1Tool"),
m_tool2("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool"),
@@ -53,11 +53,14 @@ const CLID& JepReadByteStreamV1V2Cnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+template <typename Container>
+long JepReadByteStreamV1V2Cnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode JepReadByteStreamV1V2Cnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
old mode 100755
new mode 100644
index 1e300b94ff43c4b7234149d1f2f6a5cef0c9d869..e2c407133c862fa6f9404f16b6d2d611a5fc6442
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -45,8 +43,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
old mode 100755
new mode 100644
index 120acde55a1c42e323ea9f164f978a5a7650c338..92a5f1d292e3a2403b6ae80ad52358d9391cd8a8
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepReadByteStreamV2Cnv.icc
@@ -27,7 +27,7 @@ namespace LVL1BS {
template <typename Container>
JepReadByteStreamV2Cnv<Container>::JepReadByteStreamV2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepReadByteStreamV2Cnv"),
m_tool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -48,11 +48,13 @@ const CLID& JepReadByteStreamV2Cnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+long JepReadByteStreamV2Cnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode JepReadByteStreamV2Cnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
old mode 100755
new mode 100644
index 94bcc3118c1a0b3f78405676e65b3c12f22de969..5ce5ba0d4fa7e5cb1a9d9d935232c5b367d87db1
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
JepRoiByteStreamCnv::JepRoiByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepRoiByteStreamCnv"),
m_tool("LVL1BS::JepRoiByteStreamTool/JepRoiByteStreamTool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& JepRoiByteStreamCnv::classID()
return ClassID_traits<LVL1::JEPRoIBSCollection>::ID();
}
+long JepRoiByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepRoiByteStreamCnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h
old mode 100755
new mode 100644
index decd4d00cc63a4ee8fd37898eae25ba2d3f6e392..86a955aada9dc4b1135cbc110eab88f7a9b9ea6b
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamCnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx
index fb386842986ab2bcbde7465b1abad58d92abd794..19792be7efcd23a170517d5dcc3d7ee921ad2d05 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamTool.cxx
@@ -83,9 +83,6 @@ JepRoiByteStreamTool::~JepRoiByteStreamTool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepRoiByteStreamTool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
old mode 100755
new mode 100644
index 3a347daa2c33c536bef2ec45d58bf94473f87987..41a1faa5e82d879d564201df875c12c8b3cd93b3
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
JepRoiByteStreamV1Cnv::JepRoiByteStreamV1Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepRoiByteStreamV1Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV1Tool/JepRoiByteStreamV1Tool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& JepRoiByteStreamV1Cnv::classID()
return ClassID_traits<LVL1::JEPRoIBSCollectionV1>::ID();
}
+long JepRoiByteStreamV1Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepRoiByteStreamV1Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
old mode 100755
new mode 100644
index 507875b8b8da5cb3598448e9aab387673d716c61..200e9e8e4277f92cd32cd96e55ac25cf9c4a35d0
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx
index 5f04d58ed238582141f9fa196fad789f5cde9a38..ec41daa19fb2b4408dac7592c8a1ce8661a41d9d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV1Tool.cxx
@@ -89,9 +89,6 @@ JepRoiByteStreamV1Tool::~JepRoiByteStreamV1Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepRoiByteStreamV1Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
old mode 100755
new mode 100644
index e249dad1aae55b0587456877ad1baaa7ec4dd5bd..eb2470f40b394eace32dd993294b8cbe00387608
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.cxx
@@ -30,7 +30,7 @@
namespace LVL1BS {
JepRoiByteStreamV2Cnv::JepRoiByteStreamV2Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepRoiByteStreamV2Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV2Tool/JepRoiByteStreamV2Tool"),
m_ByteStreamEventAccess("ByteStreamCnvSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& JepRoiByteStreamV2Cnv::classID()
return ClassID_traits<LVL1::JEPRoIBSCollectionV2>::ID();
}
+long JepRoiByteStreamV2Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepRoiByteStreamV2Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
old mode 100755
new mode 100644
index 5f7348066fded03f384cd361faa6541b0501de5c..c46cb7d96d02a8e8dd978f34ce938eca6e2889a8
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -44,8 +42,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx
index 6771a18a4121892673a3b0449e0cad486912240d..52912acb4f3429eab7345ebe822033c420a29e31 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiByteStreamV2Tool.cxx
@@ -87,9 +87,6 @@ JepRoiByteStreamV2Tool::~JepRoiByteStreamV2Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JepRoiByteStreamV2Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.h
old mode 100755
new mode 100644
index fc47779d44e6cb2fb5fa902a24102256d8947571..dccbab8a0d4da551cc4032801495cf28d7c8f4e5
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -51,8 +49,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
old mode 100755
new mode 100644
index b35a1c86364da63d95ba93f1cc531f3a99c8a731..112e6145cacb0017304a1fb60b01c2491ce84a64
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamCnv.icc
@@ -28,7 +28,7 @@ namespace LVL1BS {
template <typename Container>
JepRoiReadByteStreamCnv<Container>::JepRoiReadByteStreamCnv(
ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepRoiReadByteStreamCnv"),
m_tool("LVL1BS::JepRoiByteStreamTool/JepRoiByteStreamTool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -49,11 +49,13 @@ const CLID& JepRoiReadByteStreamCnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+long JepRoiReadByteStreamCnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode JepRoiReadByteStreamCnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
old mode 100755
new mode 100644
index 5f9b2f52e553fd0ee11e6ba410f47aafa093dc54..0a1a63d663a763cabfc53aff405191043c3c8d7a
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -46,8 +44,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
old mode 100755
new mode 100644
index ff7d42a8c0d234684f2ec31eaeb56074edbc104e..c75b442e0c8ccd0e599b48c3a244e5e15b8902bc
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV1Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -28,7 +28,7 @@ namespace LVL1BS {
template <typename Container>
JepRoiReadByteStreamV1Cnv<Container>::JepRoiReadByteStreamV1Cnv(
ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepRoiReadByteStreamV1Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV1Tool/JepRoiByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -49,11 +49,14 @@ const CLID& JepRoiReadByteStreamV1Cnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+template <typename Container>
+long JepRoiReadByteStreamV1Cnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode JepRoiReadByteStreamV1Cnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
old mode 100755
new mode 100644
index 4d88e8a4c019b91b3078fab65ae6184883df2284..569fe838788c43db7719bd8d657603f2a951c937
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.h
@@ -21,8 +21,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -45,8 +43,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
old mode 100755
new mode 100644
index f8b3a41246a39b600bed699cd12619f856eb592b..8eb3d7a1c6ec5373123453faf2d3f74eba969a76
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepRoiReadByteStreamV2Cnv.icc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -28,7 +28,7 @@ namespace LVL1BS {
template <typename Container>
JepRoiReadByteStreamV2Cnv<Container>::JepRoiReadByteStreamV2Cnv(
ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("JepRoiReadByteStreamV2Cnv"),
m_tool("LVL1BS::JepRoiByteStreamV2Tool/JepRoiByteStreamV2Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -49,11 +49,14 @@ const CLID& JepRoiReadByteStreamV2Cnv<Container>::classID()
return ClassID_traits<Container>::ID();
}
+template <typename Container>
+long JepRoiReadByteStreamV2Cnv<Container>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template <typename Container>
StatusCode JepRoiReadByteStreamV2Cnv<Container>::initialize()
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
index 42ac996ac97ef6306c958dafadbb0875b08aaf4e..0aa93dd9364302a88e6af9e0b555c8c17061e37a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.cxx
@@ -23,7 +23,7 @@
namespace LVL1BS {
L1CaloErrorByteStreamCnv::L1CaloErrorByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("L1CaloErrorByteStreamCnv"),
m_tool("LVL1BS::L1CaloErrorByteStreamTool/L1CaloErrorByteStreamTool"),
m_log(msgSvc(), m_name), m_debug(false)
@@ -41,11 +41,13 @@ const CLID& L1CaloErrorByteStreamCnv::classID()
return ClassID_traits<std::vector<unsigned int> >::ID();
}
+long L1CaloErrorByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode L1CaloErrorByteStreamCnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
index db57d137230be89f4ed33bc7992116fb1a6ee7c7..44f330227ead4694c667007a60882b2bdfb7484e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamCnv.h
@@ -19,8 +19,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -43,8 +41,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx
index eb8346502af93d89d4c3a936adbe23b26ac5d1bb..7c48d50ee4f55d17e2ab6b556d7cd739a6925196 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/L1CaloErrorByteStreamTool.cxx
@@ -41,9 +41,6 @@ L1CaloErrorByteStreamTool::~L1CaloErrorByteStreamTool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode L1CaloErrorByteStreamTool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
index 34befd8775ec794903ceccfcc2993932c7f928e7..f03157a3df818d102d8bd3963e6671c7e029c703 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
PpmByteStreamV1Cnv::PpmByteStreamV1Cnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("PpmByteStreamV1Cnv"),
m_tool("LVL1BS::PpmByteStreamV1Tool/PpmByteStreamV1Tool"),
m_robDataProvider("ROBDataProviderSvc", m_name),
@@ -52,11 +52,13 @@ const CLID& PpmByteStreamV1Cnv::classID()
return ClassID_traits<DataVector<LVL1::TriggerTower> >::ID();
}
+long PpmByteStreamV1Cnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode PpmByteStreamV1Cnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
index 7096df448d1ee5d737efd649245f140ab1dad6dd..c41c9f7c0b95f4727ff95fe8759e32a81e8edc22 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Cnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -48,8 +46,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
index fddeb1aad8227e943a6331ae3b0cd7a14d685484..e2563bd1372a5fc832ca3a9e2e49d509ed1c0d39 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
@@ -110,9 +110,6 @@ PpmByteStreamV1Tool::~PpmByteStreamV1Tool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode PpmByteStreamV1Tool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
index f4a116d209cae7e4ad391951bad5ad3bd6158c65..e80e5d042bfc928596dc1b20bea904f2e222ecfb 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.cxx
@@ -31,7 +31,7 @@
namespace LVL1BS {
RodHeaderByteStreamCnv::RodHeaderByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_name("RodHeaderByteStreamCnv"),
m_tool("LVL1BS::RodHeaderByteStreamTool/RodHeaderByteStreamTool"),
m_log(msgSvc(), m_name), m_debug(false)
@@ -49,11 +49,13 @@ const CLID& RodHeaderByteStreamCnv::classID()
return ClassID_traits<DataVector<LVL1::RODHeader> >::ID();
}
+long RodHeaderByteStreamCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode RodHeaderByteStreamCnv::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
index 31d84ff9c7d227478883939f36227b0221bf228e..8a607846a6d7a2042b66deae62d0da458a8e4e45 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamCnv.h
@@ -20,8 +20,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -44,8 +42,8 @@ public:
virtual StatusCode createObj(IOpaqueAddress* pAddr, DataObject*& pObj);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx
index 8ea0ea6579e699fba9dbc0ce497210be0917ae8b..e92cd31d979c2538c65e9e4bf7d0b61945c1261a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/RodHeaderByteStreamTool.cxx
@@ -82,9 +82,6 @@ RodHeaderByteStreamTool::~RodHeaderByteStreamTool()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode RodHeaderByteStreamTool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
index 215089ce65e67db286a42cb458617ab759d75d22..c2a5a9b4ba211c5ca56a857c7712b6506432b48e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
@@ -49,9 +49,6 @@ TrigT1CaloDataAccess::~TrigT1CaloDataAccess()
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode TrigT1CaloDataAccess::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccessV2.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccessV2.cxx
index 430299620e4eeb6f0f0e3c5fc16f479d60bbe387..e124af91aa490bc336769a83196279ab5f7372c4 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccessV2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccessV2.cxx
@@ -26,9 +26,6 @@ TrigT1CaloDataAccessV2::TrigT1CaloDataAccessV2(const std::string& name /*="TrigT
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode TrigT1CaloDataAccessV2::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
index c0e1e8e25753dc79846c10533ca203fdaca2e658..4ef8fb505b44f1adfb3bf8d670581dca2b96c962 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
@@ -61,9 +61,6 @@ TriggerTowerSelectionTool::~TriggerTowerSelectionTool()
// Initialisation
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode TriggerTowerSelectionTool::initialize()
{
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx
index 3ba04146ab56c6fdf74468afc7f52a5ad5742c45..d8fca11bd96a2f5375f8da0f0a5e9be0c6416dc9 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
CmxCpHitsByteStreamAuxCnv::CmxCpHitsByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxCpHitsByteStreamAuxCnv"),
m_name("CmxCpHitsByteStreamAuxCnv"),
m_readTool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& CmxCpHitsByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CMXCPHitsAuxContainer>::ID();
}
+long CmxCpHitsByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxCpHitsByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h
index ac0a6171d83d41bdb3c1ee56bbbfa33fea85fd2e..0a10348ce247454bdcb28357c591fada15350f7a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx
index f37c40ce2f50b564ec638a3c6298f0f0bcef87bf..acd4f9a4827019caf54a76e3807808a62fd12475 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CmxCpHitsByteStreamxAODCnv::CmxCpHitsByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxCpHitsByteStreamxAODCnv"),
m_name("CmxCpHitsByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CmxCpHitsByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CMXCPHitsContainer>::ID();
}
+long CmxCpHitsByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxCpHitsByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h
index c1ac193cee7b758913e389134924c96d74c995cb..fefbcf94c7c77336e682770a94a370fd1e2524f3 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpHitsByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx
index a2249222ebdf49a7e18cc34c66290fdaf74c87ad..ca8505b25e5c346e9aa2762c56a64f350cd1479c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
CmxCpTobByteStreamAuxCnv::CmxCpTobByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxCpTobByteStreamAuxCnv"),
m_name("CmxCpTobByteStreamAuxCnv"),
m_readTool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& CmxCpTobByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CMXCPTobAuxContainer>::ID();
}
+long CmxCpTobByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxCpTobByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h
index 8c63be227e576300f0e523487e5fcbbf0fffe1dd..94b668037ff8f70ba85a9054205730126a728bd4 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx
index 09226f308ff8a518c1e48dae4e53a9e4efe0822c..74c51c157fb68b4233bc51ca87aa1ea8d7b3a61b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CmxCpTobByteStreamxAODCnv::CmxCpTobByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxCpTobByteStreamxAODCnv"),
m_name("CmxCpTobByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CmxCpTobByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CMXCPTobContainer>::ID();
}
+long CmxCpTobByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxCpTobByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h
index 4ece851a0cb1d112aa8d994a5e84d29dd957fc1f..a2a485a6b84a77f20f61b925841782b23b827db9 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxCpTobByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx
index d641a0df7338c9d1894b15dbb1e7b0edab7eee93..4d248199ce64aed70f0e1e5bc372f8f286a1b417 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
CmxEtSumsByteStreamAuxCnv::CmxEtSumsByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxEtSumsByteStreamAuxCnv"),
m_name("CmxEtSumsByteStreamAuxCnv"),
m_readTool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& CmxEtSumsByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CMXEtSumsAuxContainer>::ID();
}
+long CmxEtSumsByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxEtSumsByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h
index 14225c0f144a110b2f8bd11156b498f6b8b32648..20f130e9585f221c4a75223ca9e20309acd642f9 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx
index 303bbcf1d24677d7fd5572a185f9e81a21190b75..ad32db8d112d5f191ee40514eb0557d1dafae9d1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CmxEtSumsByteStreamxAODCnv::CmxEtSumsByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxEtSumsByteStreamxAODCnv"),
m_name("CmxEtSumsByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CmxEtSumsByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CMXEtSumsContainer>::ID();
}
+long CmxEtSumsByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxEtSumsByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h
index d8e70b3515ca1960873ba39c5a8a3f080befb136..395865ad5d8f4b70581ffd414fcc81a2d4f68c3e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxEtSumsByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx
index edb3aa653ebc32ca9cc72fc4cc7c3b5105c570d1..a2eb1acd1d02d951ad2d9e970dcbbc4dff3dfc94 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
CmxJetHitsByteStreamAuxCnv::CmxJetHitsByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxJetHitsByteStreamAuxCnv"),
m_name("CmxJetHitsByteStreamAuxCnv"),
m_readTool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& CmxJetHitsByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CMXJetHitsAuxContainer>::ID();
}
+long CmxJetHitsByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxJetHitsByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h
index bfd78a1ea31b255498eb35407de0570cb1023e71..a0a3e4bf3e1af1bc4fc2f668f2efcd8faffc2fb8 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx
index b80710a9a7a344762c30ab132cb90435afbd92ae..826fed8b2fe6950fdbeda9002f820f3e7101d477 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CmxJetHitsByteStreamxAODCnv::CmxJetHitsByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxJetHitsByteStreamxAODCnv"),
m_name("CmxJetHitsByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CmxJetHitsByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CMXJetHitsContainer>::ID();
}
+long CmxJetHitsByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxJetHitsByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h
index d5c1ae4d800c9f3934d9bc61ae216d5a40728c1d..449fff92b0e0c1144bcaa0e970a66cb61b76ef0f 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetHitsByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx
index 45590a35156ff95288fd76bbe2e8a7e053636057..2a55c232867203f6e91fb4c9807460c442bba2f0 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
CmxJetTobByteStreamAuxCnv::CmxJetTobByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxJetTobByteStreamAuxCnv"),
m_name("CmxJetTobByteStreamAuxCnv"),
m_readTool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& CmxJetTobByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CMXJetTobAuxContainer>::ID();
}
+long CmxJetTobByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxJetTobByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h
index bf0a72051a39dcaed5c5f5cefebb89d2be27da8f..20809959d9bf3b40ad19038a6fb2edfbba7b05fe 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx
index c216a2890378ad6cb16f5fc8510aa9732ef0dd2b..326d52ed32e8e5a590dcabc7afbcb151e8205d0b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CmxJetTobByteStreamxAODCnv::CmxJetTobByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxJetTobByteStreamxAODCnv"),
m_name("CmxJetTobByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CmxJetTobByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CMXJetTobContainer>::ID();
}
+long CmxJetTobByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxJetTobByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h
index b13fa32e113ee9031a48ec35a551334ceddee6b5..35895447b3c0c88258dd376a026ee3c44863443f 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxJetTobByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
index 5e4dd99b4f51e89d9026cd0321d770f577d4e84e..15cc5487a9fa7232e1d191b97032f6ca1f7d7de1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
CmxRoIByteStreamAuxCnv::CmxRoIByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxRoIByteStreamAuxCnv"),
m_name("CmxRoIByteStreamAuxCnv"),
m_readTool("LVL1BS::JepRoiByteStreamV2Tool/JepRoiByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& CmxRoIByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CMXRoIAuxContainer>::ID();
}
+long CmxRoIByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxRoIByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h
index b97f1888a92aec2055337f5861f70815ea9a5489..64427570ba7780dde9c1602b908ab6446a4196e2 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx
index 3fc74ed9903d05101916862065d58d8cbc56ee3f..dcf8927db47a7806a8ddee34cd12aec14f9d62e1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CmxRoIByteStreamxAODCnv::CmxRoIByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CmxRoIByteStreamxAODCnv"),
m_name("CmxRoIByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CmxRoIByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CMXRoIContainer>::ID();
}
+long CmxRoIByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CmxRoIByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h
index f8e3904fd35b25f880702b98e0ea412d4d95d90e..8c90fc6df2c02298d5ecdb205b958b4944f3b33a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CmxRoIByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx
index 607c562e07540e44be38a5251fdc5407385577bc..e6d785af094bc0ed1eec80da83847761c674e81d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
CpmTobRoiByteStreamAuxCnv::CpmTobRoiByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CpmTobRoiByteStreamAuxCnv"),
m_name("CpmTobRoiByteStreamAuxCnv"),
m_readTool("LVL1BS::CpmRoiByteStreamV2Tool/CpmRoiByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& CpmTobRoiByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CPMTobRoIAuxContainer>::ID();
}
+long CpmTobRoiByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmTobRoiByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h
index b0ea22ddd844e7f7a6ca97368a8b93c6ed7c4de9..d877d17bca7c7633574e5351ec540e110b29d009 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx
index 5667258532c6da88a39009e586451e095296fef1..0f1ff6a0529c4d44411166bbb551bd0fff51b49a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CpmTobRoiByteStreamxAODCnv::CpmTobRoiByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CpmTobRoiByteStreamxAODCnv"),
m_name("CpmTobRoiByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CpmTobRoiByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CPMTobRoIContainer>::ID();
}
+long CpmTobRoiByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmTobRoiByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h
index 5f9999263bf4505ef7849b8192dd26d7d5dae631..29ee3cce3b90cdda3a98657bcf0cb2a8181e9d8b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTobRoiByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx
index ce4f208afc4d3b2c35c8bc65123457e428d027aa..6cd78f179eb95b30bbdd62634d6eef64e900c88e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.cxx
@@ -54,7 +54,7 @@
namespace LVL1BS {
CpmTowerByteStreamAuxCnv::CpmTowerByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CpmTowerByteStreamAuxCnv"),
m_name("CpmTowerByteStreamAuxCnv"),
m_cpmReadTool("LVL1BS::CpByteStreamV2Tool/CpByteStreamV2Tool")
@@ -65,11 +65,13 @@ const CLID& CpmTowerByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::CPMTowerAuxContainer>::ID();
}
+long CpmTowerByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmTowerByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h
index ffd49a943e329d4e25aca0974bc2bf08291d4e09..9d51145c0d9f66f626da5995daa39a3d08008ef5 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx
index d631210bc62dff298fa081807268e8ab96af892c..4339d333e156795f9f10c5f7be3072994df32925 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
CpmTowerByteStreamxAODCnv::CpmTowerByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "CpmTowerByteStreamxAODCnv"),
m_name("CpmTowerByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& CpmTowerByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::CPMTowerContainer>::ID();
}
+long CpmTowerByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode CpmTowerByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h
index 0401231c27588e06810397fb04c94fe4ebf42b5e..7522e24466d95be37b8754ef263476f276b67834 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/CpmTowerByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CpmTowers.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx
index 1b2f3964548a948bfaebcb561d85412825add1fb..f98210fb5e2882b86943b9b172244083d0b720d1 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
JemEtSumsByteStreamAuxCnv::JemEtSumsByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "JemEtSumsByteStreamAuxCnv"),
m_name("JemEtSumsByteStreamAuxCnv"),
m_readTool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& JemEtSumsByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::JEMEtSumsAuxContainer>::ID();
}
+long JemEtSumsByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JemEtSumsByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h
index 975ada118f706b8e6e5c0df3e01eb046fe39069c..13dcff333d5615252d75c357a1ed351818a4965d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx
index 7dca3de694ccbeb9192639664fac1c583a26f439..c0a7bc01051a38cebb47f5ec70008bcbf4fcf3f5 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
JemEtSumsByteStreamxAODCnv::JemEtSumsByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "JemEtSumsByteStreamxAODCnv"),
m_name("JemEtSumsByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& JemEtSumsByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::JEMEtSumsContainer>::ID();
}
+long JemEtSumsByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JemEtSumsByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h
index e152ff4731cdeb96c7abced527e6ece9bb02a7bd..9f9952207a433cb54bc7398e2901fab2b9eafd6b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemEtSumsByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx
index 5fd93bb48073322acf6728028c9aa43c79e34984..d3ffeb107d050b21c92b621ea8c68bbf347ff87a 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
JemTobRoiByteStreamAuxCnv::JemTobRoiByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "JemTobRoiByteStreamAuxCnv"),
m_name("JemTobRoiByteStreamAuxCnv"),
m_readTool("LVL1BS::JepRoiByteStreamV2Tool/JepRoiByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& JemTobRoiByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::JEMTobRoIAuxContainer>::ID();
}
+long JemTobRoiByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JemTobRoiByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h
index 0206ffc1b8d8d046b203717ac58b30e65e8a0ec5..2bcfc8881232faa5295cf6f8525d80be0de7a6c8 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx
index 9805a812d23f7de64467b5e1844e3cb4b9fc3c3b..30f68322b4e4267b394a63cba33131e9d43c0c57 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
JemTobRoiByteStreamxAODCnv::JemTobRoiByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "JemTobRoiByteStreamxAODCnv"),
m_name("JemTobRoiByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& JemTobRoiByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::JEMTobRoIContainer>::ID();
}
+long JemTobRoiByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JemTobRoiByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h
index 7357271f9c7d5062daf1b3761d6c3c5ccac97897..715edd36ca468536cb4012e46f21e7cd4243a8cd 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JemTobRoiByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for CmxTob.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx
index 885f7e8d09e195c6ca3da42eda15d9a94633f233..2c4c3defa1ccb2cbfcc8d18c886d7987eaa3eb1d 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
JetElementByteStreamAuxCnv::JetElementByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "JetElementByteStreamAuxCnv"),
m_name("JetElementByteStreamAuxCnv"),
m_readTool("LVL1BS::JepByteStreamV2Tool/JepByteStreamV2Tool")
@@ -63,11 +63,13 @@ const CLID& JetElementByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::JetElementAuxContainer>::ID();
}
+long JetElementByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JetElementByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h
index f74316cfa191f89f529c09ad325f5ab423f4888f..290f2a551c8a91dd6c7228953a26ecec18c54f50 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx
index 8dffbf66f1277e6a12231f8a22d55774a37cc5f0..26111b5f66c66309066ee114549c3f56ffe91f59 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
JetElementByteStreamxAODCnv::JetElementByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "JetElementByteStreamxAODCnv"),
m_name("JetElementByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& JetElementByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::JetElementContainer>::ID();
}
+long JetElementByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode JetElementByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h
index c0ae4ea347815df765e20012881d50b421a56578..e73191ef243a2781ba9c005c00e7a741704f0b2e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/JetElementByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for JetElement.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h
index f6ef770b972a2bcd6cbb4c45dc7d2c91009aa61c..effa5d1b2bf726f01cd32d51da911847a6b748c9 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -51,8 +49,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc
index b72f52d3154cd45799f8578aaafb85959b505fe7..a0bf9e62d4c4c827ce504547f4b4a707b9b09c4b 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/L1CaloByteStreamAuxCnv.icc
@@ -31,7 +31,7 @@ namespace LVL1BS {
template<typename ContainerT, typename AuxContainerT>
L1CaloByteStreamAuxCnv<ContainerT, AuxContainerT>::L1CaloByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "L1CaloByteStreamAuxCnv"),
m_name("L1CaloByteStreamAuxCnv"),
m_readTool("LVL1BS::L1CaloByteStreamReadTool/L1CaloByteStreamReadTool") {
@@ -44,11 +44,13 @@ const CLID& L1CaloByteStreamAuxCnv<ContainerT,AuxContainerT>::classID() {
return ClassID_traits<ContainerT>::ID();
}
+long L1CaloByteStreamAuxCnv<ContainerT,AuxContainerT>::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
template<typename ContainerT, typename AuxContainerT>
StatusCode L1CaloByteStreamAuxCnv<ContainerT, AuxContainerT>::initialize() {
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx
index f7021bd104d4339da2cc887728d067699f535bef..8f28106dad76d55afc1d09d2d663e51e79ec80f8 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.cxx
@@ -36,7 +36,7 @@
namespace LVL1BS {
PpmByteStreamAuxCnv::PpmByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "PpmByteStreamAuxCnv"),
m_name("PpmByteStreamAuxCnv"),
m_readTool("LVL1BS::PpmByteStreamReadV1V2Tool/PpmByteStreamReadV1V2Tool"),
@@ -48,11 +48,13 @@ const CLID& PpmByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::TriggerTowerAuxContainer>::ID();
}
+long PpmByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode PpmByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h
index 1fb8d5e28f3cb00bad8d62cc2767dd7fe09ed9e4..8ae7542d77f761aa187ae1b27900e9f960d3608e 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamAuxCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
#include "ZdcByteStream/ZdcByteStreamReadV1V2Tool.h"
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
index 5a926c38333d7a97d2442723343185c32d12daf5..c67620762b464d23289a2ab013be95dd64c12b26 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
@@ -89,9 +89,6 @@ PpmByteStreamReadV1V2Tool::PpmByteStreamReadV1V2Tool(const std::string& name /*=
// ===========================================================================
// Initialize
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode PpmByteStreamReadV1V2Tool::initialize() {
ATH_MSG_INFO(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx
index 8ef8d161bda43d73156391b06cb4040f3cc2a29d..d15bada241012105bfa6576c5bc8f447af752988 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.cxx
@@ -33,7 +33,7 @@
namespace LVL1BS {
PpmByteStreamxAODCnv::PpmByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "PpmByteStreamxAODCnv"),
m_name("PpmByteStreamxAODCnv")
{
@@ -46,11 +46,13 @@ const CLID& PpmByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::TriggerTowerContainer>::ID();
}
+long PpmByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode PpmByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h
index 5e6b42981e0647ebc8ffca4f4c2e641ca0c64eda..72e1eefbacb4f50248d76973180229c47d64b6f6 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamxAODCnv.h
@@ -26,8 +26,6 @@ template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
@@ -53,8 +51,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx
index e61d084648f8fd5aa656370f13940baaa589d94f..b710f74e30721d59e386062fab87dda9fd4e5b49 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.cxx
@@ -52,7 +52,7 @@
namespace LVL1BS {
RodHeaderByteStreamAuxCnv::RodHeaderByteStreamAuxCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "RodHeaderByteStreamAuxCnv"),
m_name("RodHeaderByteStreamAuxCnv"),
m_readTool("LVL1BS::RodHeaderByteStreamTool/RodHeaderByteStreamTool")
@@ -63,11 +63,13 @@ const CLID& RodHeaderByteStreamAuxCnv::classID() {
return ClassID_traits<xAOD::RODHeaderAuxContainer>::ID();
}
+long RodHeaderByteStreamAuxCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode RodHeaderByteStreamAuxCnv::initialize() {
ATH_MSG_DEBUG(
"Initializing " << m_name << " - package version " << PACKAGE_VERSION);
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h
index d2c292baac82a04da01f85c50388dea8d9433ad0..27b5aa4da4707555652a4d81c3dbf6df5caef111 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamAuxCnv.h
@@ -24,8 +24,6 @@ class StatusCode;
template <typename> class CnvFactory;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
@@ -50,8 +48,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
private:
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx
index 99273413253c4221a879d7230c19b79af8e56448..6dafd3f4d4590cbc43bf2c585427eb03f534474f 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.cxx
@@ -32,7 +32,7 @@
namespace LVL1BS {
RodHeaderByteStreamxAODCnv::RodHeaderByteStreamxAODCnv(ISvcLocator* svcloc) :
- Converter(ByteStream_StorageType, classID(), svcloc),
+ Converter(storageType(), classID(), svcloc),
AthMessaging(svcloc != 0 ? msgSvc() : 0, "RodHeaderByteStreamxAODCnv"),
m_name("RodHeaderByteStreamxAODCnv")
{
@@ -45,11 +45,13 @@ const CLID& RodHeaderByteStreamxAODCnv::classID() {
return ClassID_traits<xAOD::RODHeaderContainer>::ID();
}
+long RodHeaderByteStreamxAODCnv::storageType()
+{
+ return ByteStreamAddress::storageType();
+}
+
// Init method gets all necessary services etc.
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
StatusCode RodHeaderByteStreamxAODCnv::initialize() {
ATH_MSG_DEBUG(
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h
index b9a4e91b93e31a99b822988d32fea6b3168e1ce0..9095f3909b5c0d6220a4ad40fb3e0a333edde35f 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/RodHeaderByteStreamxAODCnv.h
@@ -22,8 +22,6 @@ class StatusCode;
template <typename> class CnvFactory;
class StoreGateSvc;
-// Externals
-extern long ByteStream_StorageType;
namespace LVL1BS {
/** ByteStream converter for RodHeader.
@@ -45,8 +43,8 @@ public:
virtual StatusCode createRep(DataObject* pObj, IOpaqueAddress*& pAddr);
// Storage type and class ID
- virtual long repSvcType() const { return ByteStream_StorageType;}
- static long storageType(){ return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
+ static long storageType();
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
old mode 100755
new mode 100644
index 6036434596b041148d930e844d5ac19c39ab4531..64ebff9fe10e30dadb328245acfff11fd706d84c
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
@@ -21,9 +21,6 @@
// Forward declaration(s):
class CTPSrcIdMap;
-// External(s):
-extern long ByteStream_StorageType;
-
/**
* @short ByteStream converter for the CTP_RDO object
*
@@ -54,9 +51,9 @@ public:
virtual StatusCode createRep( DataObject* pObj, IOpaqueAddress*& pAddr );
/// Function needed by the framework
- virtual long repSvcType() const { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
/// Function needed by the framework
- static long storageType() { return ByteStream_StorageType; }
+ static long storageType();
/// Function needed by the framework
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
old mode 100755
new mode 100644
index e5eae54bfd743ccb98ea2b597abf4976585d4a52..c0fce9b256991637ca3d51cdd276116c12a85823
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1RESULTBYTESTREAM_MUCTPIBYTESTREAMCNV_H
@@ -31,9 +31,6 @@
// Forward declaration(s):
class MuCTPISrcIdMap;
-// External(s):
-extern long ByteStream_StorageType;
-
/**
* @short ByteStream converter for the MuCTPI_RDO object
*
@@ -66,9 +63,9 @@ public:
virtual StatusCode createRep( DataObject* pObj, IOpaqueAddress*& pAddr );
/// Function needed by the framework
- virtual long repSvcType() const { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
/// Function needed by the framework
- static long storageType() { return ByteStream_StorageType; }
+ static long storageType();
/// Function needed by the framework
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
old mode 100755
new mode 100644
index 0a5eed5e95a1c28ee60ffd649b39eda3603e5237..08482adb2a75b85ce85fb65816a393487117ebf2
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
@@ -21,9 +21,6 @@
// Forward declaration(s):
class CTPSrcIdMap;
-// External(s):
-extern long ByteStream_StorageType;
-
/**
* @short ByteStream converter for the CTP_RIO object
*
@@ -52,9 +49,9 @@ public:
virtual StatusCode createObj( IOpaqueAddress* pAddr, DataObject*& pObj );
/// Function needed by the framework
- virtual long repSvcType() const { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
/// Function needed by the framework
- static long storageType() { return ByteStream_StorageType; }
+ static long storageType();
/// Function needed by the framework
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
old mode 100755
new mode 100644
index 3e2dfbddf3c3c663cf0cf8f60b8f8076221a9875..ff17922350b39cc182455935c1b744baf2f3d520
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
@@ -21,9 +21,6 @@
// Forward declaration(s):
class MuCTPISrcIdMap;
-// Externals
-extern long ByteStream_StorageType;
-
/**
* @short ByteStream converter for the MuCTPI_RIO object
*
@@ -54,9 +51,9 @@ public:
virtual StatusCode createObj( IOpaqueAddress* pAddr, DataObject*& pObj );
/// Function needed by the framework
- virtual long repSvcType() const { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
/// Function needed by the framework
- static long storageType() { return ByteStream_StorageType; }
+ static long storageType();
/// Function needed by the framework
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
old mode 100755
new mode 100644
index 35ca48a44166999cf83d01abfa0cbbbb5643549a..2861b3fba3870271e8b57c97961f22f9f04e7c17
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
@@ -14,9 +14,6 @@
// Local include(s):
#include "TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h"
-// External(s):
-extern long ByteStream_StorageType;
-
/**
* @short ByteStream converter for the RecRoIBResult object
*
@@ -44,9 +41,9 @@ public:
virtual StatusCode createObj( IOpaqueAddress* pAddr, DataObject*& pObj );
/// Function needed by the framework
- virtual long repSvcType() const { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
/// Function needed by the framework
- static long storageType() { return ByteStream_StorageType; }
+ static long storageType();
/// Function needed by the framework
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
index 4ae484f8d9dbcd5fcb6853de0af459726dae796c..6d500e02df8c542eb0dbc336f9dedef3cc13e854 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_ICC
@@ -28,7 +28,7 @@
*/
template< class ROBF >
RecRoIBResultByteStreamCnv< ROBF >::RecRoIBResultByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_tool( "RecRoIBResultByteStreamTool" ) {
}
@@ -44,6 +44,10 @@ const CLID& RecRoIBResultByteStreamCnv< ROBF >::classID() {
}
+template< class ROBF >
+long RecRoIBResultByteStreamCnv< ROBF >::storageType() {
+ return ByteStreamAddress::storageType();
+}
/**
* Init method gets all necessary services etc.
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
old mode 100755
new mode 100644
index 1e6f4be66fc4c6b4b000d0c65cfa6cf28d3d4c2f..c0bded8c16b0e8686035d2f94459dfb9960c7f56
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
@@ -17,9 +17,6 @@
// Local include(s):
#include "TrigT1ResultByteStream/RoIBResultByteStreamTool.h"
-// External(s):
-extern long ByteStream_StorageType;
-
/**
* @short ByteStream converter for the RoIBResult object
*
@@ -50,9 +47,9 @@ public:
virtual StatusCode createRep( DataObject* pObj, IOpaqueAddress*& pAddr );
/// Function needed by the framework
- virtual long repSvcType() const { return ByteStream_StorageType; }
+ virtual long repSvcType() const { return i_repSvcType(); }
/// Function needed by the framework
- static long storageType() { return ByteStream_StorageType; }
+ static long storageType();
/// Function needed by the framework
static const CLID& classID();
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
index 621cec82975893bab2431d62023b8a4500b54e5e..e5bdc37697cfb7372cfa9e54d74f9ef0556c22a3 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_ICC
@@ -29,7 +29,7 @@
*/
template< class ROBF >
RoIBResultByteStreamCnv< ROBF >::RoIBResultByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_tool( "RoIBResultByteStreamTool" ),
m_ByteStreamCnvSvc( "ByteStreamCnvSvc", "RoIBResultByteStreamCnv" ) {
@@ -44,6 +44,10 @@ const CLID& RoIBResultByteStreamCnv< ROBF >::classID(){
return ClassID_traits< ROIB::RoIBResult >::ID();
}
+template< class ROBF >
+long RoIBResultByteStreamCnv< ROBF >::storageType() {
+ return ByteStreamAddress::storageType();
+}
/**
* Init method gets all necessary services etc.
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
index 23b7841c34e4ed7a251487234873b131693d4208..2847b9b92b9b7d2ce791541891b1eb6aee120a92 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,7 +23,7 @@
* base class in the correct way.
*/
CTPByteStreamCnv::CTPByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_tool( "CTPByteStreamTool" ), m_srcIdMap( 0 ),
m_robDataProvider( "ROBDataProviderSvc", "CTPByteStreamCnv" ),
m_ByteStreamEventAccess( "ByteStreamCnvSvc", "CTPByteStreamCnv" ) {
@@ -53,6 +53,10 @@ const CLID& CTPByteStreamCnv::classID() {
}
+long CTPByteStreamCnv::storageType() {
+ return ByteStreamAddress::storageType();
+}
+
/**
* Init method gets all necessary services etc.
*/
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
index 6610c55ed47b906c22483374a7f9b1089b73fd17..d4926702ec997ac10ab818571781f1d46698f5b5 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -31,7 +31,7 @@
* base class in the correct way.
*/
MuCTPIByteStreamCnv::MuCTPIByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_tool( "MuCTPIByteStreamTool" ), m_srcIdMap( 0 ),
#ifdef CTP_MUCTPI_HAVE_SAME_ROS
m_ctp_tool( "CTPByteStreamTool" ),
@@ -66,6 +66,10 @@ const CLID& MuCTPIByteStreamCnv::classID() {
}
+long MuCTPIByteStreamCnv::storageType() {
+ return ByteStreamAddress::storageType();
+}
+
/**
* Init method gets all necessary services etc.
*/
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
index d270aa8e2900fe701b18bcf3ef2bd0d9faf22830..3830dc9a04e138f6642c7976e83c6514da54aa8a 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -23,7 +23,7 @@
* base class in the correct way.
*/
RecCTPByteStreamCnv::RecCTPByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_tool( "RecCTPByteStreamTool" ), m_srcIdMap( 0 ),
m_robDataProvider( "ROBDataProviderSvc", "RecCTPByteStreamCnv" ) {
@@ -52,6 +52,10 @@ const CLID& RecCTPByteStreamCnv::classID() {
}
+long RecCTPByteStreamCnv::storageType() {
+ return ByteStreamAddress::storageType();
+}
+
/**
* Init method gets all necessary services etc.
*/
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
index e495669ae0ec93ef72af8fb89c329b60a5d58018..15d4cb7496eb136bb552288e58248542d5a2c378 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -22,7 +22,7 @@
* base class in the correct way.
*/
RecMuCTPIByteStreamCnv::RecMuCTPIByteStreamCnv( ISvcLocator* svcloc )
- : Converter( ByteStream_StorageType, classID(), svcloc ),
+ : Converter( storageType(), classID(), svcloc ),
m_tool( "RecMuCTPIByteStreamTool" ), m_srcIdMap( 0 ),
m_robDataProvider( "ROBDataProviderSvc", "RecMuCTPIByteStreamCnv" ) {
@@ -51,6 +51,10 @@ const CLID& RecMuCTPIByteStreamCnv::classID() {
}
+long RecMuCTPIByteStreamCnv::storageType() {
+ return ByteStreamAddress::storageType();
+}
+
/**
* Init method gets all necessary services etc.
*/