remove AsgToolsConf.h, update users to use XAOD_STANDALONE instead

There are multiple ways to check for whether we are in AnalysisBase,
so this was slated for being phased out.  Given that not everybody was
actually including this header that used the macros I just phased them
out now.

Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx

@@ -44,7 +44,7 @@ namespace asg
 
   TEST (ToolHandleTest, nonempty_tool)
   {
-#ifndef ASGTOOL_ATHENA
+#ifdef XAOD_STANDALONE
     // This never worked properly in Athena --- in that case the ToolHandle
     // ctor matches the signature:
     // ToolHandle( const IInterface* parent = nullptr, bool createIf = true )

Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h

@@ -12,7 +12,6 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/AsgMessaging.h>
-#include <AsgTools/AsgToolsConf.h>
 #include <AsgTools/IAsgTool.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/AsgMessagingForward.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/AsgMetadataTool.h

@@ -109,7 +109,7 @@ namespace asg {
       /// @}
 
    private:
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
       /// Object accessing the input metadata store
       mutable MetaStore_t m_inputMetaStore;
       /// Object accessing the output metadata store

Control/AthToolSupport/AsgTools/AsgTools/AsgToolsConf.h

-/*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FILE_AsgTools_AsgToolsConf_h
-#define FILE_AsgTools_AsgToolsConf_h
-
-// this file is likely used in a variety of places, so this warning is
-// disabled in 21.2.  once this gets swept to master it may be a good
-// idea to include this warning and remove all the users.
-
-// #warning "use of this file is deprecated, please rely on XAOD_STANDALONE and XAOD_ANALYSIS macros instead"
-
-// Configuration file for the ASG tool environment.
-
-// Flags:
-//   ASGTOOL_STANDALONE - Flag indicating that the base standalone ASG tool
-//     environment is to be provided.
-//   ASGTOOL_ATHENA - Flag indicating that the Athena ASG tool environment
-//     is to be provided.
-//   ASGTOOL_TEVENT - Flag indicating that TEvent is available in standalone.
-//     If this is not set, calls to the event store will fail. This flag is
-//     se unless the user sets ASGTOOL_NOTEVENT.
-
-#if !defined(ASGTOOL_STANDALONE) && !defined(ASGTOOL_ATHENA)
-#ifdef XAOD_STANDALONE
-#define ASGTOOL_STANDALONE
-#ifndef ASGTOOL_NOTEVENT
-#define ASGTOOL_TEVENT
-#endif
-#else
-#define ASGTOOL_ATHENA
-#endif
-#endif
-
-#if defined(ASGTOOL_STANDALONE) && defined(ASGTOOL_ATHENA)
-#error "Only one of ASGTOOL_STANDALONE and  ASGTOOL_ATHENA may be defined."
-#endif
-
-#endif

Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h

@@ -11,8 +11,6 @@
 // Note that the clid command can be used to generate the class ID:
 //   clid -m MyClassName
 
-#include "AsgTools/AsgToolsConf.h"
-
 // Set this flag to show calls to CLASS_DEF in stanadlone environments.
 //#define CLASSDEF_SHOWDEFS
 #ifndef XAOD_STANDALONE

Control/AthToolSupport/AsgTools/AsgTools/Check.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/Check.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/IMessagePrinter.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/INamedInterface.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h

@@ -12,7 +12,6 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MessageCheck.h>
-#include <AsgTools/AsgToolsConf.h>
 #include <xAODRootAccess/tools/TReturnCode.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MessagePrinter.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MessagePrinterErrorCollect.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MessagePrinterMock.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MessagePrinterOverlay.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MsgLevel.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MsgLevel.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MsgStream.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/MsgStreamMacros.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/MsgStreamMacros.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h

@@ -12,6 +12,5 @@
 // #warning "use of this file is deprecated, please include the header from AsgMessaging instead"
 
 #include <AsgMessaging/StatusCode.h>
-#include <AsgTools/AsgToolsConf.h>
 
 #endif

Control/AthToolSupport/AsgTools/AsgTools/ToolHandle.h

@@ -6,8 +6,6 @@
 #define ASGTOOLS_TOOLHANDLE_H
 
 // Local include(s):
-#include "AsgTools/AsgToolsConf.h"
-
 #ifndef XAOD_STANDALONE
 #   include "GaudiKernel/ToolHandle.h"
 #else // not XAOD_STANDALONE

Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h

@@ -6,8 +6,6 @@
 #define ASGTOOLS_TOOLHANDLEARRAY_H
 
 // Local include(s):
-#include "AsgTools/AsgToolsConf.h"
-
 #ifndef XAOD_STANDALONE
 #   include "GaudiKernel/ToolHandle.h"
 #else // not XAOD_STANDALONE