From 848e59ee9ce5938c50e0d97086a668837b43b3a7 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Fri, 23 Dec 2016 05:18:44 +0100
Subject: [PATCH] 'PropertyMgr -> PropertyHolder, for compatibility with new
Gaudi.' (AraTool-00-02-12)
* Tagging AraTool-00-02-12.
* PropertyMgr -> PropertyHolder, for compatibility with new
Gaudi.
2016-07-12 scott snyder <snyder@bnl.gov>
* Tagging AraTool-00-02-11.
* Comply with ATLAS naming conventions. Do not use protected data
members.
---
.../AraTool/AraTool/AraAlgToolWrapper.icc | 5 +++--
PhysicsAnalysis/AraTool/AraTool/AraToolBase.h | 19 ++++++++++++++-----
PhysicsAnalysis/AraTool/src/AraToolBase.cxx | 4 ++--
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/PhysicsAnalysis/AraTool/AraTool/AraAlgToolWrapper.icc b/PhysicsAnalysis/AraTool/AraTool/AraAlgToolWrapper.icc
index 37338e94ef1..81128394a3e 100644
--- a/PhysicsAnalysis/AraTool/AraTool/AraAlgToolWrapper.icc
+++ b/PhysicsAnalysis/AraTool/AraTool/AraAlgToolWrapper.icc
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/PropertyMgr.h"
+#include "AraTool/AraToolBase.h"
/////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,8 @@ AraAlgToolWrapper< T >::AraAlgToolWrapper( const std::string& type, const std::s
m_log( msgSvc(), name ),
m_factor(0)
{
- m_ptool=new T(getPropertyMgr());
+ AlgTool* a = this;
+ m_ptool=new T(a);
}
//___________________________________________________________________________
diff --git a/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h b/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
index afcc59bdf4a..ba6a5a207e5 100644
--- a/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
+++ b/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
@@ -6,18 +6,27 @@
#define ARATOOLBASE_H
#include "GaudiKernel/Property.h"
-#include "GaudiKernel/PropertyMgr.h"
+#include "GaudiKernel/PropertyHolder.h"
#include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/IDataHandleHolder.h"
+#include "GaudiKernel/CommonMessaging.h"
#include <string>
class AraToolBase
{
- protected:
+public:
+ typedef PropertyHolder<CommonMessaging<implements<IAlgTool, IDataHandleHolder, IProperty, IStateful> > > PropertyMgr;
+
+protected:
+ bool runningARA() const { return m_runningARA; }
+
+private:
PropertyMgr *m_propertyMgr;
- bool RunningARA;
+ bool m_runningARA;
- public:
+
+public:
AraToolBase(PropertyMgr * pmgr=0);
@@ -45,7 +54,7 @@ AraToolBase::declareProperty
const std::string& doc )
{
- if(RunningARA) {
+ if(m_runningARA) {
} else {
return m_propertyMgr->declareProperty(name, value, doc);
}
diff --git a/PhysicsAnalysis/AraTool/src/AraToolBase.cxx b/PhysicsAnalysis/AraTool/src/AraToolBase.cxx
index 12fabe9a55b..9f072995e7a 100644
--- a/PhysicsAnalysis/AraTool/src/AraToolBase.cxx
+++ b/PhysicsAnalysis/AraTool/src/AraToolBase.cxx
@@ -5,10 +5,10 @@
#include "AraTool/AraToolBase.h"
AraToolBase::AraToolBase(PropertyMgr *pmgr)
- :m_propertyMgr(pmgr),RunningARA(false)
+ :m_propertyMgr(pmgr),m_runningARA(false)
{
if(!m_propertyMgr) {
- RunningARA=true;
+ m_runningARA=true;
}
}
--
GitLab