diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/IAnalysisTools.icc b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/IAnalysisTools.icc
index c034d82e17cc89b542be1db41e18a04ac634d0c0..2a12c2792552c1cc49c514f8b104ef8e9c2ff29a 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/IAnalysisTools.icc
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/IAnalysisTools.icc
@@ -6,7 +6,7 @@
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGate.h"
-#include "DataModel/OwnershipPolicy.h"
+#include "AthContainers/OwnershipPolicy.h"
inline double IAnalysisTools::deltaPhi (const INavigable4Momentum *p1, const INavigable4Momentum *p2) const
{
@@ -200,7 +200,7 @@ template <class CALLER, class CRITERIA, class COLL> inline StatusCode IAnalysisT
StatusCode sc = evtStore()->record(newColl, key);
if (sc.isFailure())
{
- log << MSG::ERROR << "Unable to record Container in SG with key=" << key << endreq;
+ log << MSG::ERROR << "Unable to record Container in SG with key=" << key << endmsg;
return sc;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt
index 74a68686452a4f67f196f0e465e56c960b7c3c4d..95c40a5f55d0a75cbc57217b43bba5d7e1334574 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt
@@ -8,7 +8,7 @@ atlas_subdir( AnalysisTools )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
- Control/DataModel
+ Control/AthContainers
Control/StoreGate
Event/NavFourMom
GaudiKernel
@@ -32,19 +32,19 @@ atlas_add_library( AthAnalysisToolsLib
PUBLIC_HEADERS AnalysisTools
INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${PYTHON_LIBRARIES} AthenaBaseComps DataModel NavFourMom GaudiKernel McParticleEvent StoreGateLib SGtests AnalysisUtilsLib RootCollectionComponents
+ LINK_LIBRARIES ${PYTHON_LIBRARIES} AthenaBaseComps AthContainers NavFourMom GaudiKernel McParticleEvent StoreGateLib SGtests AnalysisUtilsLib RootCollectionComponents
PRIVATE_LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} SGTools RootCollection AthenaPoolUtilities PersistentDataModel EventInfo )
atlas_add_component( AthAnalysisTools
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps DataModel StoreGateLib SGtests NavFourMom GaudiKernel AnalysisUtilsLib McParticleEvent SGTools RootCollection RootCollectionComponents AthenaPoolUtilities PersistentDataModel EventInfo AthAnalysisToolsLib )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthContainers StoreGateLib SGtests NavFourMom GaudiKernel AnalysisUtilsLib McParticleEvent SGTools RootCollection RootCollectionComponents AthenaPoolUtilities PersistentDataModel EventInfo AthAnalysisToolsLib )
atlas_add_dictionary( AthAnalysisToolsDict
AnalysisTools/AnalysisToolsDict.h
AnalysisTools/selection.xml
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps DataModel StoreGateLib SGtests NavFourMom GaudiKernel AnalysisUtilsLib McParticleEvent SGTools RootCollection RootCollectionComponents AthenaPoolUtilities PersistentDataModel EventInfo AthAnalysisToolsLib )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${PYTHON_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthContainers StoreGateLib SGtests NavFourMom GaudiKernel AnalysisUtilsLib McParticleEvent SGTools RootCollection RootCollectionComponents AthenaPoolUtilities PersistentDataModel EventInfo AthAnalysisToolsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/cmt/requirements b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/cmt/requirements
index da66d9de6068275d4075877ee71aa04cf1708dcc..65a11f9f938da0e66cbbea148a0ec669e8fb0711 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/cmt/requirements
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/cmt/requirements
@@ -13,7 +13,7 @@ use McParticleEvent McParticleEvent-* PhysicsAnalysis/TruthParticleID
use AthenaBaseComps AthenaBaseComps-* Control
use StoreGate StoreGate-* Control
-use DataModel DataModel-* Control
+use AthContainers AthContainers-* Control
use AnalysisUtils AnalysisUtils-* PhysicsAnalysis/AnalysisCommon
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
index 1285d38d8848976e61709b6496ba1d935900291a..a445101be528c98bfb9e36cd488f168c53824507 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTEventSelector.cxx
@@ -58,20 +58,20 @@ StatusCode AANTEventSelector::initialize()
StatusCode sc = Service::initialize();
// Create a message stream.
- MsgStream log(messageService(), name());
+ MsgStream log(msgSvc(), name());
- log << MSG::DEBUG << "initialize()" << endreq;
+ log << MSG::DEBUG << "initialize()" << endmsg;
if (sc.isFailure())
{
- log << MSG::ERROR << "Unable to initialize Service base class" << endreq;
+ log << MSG::ERROR << "Unable to initialize Service base class" << endmsg;
return sc;
}
sc = service("StoreGateSvc", m_storeGate);
if (sc.isFailure())
{
- log << MSG::ERROR << "Unable to retrieve pointer to StoreGateSvc" << endreq;
+ log << MSG::ERROR << "Unable to retrieve pointer to StoreGateSvc" << endmsg;
return sc;
}
@@ -81,7 +81,7 @@ StatusCode AANTEventSelector::initialize()
{
log << MSG::ERROR << "Use the property:"
<< " EventSelector.InputCollections = [ \"<collectionName>\" ] (list of collections)"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
// create TChain
@@ -91,14 +91,14 @@ StatusCode AANTEventSelector::initialize()
std::vector<std::string>::iterator itE = inputColl.end();
for (; it!=itE; ++it)
{
- log << MSG::DEBUG << "Add : " << *it << endreq;
+ log << MSG::DEBUG << "Add : " << *it << endmsg;
m_tree->Add(it->c_str());
}
// get total number of events
m_totalNEvents = m_tree->GetEntries();
- log << MSG::DEBUG << "Total Events : " << m_totalNEvents << endreq;
+ log << MSG::DEBUG << "Total Events : " << m_totalNEvents << endmsg;
// RunNumber and EventNumber
m_tree->SetBranchAddress("EventNumber",&m_eventNumber);
@@ -108,20 +108,20 @@ StatusCode AANTEventSelector::initialize()
AANTTreeGate::setTree(m_tree);
// selection criteria
- log << MSG::DEBUG << "Load Sel: " << m_strSelection << " from __main__" << endreq;
+ log << MSG::DEBUG << "Load Sel: " << m_strSelection << " from __main__" << endmsg;
char smain[] = "__main__";
m_selectionFunc = PyObject_GetAttr(PyImport_AddModule(smain),PyString_FromString(m_strSelection.c_str()));
if (m_selectionFunc == NULL)
{
- log << MSG::ERROR << "Could not load sel : " << m_strSelection << endreq;
+ log << MSG::ERROR << "Could not load sel : " << m_strSelection << endmsg;
return StatusCode::FAILURE;
}
- log << MSG::DEBUG << "Load Cnv: " << m_strConverter << " from __main__" << endreq;
+ log << MSG::DEBUG << "Load Cnv: " << m_strConverter << " from __main__" << endmsg;
m_convFunc = PyObject_GetAttr(PyImport_AddModule(smain),PyString_FromString(m_strConverter.c_str()));
if (m_convFunc == NULL)
{
- log << MSG::ERROR << "Could not load conv : " << m_strConverter << endreq;
+ log << MSG::ERROR << "Could not load conv : " << m_strConverter << endmsg;
return StatusCode::FAILURE;
}
@@ -147,14 +147,14 @@ StatusCode AANTEventSelector::next(IEvtSelector::Context& it)const
// jump
StatusCode AANTEventSelector::next(IEvtSelector::Context& it, int jump) const
{
- MsgStream log(messageService(), name());
- log << MSG::DEBUG << "next(" << jump << ") : iEvt " << m_numEvents << endreq;
+ MsgStream log(msgSvc(), name());
+ log << MSG::DEBUG << "next(" << jump << ") : iEvt " << m_numEvents << endmsg;
// get EventContext
AANTEventContext* ct = dynamic_cast<AANTEventContext*>(&it);
if (ct == 0)
{
- log << MSG::ERROR << "Could not dcast to AANTEventContext" << endreq;
+ log << MSG::ERROR << "Could not dcast to AANTEventContext" << endmsg;
return StatusCode::FAILURE;
}
// jump
@@ -184,7 +184,7 @@ StatusCode AANTEventSelector::next(IEvtSelector::Context& it, int jump) const
StatusCode sc = m_storeGate->record(evtInfo, "AANTEventInfo");
if (sc.isFailure())
{
- log << MSG::ERROR << "Could not record AANTEventInfo" << endreq;
+ log << MSG::ERROR << "Could not record AANTEventInfo" << endmsg;
return sc;
}
// return
@@ -222,8 +222,8 @@ StatusCode AANTEventSelector::previous(IEvtSelector::Context& it, int jump) cons
// last
StatusCode AANTEventSelector::last(IEvtSelector::Context& /*it*/) const
{
- MsgStream log(messageService(), name());
- log << MSG::ERROR << "AANTEventSelector::last() not implemented" << endreq;
+ MsgStream log(msgSvc(), name());
+ log << MSG::ERROR << "AANTEventSelector::last() not implemented" << endmsg;
return StatusCode::FAILURE;
}
@@ -231,8 +231,8 @@ StatusCode AANTEventSelector::last(IEvtSelector::Context& /*it*/) const
// resetCriteria
StatusCode AANTEventSelector::resetCriteria(const std::string& /*criteria*/, IEvtSelector::Context& /*ctxt*/) const
{
- MsgStream log(messageService(), name());
- log << MSG::ERROR << "AANTEventSelector::resetCriteria() not implemented" << endreq;
+ MsgStream log(msgSvc(), name());
+ log << MSG::ERROR << "AANTEventSelector::resetCriteria() not implemented" << endmsg;
return StatusCode::FAILURE;
}
@@ -240,8 +240,8 @@ StatusCode AANTEventSelector::resetCriteria(const std::string& /*criteria*/, IEv
// rewind
StatusCode AANTEventSelector::rewind(IEvtSelector::Context& /*it*/) const
{
- MsgStream log(messageService(), name());
- log << MSG::ERROR << "AANTEventSelector::rewind() not implemented" << endreq;
+ MsgStream log(msgSvc(), name());
+ log << MSG::ERROR << "AANTEventSelector::rewind() not implemented" << endmsg;
return StatusCode::FAILURE;
}
@@ -257,8 +257,8 @@ StatusCode AANTEventSelector::createAddress(const IEvtSelector::Context& /*it*/,
// releaseContext
StatusCode AANTEventSelector::releaseContext(IEvtSelector::Context*& /*it*/) const
{
- MsgStream log(messageService(), name());
- log << MSG::ERROR << "AANTEventSelector::releaseContext() not implemented" << endreq;
+ MsgStream log(msgSvc(), name());
+ log << MSG::ERROR << "AANTEventSelector::releaseContext() not implemented" << endmsg;
return StatusCode::FAILURE;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
index 9ed5742f8c4607af7154cfe75c50941b5084433e..0a63108e427486ae3132e461fdbc5699acf73bbb 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
@@ -484,7 +484,7 @@ StatusCode AANTupleStream::splitAddress( const std::string& address,
std::string& address_header,
std::string& address_data ) const
{
- ATH_MSG_DEBUG ("splitAddress " << endreq
+ ATH_MSG_DEBUG ("splitAddress " << endmsg
<< " address : " << address
<< " match : " << match);
@@ -503,7 +503,7 @@ StatusCode AANTupleStream::splitAddress( const std::string& address,
}
ATH_MSG_DEBUG (" address_header : " << address_header
- << endreq
+ << endmsg
<< " address_data : " << address_data);
return StatusCode::SUCCESS;