From b8b0e349ec1d78fd16a44931f5415eab240eb076 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 15 Dec 2016 17:57:38 +0100
Subject: [PATCH] IProxyDictWithPool -> IProxyDict. DataModel -> AthLinks.
(PileUpTools-01-18-04)
* Tagging PileUpTools-01-18-04.
* IProxyDictWithPool -> IProxyDict.
* DataModel -> AthLinks.
2016-07-28 scott snyder <snyder@bnl.gov>
* Tagging PileUpTools-01-18-03.
* endreq -> endmsg.
---
Control/PileUpTools/CMakeLists.txt | 6 +++---
Control/PileUpTools/PileUpTools/PileUpMergeSvc.h | 2 +-
.../PileUpTools/PileUpTools/PileUpMergeSvc.icc | 10 +++++-----
Control/PileUpTools/cmt/requirements | 4 ++--
Control/PileUpTools/src/PileUpMergeSvc.cxx | 16 ++++++++--------
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Control/PileUpTools/CMakeLists.txt b/Control/PileUpTools/CMakeLists.txt
index b67cdd2ce84..b4b758677a7 100644
--- a/Control/PileUpTools/CMakeLists.txt
+++ b/Control/PileUpTools/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
Control/CLIDSvc
- Control/DataModel
+ Control/AthLinks
Control/SGTools
Control/StoreGate
Event/EventInfo
@@ -21,9 +21,9 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_library( PileUpToolsLib
src/*.cxx
PUBLIC_HEADERS PileUpTools
- LINK_LIBRARIES AthenaBaseComps AthenaKernel DataModel SGTools EventInfo xAODEventInfo GaudiKernel StoreGateLib SGtests )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel AthLinks SGTools EventInfo xAODEventInfo GaudiKernel StoreGateLib SGtests )
atlas_add_component( PileUpTools
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaKernel DataModel SGTools StoreGateLib SGtests EventInfo xAODEventInfo GaudiKernel PileUpToolsLib )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel AthLinks SGTools StoreGateLib SGtests EventInfo xAODEventInfo GaudiKernel PileUpToolsLib )
diff --git a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
index 1456954176a..8b36c7f5024 100755
--- a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
+++ b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
@@ -23,7 +23,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "DataModel/DataLink.h"
+#include "AthLinks/DataLink.h"
#include "PileUpTools/IPileUpXingFolder.h"
diff --git a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc
index f14fa160cbc..8749f71b4e8 100755
--- a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc
+++ b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc
@@ -21,14 +21,14 @@
namespace {
template <class DATALINK, typename KEY>
- void fillLink(DATALINK& l, const KEY& k, IProxyDictWithPool* sg = 0)
+ void fillLink(DATALINK& l, const KEY& k, IProxyDict* sg = 0)
{ l.toIdentifiedObject(k, sg); }
struct NoKey {};
//MsgStream& operator <<(MsgStream& os, const NoKey&) { os << "Default"; return os; }
template <class DATALINK>
- void fillLink(DATALINK&, const NoKey&, IProxyDictWithPool*)
+ void fillLink(DATALINK&, const NoKey&, IProxyDict*)
{ /*leave it in default state*/ }
}
@@ -111,7 +111,7 @@ PileUpMergeSvc::retrieveSubEvtsData(const KEY& dataKey, //orig evt key
msg() << " time offset: " << sigTime
<< " event index: " << evtIndex;
}
- msg() << endreq;
+ msg() << endmsg;
}
#endif
}
@@ -168,7 +168,7 @@ PileUpMergeSvc::retrieveSubEvtsData(const KEY& dataKey, //orig evt key
#endif
} else {
p_activeStore->setStore(iEvt->pSubEvtSG); //FIXME DANGEROUS!
- IProxyDictWithPool* pSG(const_cast<StoreGateSvc*>(iEvt->pSubEvtSG));
+ IProxyDict* pSG(const_cast<StoreGateSvc*>(iEvt->pSubEvtSG));
DataLink_t dLink;
fillLink(dLink, dataKey, pSG);
double sigTime(0.0);
@@ -195,7 +195,7 @@ PileUpMergeSvc::retrieveSubEvtsData(const KEY& dataKey, //orig evt key
msg() << " time offset: " << sigTime
<< " event index: " << evtIndex;
}
- msg() << endreq;
+ msg() << endmsg;
}
#endif
}
diff --git a/Control/PileUpTools/cmt/requirements b/Control/PileUpTools/cmt/requirements
index e65f9361950..9cd427ec611 100755
--- a/Control/PileUpTools/cmt/requirements
+++ b/Control/PileUpTools/cmt/requirements
@@ -7,11 +7,11 @@ use AtlasPolicy AtlasPolicy-*
use AthenaKernel AthenaKernel-* Control
use AthenaBaseComps AthenaBaseComps-* Control
use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
+use AthLinks AthLinks-* Control
use SGTools SGTools-* Control
use StoreGate StoreGate-* Control
use EventInfo EventInfo-* Event
-use xAODEventInfo xAODEventInfo-* Event/xAOD
+use xAODEventInfo xAODEventInfo-* Event/xAOD
use GaudiInterface GaudiInterface-* External
apply_pattern dual_use_library files=" *.cxx "
diff --git a/Control/PileUpTools/src/PileUpMergeSvc.cxx b/Control/PileUpTools/src/PileUpMergeSvc.cxx
index d86a4ed05ac..bc40d55efd1 100755
--- a/Control/PileUpTools/src/PileUpMergeSvc.cxx
+++ b/Control/PileUpTools/src/PileUpMergeSvc.cxx
@@ -48,7 +48,7 @@ void PileUpMergeSvc::decodeIntervals() {
const IPileUpXingFolder& xing(**iXing);
if (msg().level() <= MSG::DEBUG) {
msg() << MSG::DEBUG << "decodeIntervals: adding IPileUpXingFolder "
- << xing.name() << endreq;
+ << xing.name() << endmsg;
}
IPileUpXingFolder::const_iterator
item(xing.begin()), endItem(xing.end());
@@ -61,7 +61,7 @@ void PileUpMergeSvc::decodeIntervals() {
<< " key " << item->key() << " in the Xing range ["
<< xing.firstXing() << ", " << xing.lastXing() << ']'
<< " with cache refresh frequency "
- << xing.cacheRefreshFrequency() << endreq;
+ << xing.cacheRefreshFrequency() << endmsg;
}
++item;
}
@@ -75,13 +75,13 @@ void PileUpMergeSvc::decodeIntervals() {
StatusCode
PileUpMergeSvc::initialize() {
msg() << MSG::INFO << "Initializing AthService " << name()
- << " - package version " << PACKAGE_VERSION << endreq ;
+ << " - package version " << PACKAGE_VERSION << endmsg ;
// set up the SG service:
if ( !(p_overStore.retrieve()).isSuccess() )
{
msg() << MSG::FATAL
<< "Could not locate default store"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
// set up the active store service:
@@ -89,14 +89,14 @@ PileUpMergeSvc::initialize() {
{
msg() << MSG::FATAL
<< "Could not locate ActiveStoreSvc"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
if (!m_pITriggerTime.empty() && !(m_pITriggerTime.retrieve()).isSuccess() )
{
msg() << MSG::FATAL
<< "Could not locate ITriggerTime tool"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -185,7 +185,7 @@ PileUpMergeSvc::clearDataCaches() {
<< "clearDataCachesByFolder: object with clid "
<< id << " and key " << key
<< " removed from cache "
- << iEvt->pSubEvtSG->name() << endreq;
+ << iEvt->pSubEvtSG->name() << endmsg;
}
#endif
}
@@ -200,7 +200,7 @@ PileUpMergeSvc::clearDataCaches() {
if (msg().level() <= MSG::VERBOSE) {
msg() << MSG::VERBOSE
<< "clearDataCachesByFolder: done with store " << iEvt->pSubEvtSG->name()
- << endreq;
+ << endmsg;
}
#endif
++iEvt;
--
GitLab