Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool1.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
 
 //

Control/AthToolSupport/AsgExampleTools/test/inc_IUnitTestTool2.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
 
 //

Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h → Control/AthToolSupport/AsgTesting/AsgTesting/UnitTest.h

-#ifndef ASG_TOOLS__UNIT_TEST_H
-#define ASG_TOOLS__UNIT_TEST_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+
+#ifndef ASG_TOOLS__UNIT_TEST_H
+#define ASG_TOOLS__UNIT_TEST_H
 
 #include <AsgTools/MessageCheck.h>
 #include <AsgTools/MessagePrinterErrorCollect.h>
@@ -46,7 +45,7 @@ namespace asg
   EXPECT_EQ (asg::CheckHelper<decltype(x)>::failureCode(), x)
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
 #define ASSERT_FAILURE_REGEX(x,regex)                           \
   ASSERT_FAILURE(x)
 #define EXPECT_FAILURE_REGEX(x,regex)                           \

Control/AthToolSupport/AsgTesting/CMakeLists.txt

+# Declare the package name:
+atlas_subdir( AsgTesting )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC Control/AthToolSupport/AsgTools )
+
+# External dependencies:
+find_package( Boost COMPONENTS regex )
+find_package( GTest )
+find_package( GMock )
+
+# Component(s) in the package:
+atlas_add_library( AsgTestingLib
+   AsgTesting/*.h AsgTesting/*.icc Root/*.cxx
+   PUBLIC_HEADERS AsgTesting
+   INCLUDE_DIRS ${GTEST_INCLUDE_DIRS}
+   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+   LINK_LIBRARIES AsgTools
+   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} )
+
+atlas_add_test( gt_UnitTest_test
+   SOURCES test/gt_UnitTest_test.cxx
+   INCLUDE_DIRS ${GTEST_INCLUDE_DIRS}
+   LINK_LIBRARIES ${GTEST_LIBRARIES} AsgTestingLib
+   EXTRA_PATTERNS "\([0-9]+ ms\)|\([0-9]+ ms total\)|functionFailure" )

Control/AthToolSupport/AsgTools/Root/UnitTest.cxx → Control/AthToolSupport/AsgTesting/Root/UnitTest.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
 
 //
 // includes
 //
 
-#include <AsgTools/UnitTest.h>
+#include <AsgTesting/UnitTest.h>
 
 #include <boost/regex.hpp>
 

Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx → Control/AthToolSupport/AsgTesting/test/gt_UnitTest_test.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
 
 //
@@ -14,12 +12,12 @@
 
 #include <AsgTools/AnaToolHandle.h>
 #include <AsgTools/MessageCheck.h>
-#include <AsgTools/UnitTest.h>
+#include <AsgTesting/UnitTest.h>
 #include <cmath>
 #include <gtest/gtest.h>
 #include <gtest/gtest-spi.h>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <xAODRootAccess/Init.h>
 #endif
 
@@ -98,7 +96,7 @@ namespace asg
     EXPECT_FAILURE_REGEX (functionFailure("match"),".*match.*");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (AssertTest, failure_regex_failure_missmatch)
 #else
   TEST (AssertTest, DISABLED_failure_regex_failure_missmatch)
@@ -107,7 +105,7 @@ namespace asg
     EXPECT_FATAL_FAILURE (ASSERT_FAILURE_REGEX (functionFailure("text 1"),".*different text.*"), "functionFailure");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (AssertTest, failure_regex_failure_missing)
 #else
   TEST (AssertTest, DISABLED_failure_regex_failure_missing)
@@ -203,7 +201,7 @@ namespace asg
     EXPECT_FAILURE_REGEX (functionFailure("match"),".*match.*");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (ExpectTest, failure_regex_failure_missmatch)
 #else
   TEST (ExpectTest, DISABLED_failure_regex_failure_missmatch)
@@ -212,7 +210,7 @@ namespace asg
     EXPECT_NONFATAL_FAILURE (EXPECT_FAILURE_REGEX (functionFailure("text 1"),".*different text.*"), "functionFailure");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (ExpectTest, failure_regex_failure_missing)
 #else
   TEST (ExpectTest, DISABLED_failure_regex_failure_missing)
@@ -266,7 +264,7 @@ namespace asg
 
 int main (int argc, char **argv)
 {
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   StatusCode::enableFailure();
   ANA_CHECK (xAOD::Init ());
 #endif

Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h

-#ifndef ASG_TOOLS__ANA_TOOL_HANDLE_H
-#define ASG_TOOLS__ANA_TOOL_HANDLE_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
 
+#ifndef ASG_TOOLS__ANA_TOOL_HANDLE_H
+#define ASG_TOOLS__ANA_TOOL_HANDLE_H
+
 // Author: Will Buttinger
 
 
@@ -24,7 +22,7 @@
 
 namespace asg
 {
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
    typedef INamedInterface parentType_t;
    typedef IAsgTool interfaceType_t;
 #else
@@ -99,7 +97,7 @@ namespace asg
     public:
       virtual ~AnaToolProperty () noexcept = default;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief apply the property to the given tool in RootCore
       /// \par Guarantee
       ///   basic
@@ -114,7 +112,7 @@ namespace asg
 	const = 0;
 #endif
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       /// \brief store the property in the configuration service in
       /// Athena
       /// \par Guarantee
@@ -171,7 +169,7 @@ namespace asg
     public:
       void setType (std::string type) noexcept;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief register the new of the given type as factory
       ///
       /// If this is set, it is used instead of \ref type to allocate
@@ -206,7 +204,7 @@ namespace asg
       setProperty (const std::string& val_name,
 		   const AnaToolHandle<Type>& val_value);
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       /// \copydoc setProperty
     public:
       template<typename Type> StatusCode
@@ -264,7 +262,7 @@ namespace asg
                     AnaToolCleanup& cleanup) const;
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       /// \brief store the properties in the configuration service in
       /// Athena
       /// \par Guarantee
@@ -296,7 +294,7 @@ namespace asg
       std::map<std::string,std::shared_ptr<AnaToolProperty> > m_properties;
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief create, configure and initialize the tool (in
       /// RootCore)
       /// \par Guarantee
@@ -310,7 +308,7 @@ namespace asg
 #endif
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief allocate the tool
       /// \par Guarantee
       ///   basic
@@ -610,7 +608,7 @@ namespace asg
   public:
     void setType (std::string val_type) noexcept;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     /// \brief set the value of \ref type and a factory based on the
     /// standard tool constructor
     ///
@@ -855,7 +853,7 @@ namespace asg
   //   ToolHandle<T>& handle () {
   //     return *m_handleUser;};
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   public:
     template<class T2>
     ASG_DEPRECATED ("please use setTypeRegisterNew() instead")
@@ -885,10 +883,6 @@ namespace asg
   private:
     std::string m_name;
 
-    /// \brief the name of the parent
-  private:
-    std::string m_parentName;
-
     /// \brief the pointer to the parent
   private:
     parentType_t *m_parentPtr = nullptr;
@@ -990,7 +984,7 @@ namespace asg
   (ASG_SET_ANA_TOOL_TYPE(handle,type), StatusCode (StatusCode::SUCCESS))
 
 /// \brief set the tool type on the tool handle, using new in rootcore
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #define ASG_SET_ANA_TOOL_TYPE(handle,type)	\
   (handle).template setTypeRegisterNew<type> (#type)
 #else

Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc

+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
+#ifndef ASGTOOLS_ANATOOLHANDLE_ICC
+#define ASGTOOLS_ANATOOLHANDLE_ICC
+
 #include <AsgTools/MessageCheck.h>
 #include <assert.h>
 #include <cstdlib>
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
 #include "GaudiKernel/IJobOptionsSvc.h"
 #endif
 
@@ -11,7 +18,7 @@ namespace asg
 {
   namespace detail
   {
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     StatusCode makeToolRootCore (const std::string& type,
 				 const std::string& name,
 				 AsgTool*& tool);
@@ -37,7 +44,7 @@ namespace asg
     {
       using namespace msgUserCode;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       to = ToolHandle<T1> (dynamic_cast<T1*>(&*from));
       if (!from.empty() && &*to == nullptr)
       {
@@ -166,7 +173,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     /// \brief manage a single property in the job options service
 
     struct PropertyValueManager
@@ -218,7 +225,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     /// \brief a \ref AnaToolProperty containing a regular value in
     /// RootCore
 
@@ -261,7 +268,7 @@ namespace asg
 	: m_config (val_config)
       {}
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     public:
       virtual StatusCode
       applyPropertyRootCore (AsgTool& tool, const std::string& name,
@@ -278,7 +285,7 @@ namespace asg
       }
 #endif
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     private:
       virtual StatusCode
       applyPropertyAthena (const std::string& toolName,
@@ -310,7 +317,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     /// \brief a \ref AnaToolProperty copying a tool configuration
     /// from the job options service to a new place
 
@@ -353,7 +360,7 @@ namespace asg
 	: m_name (val_name), m_config (val_config)
       {}
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     public:
       virtual StatusCode
       applyPropertyRootCore (AsgTool& tool, const std::string& name,
@@ -372,7 +379,7 @@ namespace asg
       }
 #endif
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     private:
       virtual StatusCode
       applyPropertyAthena (const std::string& toolName,
@@ -412,7 +419,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     template<typename Type> void AnaToolConfig ::
     registerNew ()
     {
@@ -423,7 +430,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     template<typename Type> StatusCode AnaToolConfig ::
     setProperty (const std::string& val_name, const Type& val_value)
     {
@@ -484,7 +491,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     template<typename Type> StatusCode AnaToolConfig ::
     setProperty (const std::string& val_name,
 		 const ToolHandle<Type>& val_value)
@@ -551,7 +558,7 @@ namespace asg
       ANA_CHECK (makeBaseTool (name, parent, baseTH, baseCleanup));
       ANA_CHECK (toolHandleCast (th, baseTH));
       cleanup.swap (baseCleanup);
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       baseTH->release ();
 #endif
       return StatusCode::SUCCESS;
@@ -577,10 +584,6 @@ namespace asg
     // General requirements
     CHECK_INVARIANT (&*this != nullptr);
     CHECK_INVARIANT (m_handleUser != nullptr);
-    // CHECK_INVARIANT (m_parentPtr == nullptr || m_parentPtr->name() == m_parentName);
-    // #ifndef ROOTCORE
-    // CHECK_INVARIANT (m_parentPtr == m_handleUser->parent());
-    // #endif
 
 #undef CHECK_INVARIANT
   }
@@ -589,8 +592,7 @@ namespace asg
 
   template<class T> AnaToolHandle<T> ::
   AnaToolHandle (const std::string& val_name, parentType_t *val_parent)
-    : m_parentName (val_parent ? val_parent->name() : std::string()),
-      m_parentPtr (val_parent),
+    : m_parentPtr (val_parent),
       m_handleUser (new ToolHandle<T> (val_name, val_parent)),
       m_allowEmpty (val_name.empty())
   {
@@ -616,7 +618,6 @@ namespace asg
   AnaToolHandle (const AnaToolHandle<T>& that)
     : m_config (that.m_config),
       m_name (that.m_name),
-      m_parentName (that.m_parentName),
       m_parentPtr (that.m_parentPtr),
       m_handleUser (new ToolHandle<T> (*that.m_handleUser)),
       m_originalTypeAndName (that.m_originalTypeAndName),
@@ -630,7 +631,7 @@ namespace asg
       m_cleanup = that.m_cleanup;
     }
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     if (!m_handleUser->empty())
       (*m_handleUser)->release();
 #endif
@@ -664,11 +665,10 @@ namespace asg
     m_cleanup.swap (that.m_cleanup);
     m_config.swap (that.m_config);
     m_name.swap (that.m_name);
-    m_parentName.swap (that.m_parentName);
     std::swap (m_parentPtr, that.m_parentPtr);
     {
       ToolHandle<T> tmp = *m_handleUser;
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       if (!tmp.empty())
         tmp->release();
 #endif
@@ -742,7 +742,7 @@ namespace asg
 #ifndef NDEBUG
      this->testInvariant ();
 #endif
-     return m_parentName.empty();
+     return m_parentPtr == nullptr;
   }
 
 
@@ -827,7 +827,7 @@ namespace asg
     case detail::AnaToolHandleMode::RETRIEVE_SHARED:
       assert (sharedTool != nullptr);
       ANA_CHECK (detail::toolHandleCast (th, sharedTool->th()));
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       if (!th.empty())
         th->release ();
 #endif
@@ -847,7 +847,7 @@ namespace asg
     ANA_CHECK (makeToolRetrieve (toolPtr, th));
 
     *m_handleUser = th;
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     if (!th.empty())
       th->release ();
 #endif
@@ -1024,7 +1024,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   template <class T> template <class T2> void AnaToolHandle<T> ::
   setTypeRegisterNew (std::string val_type)
   {
@@ -1068,14 +1068,14 @@ namespace asg
 #ifndef NDEBUG
     this->testInvariant ();
 #endif
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     return m_handleUser->parentName() + "." + name();
 #else
     std::string toolName;
-    if (!isPublic())
-      toolName = m_parentName + "." + name();
+    if (m_parentPtr)
+      toolName = m_parentPtr->name() + "." + name();
     else
-      toolName = name();
+      toolName = "ToolSvc." + name();
     return toolName;
 #endif
   }
@@ -1099,10 +1099,10 @@ namespace asg
         m_handleUser->typeAndName() != m_originalTypeAndName)
       return detail::AnaToolHandleMode::USER;
 
-#ifdef ROOTCORE
-    if (!m_parentName.empty())
+#ifdef XAOD_STANDALONE
+    if (m_parentPtr != nullptr)
     {
-      if (m_handleUser->parentName() != m_parentName)
+      if (m_handleUser->parentName() != m_parentPtr->name())
 	return detail::AnaToolHandleMode::USER;
     } else
     {
@@ -1114,16 +1114,16 @@ namespace asg
     if (isPublic())
     {
       if ((sharedTool = detail::AnaToolShareList::singleton()
-	     .getShare (fullName())))
+             .getShare (name())))
 	return detail::AnaToolHandleMode::RETRIEVE_SHARED;
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \todo check whether this is actually what we want to do
       if (ToolStore::contains<T> (m_handleUser->name()))
 	return detail::AnaToolHandleMode::USER;
 #endif
     }
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     //for athena, all we do here is check if the tool already exists
     interfaceType_t *tool = nullptr;
     if( detail::toolExists( fullName(), tool ) )
@@ -1349,3 +1349,5 @@ namespace asg
     m_allowEmpty = val_allowEmpty;
   }
 }
+
+#endif // ASGTOOLS_ANATOOLHANDLE_ICC

Control/AthToolSupport/AsgTools/AsgTools/AsgTool.h

@@ -7,6 +7,7 @@
 #include "AsgTools/AsgToolsConf.h"
 #include "AsgTools/IAsgTool.h"
 #include "AsgTools/MsgLevel.h"
+#include "AsgTools/MessageCheck.h"
 
 // Environment specific include(s):
 #ifdef ASGTOOL_STANDALONE

Control/AthToolSupport/AsgTools/AsgTools/AsgToolsStandAloneDict.h

+// Dear emacs, this is -*- c++ -*-
+// $Id: AsgToolsStandAloneDict.h  $
+#ifndef ASGTOOLS_ASGTOOLSSTANDALONEDICT_H
+#define ASGTOOLS_ASGTOOLSSTANDALONEDICT_H
+
+#ifdef __GNUC__
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+// In athena, we get this from GAUDI
+#include "AsgTools/StatusCode.h"
+
+#endif // not ASGTOOLS_ASGTOOLSSTANDALONEDICT_H

Control/AthToolSupport/AsgTools/AsgTools/Deprecated.h

-#ifndef ASG_TOOLS__DEPRECATED_H
-#define ASG_TOOLS__DEPRECATED_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__DEPRECATED_H
+#define ASG_TOOLS__DEPRECATED_H
 
 #if __cplusplus < 201402L
 #define ASG_DEPRECATED(X)			\

Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h

-#ifndef ASG_TOOLS__I_MESSAGE_PRINTER_H
-#define ASG_TOOLS__I_MESSAGE_PRINTER_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__I_MESSAGE_PRINTER_H
+#define ASG_TOOLS__I_MESSAGE_PRINTER_H
 
 #include <AsgTools/MsgLevel.h>
 #include <sstream>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 namespace asg
 {

Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h

-#ifndef ASG_TOOLS__I_NAMED_INTERFACE_H
-#define ASG_TOOLS__I_NAMED_INTERFACE_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__I_NAMED_INTERFACE_H
+#define ASG_TOOLS__I_NAMED_INTERFACE_H
 
 #ifndef XAOD_STANDALONE
 

Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h

-#ifndef ASG_TOOLS__MESSAGE_CHECK_H
-#define ASG_TOOLS__MESSAGE_CHECK_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__MESSAGE_CHECK_H
+#define ASG_TOOLS__MESSAGE_CHECK_H
 
 /// \file MessageCheck.h
 /// \brief macros for messaging and checking status codes
@@ -79,7 +77,7 @@
 #include <type_traits>
 
 #include <xAODRootAccess/tools/TReturnCode.h>
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <AsgTools/MsgStream.h>
 #else
 #include "AthenaBaseComps/AthMessaging.h"
@@ -118,7 +116,7 @@
   void setMsgLevel (MSG::Level level); }
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #define ASG_TOOLS_MSG_STREAM(NAME,TITLE)	\
   static MsgStream NAME (TITLE);
 #else
@@ -254,7 +252,7 @@ namespace asg
 
   namespace detail
   {
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     /// Get the Athena message service
     /// TODO: Look into using AthenaKernel/MsgStreamMember.h
     IMessageSvc* getMessageSvcAthena();

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h

-#ifndef ASG_TOOLS__MESSAGE_PRINTER_H
-#define ASG_TOOLS__MESSAGE_PRINTER_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__MESSAGE_PRINTER_H
+#define ASG_TOOLS__MESSAGE_PRINTER_H
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 #include <AsgTools/IMessagePrinter.h>
 

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h

-#ifndef ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
-#define ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
+#define ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 #include <AsgTools/IMessagePrinter.h>
 #include <vector>

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h

-#ifndef ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
-#define ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
+#define ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
 
 #include <AsgTools/IMessagePrinter.h>
 #include <gmock/gmock.h>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 namespace asg
 {

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h

-#ifndef ASG_TOOLS__MESSAGE_PRINTER_OVERLAY_H
-#define ASG_TOOLS__MESSAGE_PRINTER_OVERLAY_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef ASG_TOOLS__MESSAGE_PRINTER_OVERLAY_H
+#define ASG_TOOLS__MESSAGE_PRINTER_OVERLAY_H
 
 namespace asg
 {

Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h

@@ -76,8 +76,10 @@ public:
 
    /// Get the current minimum output level of the stream
    MSG::Level level() const;
-   /// Get the current minimum output level of the stream
-   MSG::Level& mutable_level();
+
+   /// declare the message level as property on the parent
+   template<typename T> void
+   declarePropertyFor (T& parent);
 
    /// Retrieve current stream output level
    MSG::Level currentLevel() const;
@@ -94,8 +96,9 @@ private:
    const asg::IAsgTool* m_tool;
    /// Message source name
    std::string m_name;
-   /// Minimum level for the printed messages
-   MSG::Level m_lvl;
+   /// Minimum level for the printed messages (this is an integer, so
+   /// it can serve as a property)
+   int m_lvl;
    /// The level of the message currently being assembled
    MSG::Level m_reqlvl;
 
@@ -105,6 +108,12 @@ private:
 inline MsgStream& endmsg( MsgStream& s ) {
    return s.doOutput();
 }
+
+template<typename T> void MsgStream ::
+declarePropertyFor (T& parent)
+{
+  parent.declareProperty ("OutputLevel", m_lvl, "output message level");
+}
 /// Backwards compatibility definition
 #define endreq endmsg
 

Control/AthToolSupport/AsgTools/AsgTools/Property.h

@@ -76,6 +76,20 @@ public:
   ///   no string conversion available
   virtual StatusCode getString (std::string& result) const;
 
+  /// \brief get the property as a string I can pas to \ref setString
+  ///
+  /// the main difference to \ref getString is that this will *not*
+  /// quote strings, i.e. it will assume strings are already properly
+  /// quoted if they need to be and won't be otherwise.  otherwise
+  /// there will be an issue when setting non-strings from strings
+  /// the user provided
+  ///
+  /// \par Guarantee
+  ///   strong
+  /// \par Failures
+  ///   no string conversion available
+  virtual StatusCode getCastString (std::string& result) const;
+
   /// \brief set the property from a string
   /// \par Guarantee
   ///   basic