diff --git a/Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx b/Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx
index de09de397ef94af1d49fe30ae4866e9f79d0bf37..974e4643df0492a67bbc1cefacec5a25184f5a26 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/gt_ToolHandle_test.cxx
+++ b/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 )
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h
index aa74184e485d195537b94a9b80fe43e67dffa4b5..cf6f1a5d6708d9dfbe43151ddec9edabbcc6db04 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessaging.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h
index 6f9ae447dacd81ffc30dfd9a60e91480769339f5..9cbd12a981e13aa5bdcc85f486ce499462bd0c95 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgMessagingForward.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgMetadataTool.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgMetadataTool.h
index 228da338bbac3db3d3816a752a2d2214ba6c63fd..2527f425b53b833d9fc3fc387418c1d1df688c8a 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgMetadataTool.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgToolsConf.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgToolsConf.h
deleted file mode 100644
index 67115aedf86bbd0cadc05e6c6165953de0dccd68..0000000000000000000000000000000000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgToolsConf.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- 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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h b/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
index 58d67fc9efdb0744f6dece5b481ff4a35f760aa7..27f312d25c86cda082214214fc7c6a65f4442d37 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/Check.h b/Control/AthToolSupport/AsgTools/AsgTools/Check.h
index 6de7adbb194867603513d332f247ee19dc45b96c..913c7989d24bc2af2217bc08efdfbf4272ed825b 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/Check.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
index d3b403d23d08871d1de92725291da86d8f485f11..3c56d65513b87389c0c7a7a162d3c8ecc549b8eb 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h b/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h
index cf02c239879539b6b0d8e60658ca8ed4950edbec..bd805ef4596245a283aad8d7c7d7ffe8086afd6e 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/INamedInterface.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h b/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
index e8011c0e70783bae5195a1af6c1023071c5e1ba7..19a922a4f9e1603295580b30aaace89705b97dfd 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
index d9ebaa14989449ea927e5460f519365d0c7fe970..00cbf476f57408f54c6dc4223adfe3789aee2a69 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
index 2dff17bb63d1b49ae5e0bb4080fdea5f56b00c63..9638bb07b73ab4549fcd76d388cbfbbac5538d3b 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
index fd3924a4b2da8b2a6411e6fb238b450dabf3008c..741d5d1d83977085e8c387451f9aa1a8ab1475f6 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h
index 17263d8e52d4d05a4332edfd395cf650fcc308c6..fe0c3a2c0472731ecf350d9d976ff80b5ea7842a 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterOverlay.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MsgLevel.h b/Control/AthToolSupport/AsgTools/AsgTools/MsgLevel.h
index f3c1c5be54c64c23119e4484c6f764a31f002005..0f562ecc75b7aacc72daf47033d589fcd63ebc8b 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MsgLevel.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h b/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h
index 9b8c5fa7e5866cf75703fdf5aa860ca9b76e4773..b71648c3cae61ea6a3977a3b0ae72916fdc4083b 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MsgStream.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MsgStreamMacros.h b/Control/AthToolSupport/AsgTools/AsgTools/MsgStreamMacros.h
index 2ac3e4c1e042826ae6316fe51818c08a070753c8..13c88e282d8142097a43ab3a495d67878a1e9f6b 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MsgStreamMacros.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h b/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h
index dee72bc83ec02b565ffc22febdc7418a5ba1b1b6..677f7145e82295ed54c8a1fd88eb49c17e415f38 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/StatusCode.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandle.h b/Control/AthToolSupport/AsgTools/AsgTools/ToolHandle.h
index 2dd1ca9193371e2c74cf78e58de95c574e745b52..df8abf5522b8e03142fa3ac319462348bfba9cde 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandle.h
+++ b/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
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h b/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h
index d07f041aac4a408041a788202a6c1de7bbca62ed..757ede700b1c9be647e5e9569e35c82eb724417f 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h
+++ b/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
diff --git a/Event/EventBookkeeperTools/src/BookkeeperDumperTool.cxx b/Event/EventBookkeeperTools/src/BookkeeperDumperTool.cxx
index b21ba71dd3fe7217d17c459cb57f9a6b25a50c57..275c08d087fe7e824200462cc37252069e614f9c 100755
--- a/Event/EventBookkeeperTools/src/BookkeeperDumperTool.cxx
+++ b/Event/EventBookkeeperTools/src/BookkeeperDumperTool.cxx
@@ -16,9 +16,9 @@
BookkeeperDumperTool::BookkeeperDumperTool(const std::string &name)
: asg::AsgMetadataTool(name)
{
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
declareInterface< ::IMetaDataTool >( this );
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
}
diff --git a/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx b/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx
index 6824f05116194cd516ff21462959bc09663b8ef3..9671c9e90b300978033497fc6c171c24a289896a 100644
--- a/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx
+++ b/Event/xAOD/xAODMetaDataCnv/Root/FileMetaDataTool.cxx
@@ -16,9 +16,9 @@ namespace xAODMaker {
declareProperty( "InputKey", m_inputKey = "FileMetaData" );
declareProperty( "OutputKey", m_outputKey = "FileMetaData" );
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
declareInterface< ::IMetaDataTool >( this );
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
}
StatusCode FileMetaDataTool::initialize() {
diff --git a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h
index cf49a28caa2240a72af39febd57fdb3700859df6..01e15dc64ab5e12983e468ab6f2e5c814068f051 100644
--- a/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h
+++ b/Event/xAOD/xAODMetaDataCnv/xAODMetaDataCnv/FileMetaDataTool.h
@@ -14,9 +14,9 @@
// Infrastructure include(s):
#include "AsgTools/AsgMetadataTool.h"
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
# include "AthenaKernel/IMetaDataTool.h"
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
// EDM include(s):
#include "xAODMetaData/FileMetaData.h"
@@ -39,9 +39,9 @@ namespace xAODMaker {
/// $Date: 2015-07-17 11:12:14 +0200 (Fri, 17 Jul 2015) $
///
class FileMetaDataTool : public asg::AsgMetadataTool
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
, public virtual ::IMetaDataTool
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
{
/// Declare the correct constructor for Athena
diff --git a/Event/xAOD/xAODTriggerCnv/Root/TriggerMenuMetaDataTool.cxx b/Event/xAOD/xAODTriggerCnv/Root/TriggerMenuMetaDataTool.cxx
index a739c468eeadb4fa25c272cf33bb6e56a8f62938..3f7e60de775f655c73bedce6bbd3c4f55211e13e 100644
--- a/Event/xAOD/xAODTriggerCnv/Root/TriggerMenuMetaDataTool.cxx
+++ b/Event/xAOD/xAODTriggerCnv/Root/TriggerMenuMetaDataTool.cxx
@@ -19,9 +19,9 @@ namespace xAODMaker {
declareProperty( "InputKey", m_inputKey = "TriggerMenu" );
declareProperty( "OutputKey", m_outputKey = "TriggerMenu" );
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
declareInterface< ::IMetaDataTool >( this );
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
}
StatusCode TriggerMenuMetaDataTool::initialize() {
diff --git a/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/TriggerMenuMetaDataTool.h b/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/TriggerMenuMetaDataTool.h
index 5f2d243e449bbc10dfe2d93f3cf52b98d511581d..948e1369e8f422f36e806784c5ec09cc07e604e9 100644
--- a/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/TriggerMenuMetaDataTool.h
+++ b/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/TriggerMenuMetaDataTool.h
@@ -14,9 +14,9 @@
// Gaudi/Athena include(s):
#include "AsgTools/AsgMetadataTool.h"
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
# include "AthenaKernel/IMetaDataTool.h"
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
// EDM include(s):
#include "xAODTrigger/TriggerMenuContainer.h"
@@ -35,9 +35,9 @@ namespace xAODMaker {
/// $Date: 2015-07-16 13:11:56 +0200 (Thu, 16 Jul 2015) $
///
class TriggerMenuMetaDataTool : public asg::AsgMetadataTool
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
, public virtual ::IMetaDataTool
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
{
/// Declare the correct constructor for Athena
diff --git a/Event/xAOD/xAODTruthCnv/Root/TruthMetaDataTool.cxx b/Event/xAOD/xAODTruthCnv/Root/TruthMetaDataTool.cxx
index 8962b38d1d72d4b9df116d689654d45c9b30156f..a486e9c9a253daf42ea92703d081fb65b6ec5bed 100644
--- a/Event/xAOD/xAODTruthCnv/Root/TruthMetaDataTool.cxx
+++ b/Event/xAOD/xAODTruthCnv/Root/TruthMetaDataTool.cxx
@@ -17,9 +17,9 @@ namespace xAODMaker {
declareProperty( "InputKey", m_inputKey = "TruthMetaData" );
declareProperty( "OutputKey", m_outputKey = "TruthMetaData" );
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
declareInterface< ::IMetaDataTool >( this );
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
}
StatusCode TruthMetaDataTool::initialize() {
diff --git a/Event/xAOD/xAODTruthCnv/xAODTruthCnv/TruthMetaDataTool.h b/Event/xAOD/xAODTruthCnv/xAODTruthCnv/TruthMetaDataTool.h
index c54351c59f38e70b190d963dd4613cd520f913d4..fa5b518c34813a48e437d6156476023f2fe16778 100644
--- a/Event/xAOD/xAODTruthCnv/xAODTruthCnv/TruthMetaDataTool.h
+++ b/Event/xAOD/xAODTruthCnv/xAODTruthCnv/TruthMetaDataTool.h
@@ -12,9 +12,9 @@
// Gaudi/Athena include(s):
#include "AsgTools/AsgMetadataTool.h"
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
# include "AthenaKernel/IMetaDataTool.h"
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
// EDM include(s):
#include "xAODTruth/TruthMetaDataContainer.h"
@@ -28,9 +28,9 @@ namespace xAODMaker {
/// make sure that the truth metadata ends up in the output.
///
class TruthMetaDataTool : public asg::AsgMetadataTool
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
, public virtual ::IMetaDataTool
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
{
/// Declare the correct constructor for Athena
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx
index 0381b5e084a7c36463770c7570f6229bf7f59548..0d0ac9f913ea040db727f7b2d28e282db8b8fd47 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/Root/ToolBox.cxx
@@ -34,7 +34,7 @@ namespace ORUtils
StatusCode ToolBox::initialize()
{
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
// For now, in Athena, things only work with private tools.
// See ATLASG-957 for more details.
if(!m_parent) {
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
index 02a10e17b3af6ab4d96f5d02637e0bbaff5ec905..0022cd08130e7249eda5e119a8e775d1a4da8da1 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/EgEfficiencyCorr_mem_check.cxx
@@ -18,10 +18,10 @@ http://valgrind.org/docs/manual/faq.html#faq.deflost
#include "EgammaAnalysisInterfaces/IAsgElectronEfficiencyCorrectionTool.h"
#include "AsgTools/AsgMessaging.h"
#include "AsgTools/AnaToolHandle.h"
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
// xAOD include(s):
# include "xAODRootAccess/TEvent.h"
-#endif // ASGTOOL_STANDALONE
+#endif // XAOD_STANDALONE
#include "CxxUtils/ubsan_suppress.h"
#include "TInterpreter.h"
@@ -31,7 +31,7 @@ int main( ) {
// Suppress known ubsan warning we get from cling.
CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); });
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
xAOD::TEvent event;
#endif
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/PhotonVertexSelection/PhotonVertexSelectionDict.h b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/PhotonVertexSelection/PhotonVertexSelectionDict.h
index bdbafa4d4a8d21fbdf164de08310b4c5fe1b5eb7..4bc8a39319fd5beec3b03235f5ea68d90affcbed 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/PhotonVertexSelection/PhotonVertexSelectionDict.h
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/PhotonVertexSelection/PhotonVertexSelectionDict.h
@@ -23,7 +23,7 @@ namespace {
};
}
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
// Helper macro for declaring the setProperty functions to the dictionary:
#define SETPROPERTY_INSTAN( TYPE ) \
@@ -36,7 +36,7 @@ SETPROPERTY_INSTAN( ToolHandle<CP::IPhotonPointingTool > );
// Make the compiler forget about this macro now...
#undef SETPROPERTY_INSTAN
-#endif // ASGTOOL_STANDALONE
+#endif // XAOD_STANDALONE
#endif // PhotonVertexSelection_PhotonVertexSelectionDict_H
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/MuonResonanceTools/MuonResonanceSelectionTool.h b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/MuonResonanceTools/MuonResonanceSelectionTool.h
index 940c1bcccf5fbe0b58227e23f1a231b70ad832e5..eebe92010c7511876044ccbe424d8a5206ce37c6 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/MuonResonanceTools/MuonResonanceSelectionTool.h
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/MuonResonanceTools/MuonResonanceSelectionTool.h
@@ -12,7 +12,6 @@
#define MuonResonanceSelectionTool_H
#include "AsgTools/AsgTool.h"
-#include "AsgTools/AsgToolsConf.h"
#include "AsgTools/AsgMetadataTool.h"
#include "MuonResonanceTools/IMuonResonanceSelectionTool.h"
#ifndef ROOTCORE
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h
index 147aa1d7753645333e36faa4537fdc11a912597f..c4616dc8eee90913739ab0d7cae28521c8540734 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/IRedirectMsgStream.h
@@ -13,7 +13,7 @@
# include "AsgTools/MsgStream.h"
# include "AsgTools/MsgStreamMacros.h"
# include "xAODCaloRings/tools/PrintHelperFcns.h"
-//#pragma message "ASGTOOL or ASGTOOL_STANDALONE"
+//#pragma message "ASGTOOL or XAOD_STANDALONE"
#else
# include <iostream>
typedef std::ostream MsgStream;
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/Root/HIJetSubtractorToolBase.cxx b/Reconstruction/HeavyIonRec/HIJetRec/Root/HIJetSubtractorToolBase.cxx
index 939b8f8443e478dc985affe78fce0bcadd43411a..d21e6d3b4b2b18e89decb39f24ea8b842ffde631 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/Root/HIJetSubtractorToolBase.cxx
+++ b/Reconstruction/HeavyIonRec/HIJetRec/Root/HIJetSubtractorToolBase.cxx
@@ -9,7 +9,7 @@
HIJetSubtractorToolBase::HIJetSubtractorToolBase(const std::string& myname) : asg::AsgTool(myname),
m_useCells(true)
{
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
//should not need this due to ASG_TOOL_CLASS macro since
//athena only calls 3 arg constructor which explicitly declares athena interface?
declareInterface<IHISubtractorTool>(this);
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/Root/HIUEModulatorTool.cxx b/Reconstruction/HeavyIonRec/HIJetRec/Root/HIUEModulatorTool.cxx
index cf1b8f9e031b969b8f3d5b9afe3bf65e93ebc3eb..30a750e7578a20df10dbc0b94579e7294fe8de61 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/Root/HIUEModulatorTool.cxx
+++ b/Reconstruction/HeavyIonRec/HIJetRec/Root/HIUEModulatorTool.cxx
@@ -9,7 +9,7 @@
HIUEModulatorTool::HIUEModulatorTool(const std::string& n) : asg::AsgTool(n),
m_shape(nullptr)
{
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
//should not need this due to ASG_TOOL_CLASS macro since
//athena only calls 3 arg constructor which explicitly declares athena interface?
declareInterface<IHIUEModulatorTool>(this);
diff --git a/Reconstruction/Jet/JetMomentTools/Root/JetConstitFourMomTool.cxx b/Reconstruction/Jet/JetMomentTools/Root/JetConstitFourMomTool.cxx
index 55b8784d53232f0e896fde7bf17a7d9d461df919..145bf52d03541b5888f326b04fb2304e225e98d6 100644
--- a/Reconstruction/Jet/JetMomentTools/Root/JetConstitFourMomTool.cxx
+++ b/Reconstruction/Jet/JetMomentTools/Root/JetConstitFourMomTool.cxx
@@ -21,7 +21,7 @@ JetConstitFourMomTool::JetConstitFourMomTool(std::string myname)
m_altColls_keys {} // calls default constructor
{
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
declareInterface<IJetModifier>(this);
#endif
// What cluster signal state to use for the jet constituents
diff --git a/Reconstruction/Jet/JetRec/JetRec/FastJetInterfaceTool.h b/Reconstruction/Jet/JetRec/JetRec/FastJetInterfaceTool.h
index 45d5b85316a19b28818a7c77f49841e75ca28cf2..6152d8b3a664b5d9f176d06e98608999a6b92728 100644
--- a/Reconstruction/Jet/JetRec/JetRec/FastJetInterfaceTool.h
+++ b/Reconstruction/Jet/JetRec/JetRec/FastJetInterfaceTool.h
@@ -22,7 +22,7 @@
#include <vector>
#include <stdint.h>
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
// support contribs only in athena for now
#include "fastjet/SISConePlugin.hh"
#include "fastjet/CMSIterativeConePlugin.hh"
@@ -39,7 +39,7 @@ namespace FastJetInterface
/*! @brief Mapping keyword on @c fastjet recombination scheme tag */
typedef std::map<std::string,fastjet::RecombinationScheme> schememap_t;
/*! @brief Mapping keyword on @c fastjet SIS Cone split merge scale tag */
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
typedef std::map<std::string,fastjet::SISConePlugin::SplitMergeScale> splitMergeScaleMap_t;
#else
typedef std::map<std::string,int> splitMergeScaleMap_t;
@@ -311,7 +311,7 @@ protected:
* @param[in] key client provided keyword
* @param[out] fjsms @c fastjet tag
*/
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
bool checkConfig(const std::string& key,fastjet::SISConePlugin::SplitMergeScale& fjsms);
#endif
/*! @brief Check configuration keyword for jet area type
@@ -353,7 +353,7 @@ protected:
*
* @param[in] fjsms @c fastjet SIS Cone split merge scale tag
*/
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
const std::string& configName(fastjet::SISConePlugin::SplitMergeScale fjsms);
#endif
@@ -401,7 +401,7 @@ protected:
/*! @brief @c fastjet tag: recombination scheme */
fastjet::RecombinationScheme m_recombinationScheme;
/*! @brief @c fastjet tag: SIS split merge scale */
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
fastjet::SISConePlugin::SplitMergeScale m_SIS_splitMergeScale;
#endif
/*! @brief Pointer to jet definition */
diff --git a/Reconstruction/Jet/JetRec/Root/FastJetInterfaceTool.cxx b/Reconstruction/Jet/JetRec/Root/FastJetInterfaceTool.cxx
index 50eea1d125daf13460e6847ea12b7f72dce2588e..586bbe2f6993b98ce6727c0d2f384a49cbd19520 100644
--- a/Reconstruction/Jet/JetRec/Root/FastJetInterfaceTool.cxx
+++ b/Reconstruction/Jet/JetRec/Root/FastJetInterfaceTool.cxx
@@ -108,7 +108,7 @@ const splitMergeScaleMap_t& FastJetInterfaceTool::getKnownSplitMergeScales()
{
if ( s_knownSplitMergeScales.empty() )
{
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
s_knownSplitMergeScales["default"] = fastjet::SISConePlugin::SM_pttilde;
s_knownSplitMergeScales["pttilde"] = fastjet::SISConePlugin::SM_pttilde;
s_knownSplitMergeScales["PtTilde"] = fastjet::SISConePlugin::SM_pttilde;
@@ -226,7 +226,7 @@ FastJetInterfaceTool::FastJetInterfaceTool(const std::string& n)
m_strategy = fastjet::Best;
m_areaType = fastjet::voronoi_area;
m_recombinationScheme = fastjet::E_scheme;
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
m_SIS_splitMergeScale = fastjet::SISConePlugin::SM_pttilde;
#endif
@@ -297,7 +297,7 @@ StatusCode FastJetInterfaceTool::initialize()
return StatusCode::FAILURE;
}
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
// define jets depending on the jet type
if (jetAlgType == CMS_type)
@@ -491,7 +491,7 @@ bool FastJetInterfaceTool::checkConfig(const std::string& key,
return chkConfig(key,fjrs,map);
}
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
bool FastJetInterfaceTool::checkConfig(const std::string& key,
fastjet::SISConePlugin::SplitMergeScale& fjsms)
{
@@ -526,7 +526,7 @@ FastJetInterfaceTool::configName(fastjet::RecombinationScheme fjrs)
return cfgName(fjrs,map,m_invalidKeyReference);
}
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
const std::string&
FastJetInterfaceTool::configName(fastjet::SISConePlugin::SplitMergeScale fjsms)
{
diff --git a/Reconstruction/Jet/JetRec/Root/JetModifierBase.cxx b/Reconstruction/Jet/JetRec/Root/JetModifierBase.cxx
index e79cc5c1242d2613bb60fab9f12bd9619b3a7905..eff93e485a3f3550f1b3e309fe71da56899dec22 100644
--- a/Reconstruction/Jet/JetRec/Root/JetModifierBase.cxx
+++ b/Reconstruction/Jet/JetRec/Root/JetModifierBase.cxx
@@ -8,7 +8,7 @@
JetModifierBase::JetModifierBase(const std::string& myname)
: asg::AsgTool(myname) {
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
// Should we do this here or let the subclasses add this?
declareInterface<IJetModifier>(this);
#endif
diff --git a/Reconstruction/Jet/JetRecTools/Root/JetConstituentModifierBase.cxx b/Reconstruction/Jet/JetRecTools/Root/JetConstituentModifierBase.cxx
index 40c2cb20715275c362448c5ad54de336ec6b4f3b..b87018b865b8e94aab56830ee5a74ff20d441b5e 100644
--- a/Reconstruction/Jet/JetRecTools/Root/JetConstituentModifierBase.cxx
+++ b/Reconstruction/Jet/JetRecTools/Root/JetConstituentModifierBase.cxx
@@ -11,7 +11,7 @@
#include "xAODPFlow/TrackCaloCluster.h"
JetConstituentModifierBase::JetConstituentModifierBase(const std::string & name): asg::AsgTool(name) {
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
declareInterface<IJetConstituentModifier>(this);
#endif
declareProperty("InputType", m_inputType);
diff --git a/Reconstruction/Jet/JetResolution/Root/JERTool.cxx b/Reconstruction/Jet/JetResolution/Root/JERTool.cxx
index 563a2c80fe7b26189a8802ddfb0e1ca778688b91..f025c49cdaa8a8707f188199fdcbe7182ed61a80 100644
--- a/Reconstruction/Jet/JetResolution/Root/JERTool.cxx
+++ b/Reconstruction/Jet/JetResolution/Root/JERTool.cxx
@@ -15,14 +15,14 @@
// Non-local includes
#include "PathResolver/PathResolver.h"
-#ifndef ASGTOOL_STANDALONE
+#ifndef XAOD_STANDALONE
# include "AthAnalysisBaseComps/AthAnalysisHelper.h"
#endif
// Local includes
#include "JetResolution/JERTool.h"
-/*#ifdef ASGTOOL_ATHENA
+/*#ifndef XAOD_STANDALONE
static const bool autoConfigDefault = true;
#else
static const bool autoConfigDefault = false;
@@ -128,7 +128,7 @@ StatusCode JERTool::initialize()
ATH_MSG_INFO("Initializing JER provider");
// Auto-configuration currently disabled
- #ifdef ASGTOOL_ATHENA
+ #ifndef XAOD_STANDALONE
/*if(m_useAutoConfig){
ATH_CHECK( autoConfigure() );
}*/
diff --git a/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx b/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx
index a9c1e4f0ecd71eff1ff5dd6e68edc60ba99a54eb..2d524996a9766139aae286b4a18dc29655f31715 100644
--- a/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx
+++ b/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx
@@ -17,7 +17,7 @@
#include "TH1D.h"
//included eventually from ITauToolBase
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Units/SystemOfUnits.h"
using CLHEP::GeV;
diff --git a/Reconstruction/tauRecTools/Root/TauProcessorTool.cxx b/Reconstruction/tauRecTools/Root/TauProcessorTool.cxx
index eb3ed8faceaa28fe0d7f34a5ba6920dda00731ac..1ec8ad059f1319b7584de8f9f2aeeb5e3c0b690a 100644
--- a/Reconstruction/tauRecTools/Root/TauProcessorTool.cxx
+++ b/Reconstruction/tauRecTools/Root/TauProcessorTool.cxx
@@ -430,10 +430,10 @@ StatusCode TauProcessorTool::execute(){
//________________________________________
StatusCode TauProcessorTool::finalize(){
-#if defined(ASGTOOL_STANDALONE)
+#if defined(XAOD_STANDALONE)
for (auto tool : m_tools)
ATH_CHECK(tool->finalize());
-#endif // ASGTOOL_STANDALONE
+#endif // XAOD_STANDALONE
return StatusCode::SUCCESS;
}
@@ -453,7 +453,7 @@ StatusCode TauProcessorTool::readConfig() {
// removed once all tools are updated to have a config path declared.
// in athena getProperties returns std::vector<Property*>
// in rc getProperties returns std::map<std::string,Property*>
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
bool configPathDeclared = false;
for (Property* property : getProperties())
{
@@ -464,12 +464,12 @@ StatusCode TauProcessorTool::readConfig() {
}
}
if (!configPathDeclared)
-#elif defined(ASGTOOL_STANDALONE)
+#elif defined(XAOD_STANDALONE)
PropertyMgr::PropMap_t property_map = getPropertyMgr()->getProperties();
if (property_map.find("ConfigPath") == property_map.end())
#else
# error "What environment are we in?!?"
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
{
ATH_MSG_INFO("No config file path property declared yet, this is not recommended");
return StatusCode::SUCCESS;
@@ -498,7 +498,7 @@ StatusCode TauProcessorTool::readConfig() {
}
else {
StatusCode sc;
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
// get type of variable with the entry name
const std::type_info* type = getProperty(lList->At( i )->GetName()).type_info();
@@ -537,16 +537,16 @@ StatusCode TauProcessorTool::readConfig() {
else if (type == Property::STRING)
sc = this->setProperty(lList->At( i )->GetName(),
env.GetValue(lList->At( i )->GetName(),""));
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
else {
sc = StatusCode::FAILURE;
}
if (!sc.isSuccess()) {
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
ATH_MSG_FATAL("there was a problem to find the correct type enum: "<<type->name());
#else
ATH_MSG_FATAL("there was a problem to find the correct type enum: "<<type);
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
return StatusCode::FAILURE;
}
}
diff --git a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
index c50defb0ffe9e4c7cf9e89c80ebddec14d16d04e..2644659c557a07fb358970cbfe513eeed5f914ad 100644
--- a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
+++ b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
@@ -28,7 +28,7 @@ StatusCode TauRecToolBase::readConfig() {
// removed once all tools are updated to have a config path declared.
// in athena getProperties returns std::vector<Property*>
// in rc getProperties returns std::map<std::string,Property*>
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
bool configPathDeclared = false;
for (Property* property : getProperties())
{
@@ -39,12 +39,12 @@ StatusCode TauRecToolBase::readConfig() {
}
}
if (!configPathDeclared)
-#elif defined(ASGTOOL_STANDALONE)
+#elif defined(XAOD_STANDALONE)
PropertyMgr::PropMap_t property_map = getPropertyMgr()->getProperties();
if (property_map.find("ConfigPath") == property_map.end())
#else
# error "What environment are we in?!?"
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
{
ATH_MSG_INFO("No config file path property declared yet, this is not recommended");
return StatusCode::SUCCESS;
@@ -64,7 +64,7 @@ StatusCode TauRecToolBase::readConfig() {
{
StatusCode sc;
// types of properties are handled differently as well
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
// get type of variable with the entry name
const std::type_info* type = getProperty(lList->At( i )->GetName()).type_info();
@@ -103,14 +103,14 @@ StatusCode TauRecToolBase::readConfig() {
else if (type == Property::STRING)
sc = this->setProperty(lList->At( i )->GetName(),
env.GetValue(lList->At( i )->GetName(),""));
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
else
{
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
ATH_MSG_FATAL("there was a problem to find the correct type enum: "<<type->name());
#else
ATH_MSG_FATAL("there was a problem to find the correct type enum: "<<type);
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
return StatusCode::FAILURE;
}
if (!sc.isSuccess()) {
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauProcessorTool.h b/Reconstruction/tauRecTools/tauRecTools/TauProcessorTool.h
index 549470f07479160a9d57cfdb76f5c614eec4ea18..fa1abc0c193084ea5e70261b86f65e1e078b658d 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauProcessorTool.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauProcessorTool.h
@@ -94,7 +94,7 @@ template<class T, class U, class V>
*newV = *v;
}
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
ATH_CHECK( evtStore()->record(container, containerName+"Fix") ); //TODO? make "Fix" configurable
ATH_CHECK( evtStore()->record(containerStore, containerName+"FixAux.") );
#else
diff --git a/Reconstruction/tauRecTools/tauRecTools/TrackSort.h b/Reconstruction/tauRecTools/tauRecTools/TrackSort.h
index 4fa2290d6dd0d614bd0576dd6ff4df7b7df05260..ed61ce1739addac3971e1ab45064dfac413b1841 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TrackSort.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TrackSort.h
@@ -5,7 +5,7 @@
#ifndef TAUREC_TRACKSORT_H
#define TAUREC_TRACKSORT_H
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "Particle/TrackParticle.h"
#include "Particle/TrackParticleContainer.h"
#endif
@@ -26,7 +26,7 @@ class TrackSort {
public:
TrackSort(){ };
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
bool operator() (const ElementLink<Rec::TrackParticleContainer>& t1, const ElementLink<Rec::TrackParticleContainer> &t2) const
{
return fabs( (*t1)->pt() ) > fabs( (*t2)->pt() );
diff --git a/Tools/PathResolver/Root/PathResolver.cxx b/Tools/PathResolver/Root/PathResolver.cxx
index 6ac69e79509bfb42f55d80c1937deac713f83f4d..3f8361b21cf55f870544cd18cc31a7f9f6712626 100644
--- a/Tools/PathResolver/Root/PathResolver.cxx
+++ b/Tools/PathResolver/Root/PathResolver.cxx
@@ -37,7 +37,7 @@ std::atomic<MSG::Level> PathResolver::m_level=MSG::INFO;
PathResolver::PathResolver() { }
asg::AsgMessaging& PathResolver::asgMsg() {
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
static thread_local asg::AsgMessaging asgMsg("PathResolver");
#else
static asg::AsgMessaging asgMsg ATLAS_THREAD_SAFE ("PathResolver");
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
index 4dbf171fd29f4229a8d48e771d471f2c08c1dc39..d3f508a3b566ad17b169b56710b78c7a94a55848 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
@@ -40,7 +40,7 @@
#include "xAODTrigger/TrigCompositeContainer.h"
#include "TrigDecisionTool/DecisionUnpackerStandalone.h"
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "AthenaBaseComps/AthCheckMacros.h"
#else
#include "AsgTools/Check.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionObjectHandleStandalone.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionObjectHandleStandalone.cxx
index 942dd4f0b8b6b6ba27b43a556e9aaa4443d0e78b..816588aec68136c4d12d84365fdaf0e67c22650a 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionObjectHandleStandalone.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionObjectHandleStandalone.cxx
@@ -8,9 +8,9 @@
#include "TrigDecisionTool/DecisionObjectHandleStandalone.h"
// Include for the event store type:
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
# include "AsgTools/SgTEvent.h"
-#elif defined(ASGTOOL_ATHENA)
+#elif !defined(XAOD_STANDALONE)
# include "StoreGate/StoreGateSvc.h"
#else
# error "Wrong environment configuration detected!"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionUnpackerStandalone.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionUnpackerStandalone.cxx
index aec85b670d6188289b6c881aec273a1a7343be66..755a2c592eac9be312bfc00b66591d9a0a63af7a 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionUnpackerStandalone.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/DecisionUnpackerStandalone.cxx
@@ -15,7 +15,7 @@
#include "TrigDecisionTool/DecisionUnpackerStandalone.h"
#include "TrigDecisionTool/DecisionObjectHandleStandalone.h"
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include "TrigNavigation/NavigationCore.h"
#endif
@@ -139,7 +139,7 @@ namespace Trig {
bool navi_nonempty = !(serializedNav->serialized().empty());
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
HLT::NavigationCore* fullNav = dynamic_cast<HLT::NavigationCore*>(nav);
if(!fullNav){
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/ExpertMethods.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/ExpertMethods.cxx
index a66c208472b96a86990a164663de9ae47cbc2aee..55fdd4bbe837eddad5ab3f341f0a1731b18a92ea 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/ExpertMethods.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/ExpertMethods.cxx
@@ -18,7 +18,7 @@
#include <exception>
#include "TrigDecisionTool/ExpertMethods.h"
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include "TrigSteeringEvent/HLTResult.h"
#include "TrigNavigation/AccessProxy.h"
#endif
@@ -76,7 +76,7 @@ const LVL1CTP::Lvl1Item* Trig::ExpertMethods::getItemDetails(const std::string&
return cgm()->item(chain);
}
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
const HLT::NavigationCore* Trig::ExpertMethods::getNavigation() const
{
if (!(checkExperimentalAndExpertMethods())) return 0;
@@ -104,7 +104,7 @@ Trig::CacheGlobalMemory* Trig::ExpertMethods::cgm(bool onlyConfig) const {
bool Trig::ExpertMethods::isHLTTruncated() const {
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
const HLT::HLTResult* res(0);
const xAOD::TrigDecision* trigDec(0);
auto navigation = getNavigation();
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/FeatureCollectStandalone.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/FeatureCollectStandalone.cxx
index 71e7ffe84725457eda7aed434a633b35cdcbe460..af2d326e7262c0209259eee092c25c6ab565790f 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/FeatureCollectStandalone.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/FeatureCollectStandalone.cxx
@@ -27,7 +27,7 @@ namespace Trig{
//completely disabled for now. should be reenabled once we have more recent TNS tag in Athena
HLT::TriggerElement::FeatureAccessHelper answer;
- #ifndef ASGTOOL_ATHENA
+ #ifndef XAOD_STANDALONE
answer = navigation->getFeature(te,ClassID_traits<TrigPassBits>::ID(),"passbits");
#else
(void)te;
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/Logger.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/Logger.cxx
index de455d90f726546720b07cbf1c78caa0c25decd4..46fe03bc9dc2bb98828550c0926c8305bf7f6d36 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/Logger.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/Logger.cxx
@@ -4,20 +4,20 @@
#include "TrigDecisionTool/Logger.h"
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
asg::AsgMessaging* Trig::Logger::staticStream = 0;
#endif
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
AthMessaging* Trig::Logger::staticStream = 0;
#endif
namespace Trig{
MsgStream& Logger::msg() const {
if(!Logger::staticStream){
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
Logger::staticStream = new asg::AsgMessaging("TrigDecisionTool");
#endif
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
Logger::staticStream = new AthMessaging(Athena::getMessageSvc(),"TrigDecisionTool");
#endif
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
index de1cef1c2baf04f98a203d9e60bcfee0123672d5..f5578c66812ca56845a37eefe2d250d22d1b42d7 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
@@ -14,7 +14,6 @@
*
***********************************************************************************/
-#include "AsgTools/AsgToolsConf.h"
#include "TrigDecisionTool/DecisionUnpackerAthena.h"
@@ -26,7 +25,7 @@
#include "TrigConfL1Data/CTPConfig.h"
#include "TrigConfL1Data/Menu.h"
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "AthenaKernel/getMessageSvc.h"
#endif
@@ -36,7 +35,7 @@ static std::vector<std::string> s_instances;
Trig::TrigDecisionTool::TrigDecisionTool(const std::string& name) :
asg::AsgMetadataTool(name),
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
AthMessaging( Athena::getMessageSvc(), name),
#endif
m_configKeysCache(),
@@ -83,7 +82,7 @@ Trig::TrigDecisionTool::TrigDecisionTool(const std::string& name) :
m_configKeysCache.resize(3,0);
}
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
void Trig::TrigDecisionTool::outputlevelupdateHandler(Property& /*p*/) {
//call the original update handler
Logger::msg().setLevel(AthMessaging::msg().level());
@@ -121,7 +120,7 @@ Trig::TrigDecisionTool::initialize() {
ATH_MSG_INFO("Initializing Trig::TrigDecisionTool (standalone version even for athena)");
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
//This is the full Athena Environment
//we setup the full TrigConfigSvc
@@ -159,7 +158,7 @@ Trig::TrigDecisionTool::initialize() {
cgm()->navigation(&*m_navigation);
cgm()->setStore(&*evtStore());
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
ServiceHandle<IIncidentSvc> incSvc("IncidentSvc",name());
if (incSvc.retrieve().isFailure()) {
ATH_MSG_ERROR("Cannot retrieve IncidentSvc");
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Combination.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Combination.h
index 302b69200f06bd1977c446a34e2863e80c229c0c..a6a2d95c9101680b571c645e3e754931cd1ad74f 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Combination.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Combination.h
@@ -29,7 +29,7 @@
#include "xAODBase/IParticle.h"
#include "xAODBase/IParticleContainer.h"
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include "TrigDecisionTool/FeatureCollectAthena.h"
#endif
@@ -173,7 +173,7 @@ const std::vector<Trig::Feature<T> > Trig::Combination::get(const std::string& l
{
std::vector<Feature<T> > data;
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
for( const HLT::TriggerElement* te : m_tes )
FeatureAccessImpl::collect<T>(te, data, label, condition, teName, navigation());
for( Feature<T>& f : data ) {
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc
index 1a986383df00b298b7b6eb6dde243f6be3f11934..957a62be2fe98c6fd2fea5960e827b3529426da2 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc
@@ -1,4 +1,4 @@
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
template<class T>
const Trig::Feature<T> Trig::DecisionAccess::ancestor(const HLT::TriggerElement* te, std::string label) const {
@@ -41,7 +41,7 @@ const std::vector<Trig::Feature<T> > Trig::DecisionAccess::ancestors(const HLT::
return std::vector<Trig::Feature<T> >();
}
-#endif // ASGTOOL_ATHENA
+#endif // XAOD_STANDALONE
template<class CONTAINER>
std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::DecisionAccess::features(const Trig::ChainGroup* group,
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
index 5911d39a94dd7e9815739fe781195121c1f584ac..bedaa6056406500d464bc341b50c2e3ac7147041 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleAthena.h
@@ -12,7 +12,6 @@
#define TrigDecisionTool_DecisionObjectHandleAthena_h
#include <string>
-#include "AsgTools/AsgToolsConf.h"
#include "StoreGate/DataHandle.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
index c2ec415803c4558f8efafd48ee38fd1e6374158c..bf6a25b72e85fb4cf2f454ea3c34c49fc57e0ca5 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleEventInfo.h
@@ -12,7 +12,6 @@
#define TrigDecisionTool_DecisionObjectHandleEventInfo_h
#include <string>
-#include "AsgTools/AsgToolsConf.h"
#include "StoreGate/DataHandle.h"
#include "TrigDecisionTool/EventPtrDef.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
index b6ea62d8fcec6df19c481bcc1c76bbb3b0c3fe4e..fa7e26c6c921614f3dc2b2550f9a78e50a3f495a 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionObjectHandleStandalone.h
@@ -12,8 +12,6 @@
#include <string>
// ASG include(s):
-#include "AsgTools/AsgToolsConf.h"
-
#include "AsgTools/AsgMessaging.h"
// xAOD include(s):
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
index 2d66294ece32f609dc0c1eae9b74a440025cee7a..cfe262d3f1e729acb1e7db0166f79ed7b53285c4 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionUnpackerStandalone.h
@@ -9,7 +9,6 @@
#define TRIGDECISIONTOOL_DECISIONUNPACKERSTANDALONE_H
// ASG include(s):
-#include "AsgTools/AsgToolsConf.h"
#include "AsgTools/AsgMessaging.h"
// Trigger configuration include(s):
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/EventPtrDef.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/EventPtrDef.h
index c7f11a2998c15defbfafec24b54a2e229231c406..988e1204619f7e319c774fdedbdceb1705d32e44 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/EventPtrDef.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/EventPtrDef.h
@@ -10,9 +10,9 @@ namespace asg {
}
class StoreGateSvc;
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
typedef asg::SgTEvent* EventPtr_t;
-#elif defined(ASGTOOL_ATHENA)
+#elif !defined(XAOD_STANDALONE)
typedef StoreGateSvc* EventPtr_t;
#else
# error "Wrong environment configuration detected!"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ExpertMethods.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ExpertMethods.h
index 98321b76dfe79ea889bb0b5f1bf0118c4c921b5f..b37a2ae0b416fc85679dad4b0bda31996e29dc01 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ExpertMethods.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ExpertMethods.h
@@ -30,7 +30,7 @@
#include "TrigDecisionTool/Logger.h"
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include "TrigNavigation/NavigationCore.h"
#endif
@@ -90,7 +90,7 @@ namespace Trig {
/**
* @brief return HLT::NavigationCore
**/
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
const HLT::NavigationCore* getNavigation() const;
#else
const HLT::TrigNavStructure* getNavigation() const;
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h
index 472a3f74516d6141eff51b340472c72e09760c9b..c33d7b089996c025c633c0c24d9005291f49fcd8 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Feature.h
@@ -39,7 +39,7 @@
#include "TrigDecisionTool/TypelessFeature.h"
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include "TrigStorageDefinitions/EDM_TypeInfo.h"
#endif
@@ -49,7 +49,7 @@
//e.g. not in the boost::is_same call directly a la
// boost::is_same<T,struct Muon_ROI>::value
//so that it does not end up to be a check on is_same<T,Trig::Muon_ROI>
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
class Muon_ROI;
class EmTau_ROI;
class Jet_ROI;
@@ -77,7 +77,7 @@ namespace Trig {
template<typename T> struct is_storable_type{
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
static const bool value =
!(
boost::is_same<T,Muon_ROI>::value ||
@@ -96,7 +96,7 @@ namespace Trig {
template<typename T,bool> struct link_or_not;
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
template<typename T> struct link_or_not<T,true>{
static const bool known = IsKnownFeature<T>::value; //will cause compile error if not
typedef typename Features2Container<T>::type container_type;
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h
index e9f7f161628c428ba831768218afe22bcc8ffc8c..651808deff561d753b925a01c5ede98c43189c49 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectStandalone.h
@@ -42,7 +42,6 @@
#include "TrigNavStructure/TrigNavStructure.h"
-#include "AsgTools/AsgToolsConf.h"
#include "AsgTools/Check.h"
#include "TrigNavStructure/TypedHolder.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureContainer.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureContainer.h
index 7619f32553c1b60caf5d31c7e7ed772316ccc888..1240a5f8e09a877417a492e433e330c6ead66ac2 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureContainer.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureContainer.h
@@ -107,7 +107,7 @@ namespace Trig {
* @param f is the Feature that holds the trigger object (container)
* @param flagsLabel is the label of the TrigPassFlags object
**/
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
template<class T> TrigPassFlags getFlags(const Trig::Feature<T> & f, const std::string & flagsLabel = "") const;
#endif
@@ -208,7 +208,7 @@ Trig::FeatureContainer::get(const std::string& label, unsigned int condition, co
* @param f is the Feature that holds the trigger object (container)
* @param flagsLabel is the label of the TrigPassFlags object
**/
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
template<class T> TrigPassFlags
Trig::FeatureContainer::getFlags(const Trig::Feature<T> & f, const std::string & flagsLabel) const {
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
index f5f772a6dad341bf8c8481535e380a9a5e4d1da7..9f80cf80987c71372fca7d9c550dc0dae10186ab 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/Logger.h
@@ -17,12 +17,11 @@
*
***********************************************************************************/
#include <string>
-#include "AsgTools/AsgToolsConf.h"
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
#include "AsgTools/AsgMessaging.h"
#endif
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "AthenaKernel/getMessageSvc.h"
#include "AthenaBaseComps/AthMessaging.h"
#endif
@@ -33,11 +32,11 @@ namespace Trig{
MsgStream& msg() const;
MsgStream& msg(const MSG::Level lvl) const {return msg() << lvl;}
bool msgLvl(const MSG::Level lvl) const {return Logger::staticStream->msgLvl(lvl);}
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
void setMessaging(asg::AsgMessaging* messaging){staticStream = messaging;}
static asg::AsgMessaging* staticStream;
#endif
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
void setMessaging(AthMessaging* messaging){staticStream = messaging;}
static AthMessaging* staticStream;
#endif
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
index fb38bb9043adc43a2a97c062657a91ddaf7ea464..87c03699fa6497647332af966410242104e57d4c 100755
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
@@ -20,12 +20,11 @@
*
***********************************************************************************/
-#include "AsgTools/AsgToolsConf.h"
#include "AsgTools/AsgMetadataTool.h"
#include "AsgTools/ToolHandle.h"
#include "TrigConfInterfaces/ITrigConfigTool.h"
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "AthenaBaseComps/AthMessaging.h"
@@ -56,7 +55,7 @@ namespace Trig {
public asg::AsgMetadataTool,
virtual Trig::ITrigDecisionTool,
public TrigDecisionToolCore
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
, public AthMessaging
#endif
{
@@ -81,7 +80,7 @@ namespace Trig {
StatusCode finalize();
- #ifdef ASGTOOL_ATHENA
+ #ifndef XAOD_STANDALONE
void outputlevelupdateHandler(Property& p); //propagates outputlevel changes to the Logger
#endif
@@ -121,7 +120,7 @@ namespace Trig {
//full Athena
- #if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+ #if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc; //!< trigger configuration service handle
ToolHandle<HLT::Navigation> m_fullNavigation;
#endif
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TypelessFeature.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TypelessFeature.h
index be37fa071d2b6ab889aabd97214b042f3e87e096..d978a82e217d7b9e1eb1519f47dccf48aed190e3 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TypelessFeature.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TypelessFeature.h
@@ -9,7 +9,6 @@
class TrigPassBits;
#include <fstream>
-#include "AsgTools/AsgToolsConf.h"
#include "TrigDecisionTool/EventPtrDef.h"
namespace Trig{
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerAthena.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerAthena.cxx
index bff4d0caeae125d2a25f9900b70c664d283d9183..2099be5dd2d4832e04c5fd7d663005a6bf60c59e 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerAthena.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerAthena.cxx
@@ -2,9 +2,8 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "AsgTools/AsgToolsConf.h"
//only in full Athena
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerEventInfo.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerEventInfo.cxx
index e63ebdc96441bd596d28be2068b76e5079ebaa4a..6ed5bc462c5a60c595350da73ffa4a46ec33899f 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerEventInfo.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/src/DecisionUnpackerEventInfo.cxx
@@ -2,9 +2,8 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "AsgTools/AsgToolsConf.h"
//only in full Athena
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/src/FeatureCollectAthena.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/src/FeatureCollectAthena.cxx
index 3d9b0f68eae0bc81b2c022dec12fa8d2bcf2453f..0a1a5b4615152a248882975fca3f9625db7f3a64 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/src/FeatureCollectAthena.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/src/FeatureCollectAthena.cxx
@@ -2,9 +2,8 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "AsgTools/AsgToolsConf.h"
//only in full Athena
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include "TrigDecisionTool/FeatureCollectAthena.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/test/ChainGroup_test.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/test/ChainGroup_test.cxx
index 1f1ba91beadff05454b05f4b33a9dfceea276461..97f2b6b636f4caf891bee0c7834c2e5d0c03427c 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/test/ChainGroup_test.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/test/ChainGroup_test.cxx
@@ -2,8 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "AsgTools/AsgToolsConf.h"
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include <iostream>
#include <boost/assign/std/vector.hpp>
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/test/Templates_test.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/test/Templates_test.cxx
index 9064ea108f6c8b17ea0292b34682e34535368426..73f140ad294faadc649c5da27b4b1a43fe1e48c8 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/test/Templates_test.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/test/Templates_test.cxx
@@ -2,9 +2,8 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "AsgTools/AsgToolsConf.h"
#include <iostream>
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+#if !defined(XAOD_STANDALONE) && !defined(XAOD_ANALYSIS)
#include "vector"
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingTool.h b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingTool.h
index cd28489050e4e119df4c3094d6758e4e234f4a41..abc7e46b68ff88d41bded5a9a226f84d253a3486 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingTool.h
@@ -7,7 +7,6 @@
#include "TrigEgammaMatchingTool/ITrigEgammaMatchingTool.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
-#include "AsgTools/AsgToolsConf.h"
#include "AsgTools/AsgMetadataTool.h"
#include "AsgTools/AsgTool.h"
#include "AsgTools/ToolHandle.h"
diff --git a/Trigger/TrigAnalysis/TrigMuonMatching/Root/TrigMuonMatching.cxx b/Trigger/TrigAnalysis/TrigMuonMatching/Root/TrigMuonMatching.cxx
index 152f93804baecd6dc68cad8e7d670bd906d7f212..721924ac4ecf63e7f197ba6cb8e01ec0e5bced4e 100644
--- a/Trigger/TrigAnalysis/TrigMuonMatching/Root/TrigMuonMatching.cxx
+++ b/Trigger/TrigAnalysis/TrigMuonMatching/Root/TrigMuonMatching.cxx
@@ -169,7 +169,7 @@ namespace Trig {
auto cg = m_trigDecTool->getChainGroup(eventTrigger);
auto fc = cg->features(TrigDefs::alsoDeactivateTEs);
-#if defined(ASGTOOL_STANDALONE) || defined(XAOD_ANALYSIS)
+#if defined(XAOD_STANDALONE) || defined(XAOD_ANALYSIS)
auto MuFeatureContainers = fc.containerFeature<xAOD::L2StandAloneMuonContainer>("",TrigDefs::alsoDeactivateTEs);
#else
const std::vector< Trig::Feature<xAOD::L2StandAloneMuonContainer> > MuFeatureContainers = fc.get<xAOD::L2StandAloneMuonContainer>("", TrigDefs::alsoDeactivateTEs);
@@ -195,7 +195,7 @@ namespace Trig {
auto cg = m_trigDecTool->getChainGroup(eventTrigger);
auto fc = cg->features(TrigDefs::alsoDeactivateTEs);
-#if defined(ASGTOOL_STANDALONE) || defined(XAOD_ANALYSIS)
+#if defined(XAOD_STANDALONE) || defined(XAOD_ANALYSIS)
auto MuFeatureContainers = fc.containerFeature<xAOD::L2CombinedMuonContainer>("",TrigDefs::alsoDeactivateTEs);
#else
const std::vector< Trig::Feature<xAOD::L2CombinedMuonContainer> > MuFeatureContainers = fc.get<xAOD::L2CombinedMuonContainer>("", TrigDefs::alsoDeactivateTEs);
@@ -351,7 +351,7 @@ namespace Trig {
auto cg = m_trigDecTool->getChainGroup(eventTrigger);
auto fc = cg->features();
-#if defined(ASGTOOL_STANDALONE) || defined(XAOD_ANALYSIS)
+#if defined(XAOD_STANDALONE) || defined(XAOD_ANALYSIS)
auto MuFeatureContainers = fc.containerFeature<xAOD::MuonContainer>();
#else
const std::vector< Trig::Feature<xAOD::MuonContainer> > MuFeatureContainers = fc.get<xAOD::MuonContainer>();
diff --git a/Trigger/TrigAnalysis/TrigMuonMatching/TrigMuonMatching/TrigMuonMatching.h b/Trigger/TrigAnalysis/TrigMuonMatching/TrigMuonMatching/TrigMuonMatching.h
index a87636d5ed2d49ef4154635455ee439ed669d392..cebea682641d0d2719c4341d08e3a6243ac612c6 100644
--- a/Trigger/TrigAnalysis/TrigMuonMatching/TrigMuonMatching/TrigMuonMatching.h
+++ b/Trigger/TrigAnalysis/TrigMuonMatching/TrigMuonMatching/TrigMuonMatching.h
@@ -8,7 +8,6 @@
#include "TrigMuonMatching/ITrigMuonMatching.h"
-#include "AsgTools/AsgToolsConf.h"
#include "AsgTools/AsgMetadataTool.h"
#include "AsgTools/AsgTool.h"
#include "AsgTools/ToolHandle.h"
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltEmulationTool.cxx b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltEmulationTool.cxx
index db41ca44196ad98e77f147a254244905a8133f00..2cd8816130facaefe705773ca1a699abb6c6c444 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltEmulationTool.cxx
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltEmulationTool.cxx
@@ -28,13 +28,13 @@ namespace TrigTauEmul {
declareProperty("HLTTriggerCondition", m_HLTTriggerCondition=TrigDefs::Physics);
declareProperty("L1TriggerCondition", m_L1TriggerCondition=TrigDefs::Physics);
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
std::string tdt_name;
declareProperty("TrigDecTool", tdt_name="TrigDecTool");
m_trigdec_tool = new ToolHandle<Trig::TrigDecisionTool> (tdt_name);
#endif
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
m_trigdec_tool = new ToolHandle<Trig::TrigDecisionTool> ();
declareProperty("TrigDecTool", *m_trigdec_tool);
#endif
@@ -51,12 +51,12 @@ namespace TrigTauEmul {
// Copy constructor
HltEmulationTool::HltEmulationTool(const HltEmulationTool& other): asg::AsgTool(other.name() + "_copy")
{
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
std::string tdt_name = "TrigDecisionTool_copy";
m_trigdec_tool = new ToolHandle<Trig::TrigDecisionTool> (tdt_name);
#endif
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
m_trigdec_tool = new ToolHandle<Trig::TrigDecisionTool> ();
declareProperty("TrigDecTool", *m_trigdec_tool);
#endif
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltTauSelectionTool.cxx b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltTauSelectionTool.cxx
index ccd913de73c7f9041a5f95e356d6bc74f4a56bdb..2acb61586d1acd860f3b48b68d232a98bf414022 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltTauSelectionTool.cxx
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/Root/HltTauSelectionTool.cxx
@@ -63,7 +63,7 @@ HltTauSelectionTool::~HltTauSelectionTool() {
StatusCode HltTauSelectionTool::initialize()
{
- // #ifdef ASGTOOL_STANDALONE
+ // #ifdef XAOD_STANDALONE
// if (m_recalculateBDTscore) {
// m_tauIDTool = new ToolHandle<TauDiscriminantTool>(m_TauDiscriminantToolName);
// m_tauIDTool->operator->()->initialize().ignore();
@@ -114,7 +114,7 @@ asg::AcceptData HltTauSelectionTool::accept(const xAOD::TauJet *hlttau, const Da
asg::AcceptData acceptData (&m_accept);
acceptData.setCutResult("HltTau", false);
-// #ifdef ASGTOOL_STANDALONE
+// #ifdef XAOD_STANDALONE
// if (m_recalculateBDTscore) {
// MY_MSG_INFO("Recalculating BDT score for HLT tau " << hlttau);
@@ -147,7 +147,7 @@ asg::AcceptData HltTauSelectionTool::accept(const xAOD::TauJet * hlttau, const x
asg::AcceptData acceptData (&m_accept);
acceptData.setCutResult("HltTau", false);
- // #ifdef ASGTOOL_STANDALONE
+ // #ifdef XAOD_STANDALONE
// if (m_recalculateBDTscore) {
// MY_MSG_INFO("Recalculating BDT score for HLT tau " << hlttau);
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/HltTauSelectionTool.h b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/HltTauSelectionTool.h
index ef3f6201abcfae51ebbbbd0682c601381163bf20..8b5428f4d3571931056c72e666bdeaff552cb7e0 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/HltTauSelectionTool.h
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/HltTauSelectionTool.h
@@ -18,7 +18,7 @@
#include "TrigTauEmulation/IHltTauSelectionTool.h"
#include "TrigTauEmulation/SelectionTool.h"
#include "TrigTauEmulation/IFastTrackSelectionTool.h"
-/* #ifdef ASGTOOL_STANDALONE */
+/* #ifdef XAOD_STANDALONE */
/* #include "TauDiscriminant/TauDiscriminantTool.h" */
/* #endif */
@@ -74,7 +74,7 @@ class HltTauSelectionTool : public virtual IHltTauSelectionTool, public Selectio
// tau BDT
std::string m_TauDiscriminantToolName;
bool m_recalculateBDTscore;
- /* #ifdef ASGTOOL_STANDALONE */
+ /* #ifdef XAOD_STANDALONE */
/* ToolHandle<TauDiscriminantTool> *m_tauIDTool; */
/* #endif */
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/TrigTauEmulationDict.h b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/TrigTauEmulationDict.h
index ec2fa7a16e3866044b310cd2634942685aedde65..9a4731bbf94012a277583895bfa3ef0a7c9f001c 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/TrigTauEmulationDict.h
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/TrigTauEmulationDict.h
@@ -21,7 +21,7 @@
#include "AsgTools/ToolHandle.h"
#include "AsgTools/ToolHandleArray.h"
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
// Helper macro for declaring the setProperty functions to the dictionary:
#define SETPROPERTY_INSTAN( TYPE ) \
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/Utils.h b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/Utils.h
index aaff7df8948811601739ed40eabe971934b20b23..9fac9534f626b8ba839957dfb2904b4565a41b01 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/Utils.h
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/TrigTauEmulation/Utils.h
@@ -26,7 +26,7 @@ namespace Utils {
}
// Athena has an old version of ASG Tools, so alias the function to something
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
template< typename T>
static bool toolStoreContains( const std::string& name ) {
return asg::ToolStore::contains<T>(name);
diff --git a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
index 33ed51f7b0b47756bb780decb98bdbc78dcbd233..f4acb15c1930e1c482fe2b1144c1380beecc4c6e 100644
--- a/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
+++ b/Trigger/TrigEvent/TrigNavStructure/TrigNavStructure/TypedHolder.h
@@ -16,20 +16,19 @@
#include "AthContainers/OwnershipPolicy.h"
-#ifdef ASGTOOL_STANDALONE //guarded b/c athena includes its own
+#ifdef XAOD_STANDALONE //guarded b/c athena includes its own
#include "xAODCore/ClassID_traits.h"
#endif
-#include "AsgTools/AsgToolsConf.h"
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
#include "AsgTools/SgTEvent.h"
typedef asg::SgTEvent* EventPtr;
-#endif //ASGTOOL_STANDALONE
+#endif //XAOD_STANDALONE
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "StoreGate/StoreGateSvc.h"
typedef StoreGateSvc* EventPtr;
-#endif //ASGTOOL_ATHENA
+#endif //XAOD_STANDALONE
#include "AsgTools/AsgMessaging.h"
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h
index 5001bb627e10740ae9fa569d334c53c220fe4f9f..892d94bc0cfb074a9f64e5b823860e4f00b0df9b 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h
+++ b/Trigger/TrigEvent/TrigSteeringEvent/TrigSteeringEvent/Chain.h
@@ -28,12 +28,11 @@
#include "TrigSteeringEvent/Enums.h"
#include "TrigConfHLTData/HLTChain.h"
-#include "AsgTools/AsgToolsConf.h"
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
#include "AsgTools/MsgStream.h"
#include "AsgTools/MsgStreamMacros.h"
#endif
-#ifdef ASGTOOL_ATHENA
+#ifndef XAOD_STANDALONE
#include "GaudiKernel/MsgStream.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#endif
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/TrigAnalysisTest/EventPtrDef.h b/Trigger/TrigValidation/TrigAnalysisTest/TrigAnalysisTest/EventPtrDef.h
index e7da1227a7fe6d03fc5f37f6c1ac47256d41083f..c56013dffc3c971c944ccb04c4696db14a597cee 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/TrigAnalysisTest/EventPtrDef.h
+++ b/Trigger/TrigValidation/TrigAnalysisTest/TrigAnalysisTest/EventPtrDef.h
@@ -14,9 +14,9 @@ namespace asg {
}
class StoreGateSvc;
-#ifdef ASGTOOL_STANDALONE
+#ifdef XAOD_STANDALONE
typedef asg::SgTEvent* EventPtr_t;
-#elif defined(ASGTOOL_ATHENA)
+#elif !defined(XAOD_STANDALONE)
typedef StoreGateSvc* EventPtr_t;
#else
# error "Wrong environment configuration detected!"