diff --git a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageDict.h b/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageDict.h
deleted file mode 100644
index 8373e93bb0e1430ae3176bec1671f2cff09c8d52..0000000000000000000000000000000000000000
--- a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageDict.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ATHASGEXUNITTEST_MYPACKAGEDICT_H
-#define ATHASGEXUNITTEST_MYPACKAGEDICT_H
-
-#include "AthAsgExUnittest/MyPackageTool.h"
-
-#endif
diff --git a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/selection.xml b/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/selection.xml
deleted file mode 100644
index 1afaa3919dd9f187ed35151851651ff393280ff0..0000000000000000000000000000000000000000
--- a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/selection.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<lcgdict>
- <class name="MyPackageTool" />
- <class name="IMyPackageTool" />
-</lcgdict>
diff --git a/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt b/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt
index 0a3ab24abf76c7dd7e745a7f4a2d17b2be162adb..2386195349647cb205a3ca7511773728f788b027 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt
+++ b/Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt
@@ -1,34 +1,18 @@
-
-#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#
-
-################################################################################
-# Package: MyPackage
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthAsgExUnittest )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthAnalysisBaseComps
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODJet
- AtlasTest/GoogleTestTools )
-
# Libraries in the package:
atlas_add_library( AthAsgExUnittestLib
MyPackage/*.h src/*.cxx
Root/*.cxx
- PUBLIC_HEADERS AthAsgExUnittest
+ NO_PUBLIC_HEADERS
LINK_LIBRARIES GaudiKernel AsgTools AthAnalysisBaseCompsLib )
+
atlas_add_component( AthAsgExUnittest
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AsgTools AthAsgExUnittestLib )
+ LINK_LIBRARIES AthAsgExUnittestLib )
# Add tests:
atlas_add_test( gt_AthAsgExUnittest
@@ -46,5 +30,3 @@ atlas_add_test( gt_MockxAODJet
atlas_add_test( gt_xAODJet
SOURCES test/gt_xAODJet.cxx
LINK_LIBRARIES xAODJet GoogleTestTools )
-
-
diff --git a/Control/AthenaExamples/AthAsgExUnittest/Root/MyPackageTool.cxx b/Control/AthenaExamples/AthAsgExUnittest/Root/MyPackageTool.cxx
index f484eafff3e1d44768e7d9834de3c105fe3ac706..0350e0f3b4c1a07f529d15d28bff44465a64e9e9 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/Root/MyPackageTool.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/Root/MyPackageTool.cxx
@@ -1,10 +1,10 @@
//
-// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
//
// MyPackage includes
-#include "AthAsgExUnittest/MyPackageTool.h"
+#include "../src/MyPackageTool.h"
MyPackageTool::MyPackageTool( const std::string& name ) : asg::AsgTool( name ) {
//example property declarations with default values
diff --git a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/IMyPackageTool.h b/Control/AthenaExamples/AthAsgExUnittest/src/IMyPackageTool.h
similarity index 100%
rename from Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/IMyPackageTool.h
rename to Control/AthenaExamples/AthAsgExUnittest/src/IMyPackageTool.h
diff --git a/Control/AthenaExamples/AthAsgExUnittest/src/MyPackageAlg.h b/Control/AthenaExamples/AthAsgExUnittest/src/MyPackageAlg.h
index 0c03b35d6fa2c8e4c2d7cb48b6acd585efe44105..e8a9607eb7ed94bdeb8db453068ffbe61325a885 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/src/MyPackageAlg.h
+++ b/Control/AthenaExamples/AthAsgExUnittest/src/MyPackageAlg.h
@@ -12,7 +12,7 @@
#include "AsgTools/AnaToolHandle.h" //use asg::AnaToolHandle instead of regular ToolHandles for full dual-use experience!
#endif
-#include "AthAsgExUnittest/IMyPackageTool.h"
+#include "IMyPackageTool.h"
class MyPackageAlg: public ::AthAnalysisAlgorithm {
diff --git a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageTool.h b/Control/AthenaExamples/AthAsgExUnittest/src/MyPackageTool.h
similarity index 86%
rename from Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageTool.h
rename to Control/AthenaExamples/AthAsgExUnittest/src/MyPackageTool.h
index 9d902a658e3f389d11ae3984af10e8e7f6332080..ebc1bef9cbf18ea5b3947d48d504e7a4b1d22dc5 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageTool.h
+++ b/Control/AthenaExamples/AthAsgExUnittest/src/MyPackageTool.h
@@ -1,12 +1,12 @@
// -*- mode: c++ -*-
//
-// Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
//
#ifndef ATHASGEXUNITTEST_MYPACKAGETOOL_H
#define ATHASGEXUNITTEST_MYPACKAGETOOL_H 1
#include "AsgTools/AsgTool.h"
-#include "AthAsgExUnittest/IMyPackageTool.h"
+#include "IMyPackageTool.h"
class MyPackageTool: public asg::AsgTool, public virtual IMyPackageTool {
public:
diff --git a/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx b/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx
index 95117f80988fe24ecc7001dd81259b9f457897df..ef5eb1e88d28c2273a95c33b751286b122b17992 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx
@@ -3,6 +3,6 @@
DECLARE_COMPONENT( MyPackageAlg )
-#include "AthAsgExUnittest/MyPackageTool.h"
+#include "../MyPackageTool.h"
DECLARE_COMPONENT( MyPackageTool )
diff --git a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx
index 7f01f18764d2e6b945752fbbfbe700b978499784..d0de4e2dff099bef22ed6f8c9e7bd5cbdbb0392c 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthAsgExUnittest.cxx
@@ -12,9 +12,9 @@
#include "AsgTools/AnaToolHandle.h"
#include "AthAnalysisBaseComps/AthAnalysisHelper.h"
-#include "../AthAsgExUnittest/IMyPackageTool.h"
+#include "../src/IMyPackageTool.h"
-#include "../AthAsgExUnittest/MyPackageTool.h"
+#include "../src/MyPackageTool.h"
#include "../src/MyPackageAlg.h"
#include <iostream>
diff --git a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
index 142156a288defae4d93b05ebf6107bd64c0213d8..37a3af4ee3f626abb9a2bce800b66586ca7750d0 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
@@ -12,7 +12,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaBaseComps/AthService.h"
-#include "../AthAsgExUnittest/IMyPackageTool.h"
+#include "../src/IMyPackageTool.h"
#include <string>
#include <iostream>
diff --git a/Control/AthenaExamples/AthExFortranAlgorithm/AthExFortranAlgorithm/config.h.in b/Control/AthenaExamples/AthExFortranAlgorithm/AthExFortranAlgorithm/config.h.in
deleted file mode 100755
index 61025bcef7b500b4018a9c3b79cc0ab745248ffa..0000000000000000000000000000000000000000
--- a/Control/AthenaExamples/AthExFortranAlgorithm/AthExFortranAlgorithm/config.h.in
+++ /dev/null
@@ -1 +0,0 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
diff --git a/Control/AthenaExamples/AthExFortranAlgorithm/CMakeLists.txt b/Control/AthenaExamples/AthExFortranAlgorithm/CMakeLists.txt
index 0f53e07a7a873724863f4831314fef9b218eabee..a613c492db04dadafb5812919b74d22219beccb6 100644
--- a/Control/AthenaExamples/AthExFortranAlgorithm/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExFortranAlgorithm/CMakeLists.txt
@@ -1,16 +1,8 @@
-################################################################################
-# Package: AthExFortranAlgorithm
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExFortranAlgorithm )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- PRIVATE
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_component( AthExFortranAlgorithm
src/*.cxx
@@ -19,8 +11,6 @@ atlas_add_component( AthExFortranAlgorithm
LINK_LIBRARIES AthenaBaseComps GaudiKernel )
# Install files from the package:
-atlas_install_headers( AthExFortranAlgorithm )
-atlas_install_joboptions( share/FortranAlgorithmOptions.txt share/FortranAlgorithmOptions.py )
+atlas_install_joboptions( share/FortranAlgorithmOptions.py )
atlas_install_runtime( share/FortranAlgorithmInput.data )
atlas_install_scripts( share/preFortAlgEx.sh )
-
diff --git a/Control/AthenaExamples/AthExFortranAlgorithm/share/FortranAlgorithmOptions.txt b/Control/AthenaExamples/AthExFortranAlgorithm/share/FortranAlgorithmOptions.txt
deleted file mode 100755
index 6d81dd2fa1564681f31bb543fa3b64cde080cd06..0000000000000000000000000000000000000000
--- a/Control/AthenaExamples/AthExFortranAlgorithm/share/FortranAlgorithmOptions.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-//##############################################################
-//
-// Job options file
-//
-//==============================================================
-
-//no EventSelector
-ApplicationMgr.DLLs += { "AthenaServices" };
-ApplicationMgr.EventLoop = "AthenaEventLoopMgr";
-//--------------------------------------------------------------
-// StoreGate services configuration
-//--------------------------------------------------------------
-#include "StoreGate/StoreGate_jobOptions.txt"
-
-ApplicationMgr.ExtSvc += { "EvtPersistencySvc/EventPersistencySvc",
- "HistogramSvc/HistogramDataSvc"
- };
-//--------------------------------------------------------------
-// Private Application Configuration options
-//--------------------------------------------------------------
-
-//load relevant libraries
-ApplicationMgr.DLLs += { "AthExFortranAlgorithm" };
-
-//top algorithms to be run
-ApplicationMgr.TopAlg = { "FortranAlgorithm" };
-
-//--------------------------------------------------------------
-// Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-//--------------------------------------------------------------
-
-MessageSvc.OutputLevel = 2;
-MessageSvc.useColors = true;
-
-//--------------------------------------------------------------
-// Event related parameters
-//--------------------------------------------------------------
-
-// dummy event loop
-ApplicationMgr.EvtSel = "NONE";
-// Number of events to be processed (default is 10)
-ApplicationMgr.EvtMax = 1;
-
-//--------------------------------------------------------------
-// Algorithms Private Options
-//--------------------------------------------------------------
-
-// For the FortranAlgorithm algorithm
-FortranAlgorithm.LUN = 42;
-FortranAlgorithm.fileName = "FortranAlgorithmInput.data";
-
-//==============================================================
-//
-// End of job options file
-//
-//##############################################################
-
diff --git a/Control/AthenaExamples/AthExFortranAlgorithm/src/FortranAlgorithm.cxx b/Control/AthenaExamples/AthExFortranAlgorithm/src/FortranAlgorithm.cxx
index 70fe0e0cd6db2630c99685f301a0833586ff0754..85584df4eceb470d162a6bfae31b35e43f8474e2 100755
--- a/Control/AthenaExamples/AthExFortranAlgorithm/src/FortranAlgorithm.cxx
+++ b/Control/AthenaExamples/AthExFortranAlgorithm/src/FortranAlgorithm.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "AthExFortranAlgorithm/FortranAlgorithm.h"
+#include "FortranAlgorithm.h"
extern "C" {
void initialize_(const int& lun, const char*, int);
diff --git a/Control/AthenaExamples/AthExFortranAlgorithm/AthExFortranAlgorithm/FortranAlgorithm.h b/Control/AthenaExamples/AthExFortranAlgorithm/src/FortranAlgorithm.h
old mode 100755
new mode 100644
similarity index 100%
rename from Control/AthenaExamples/AthExFortranAlgorithm/AthExFortranAlgorithm/FortranAlgorithm.h
rename to Control/AthenaExamples/AthExFortranAlgorithm/src/FortranAlgorithm.h
diff --git a/Control/AthenaExamples/AthExFortranAlgorithm/src/components/FortranAlgorithm_entries.cxx b/Control/AthenaExamples/AthExFortranAlgorithm/src/components/FortranAlgorithm_entries.cxx
index 79f2167acf60da3c21029899bb356b9d74708817..46a80de068fc5f6752d50f2fef1804894efc9c0a 100644
--- a/Control/AthenaExamples/AthExFortranAlgorithm/src/components/FortranAlgorithm_entries.cxx
+++ b/Control/AthenaExamples/AthExFortranAlgorithm/src/components/FortranAlgorithm_entries.cxx
@@ -1,4 +1,4 @@
-#include "AthExFortranAlgorithm/FortranAlgorithm.h"
+#include "../FortranAlgorithm.h"
DECLARE_COMPONENT( FortranAlgorithm )
diff --git a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
index dbd0e1826a7467a1f7637dd7d73057778f41d1dd..e5663de19125a4e3e9e63d2542d94add98856fbe 100644
--- a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: AthExHelloWorld
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExHelloWorld )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaConfiguration )
-
# Component(s) in the package:
atlas_add_component( AthExHelloWorld
src/*.cxx
@@ -19,25 +10,25 @@ atlas_add_component( AthExHelloWorld
LINK_LIBRARIES GaudiKernel AthenaBaseComps )
# Install files from the package:
-atlas_install_headers( AthExHelloWorld )
atlas_install_joboptions( share/*.py )
atlas_install_python_modules( python/HelloWorldConfig.py
POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# Test(s) in the package:
atlas_add_test( AthExHelloWorld
- ENVIRONMENT THREADS=0
- SCRIPT test/test_AthExHelloWorld.sh
- )
+ ENVIRONMENT THREADS=0
+ SCRIPT test/test_AthExHelloWorld.sh )
atlas_add_test( AthExHelloWorldMT_1
- ENVIRONMENT THREADS=1
- SCRIPT test/test_AthExHelloWorld.sh
- )
+ ENVIRONMENT THREADS=1
+ SCRIPT test/test_AthExHelloWorld.sh )
atlas_add_test( AthExHelloWorldMT_2
- ENVIRONMENT THREADS=2
- SCRIPT test/test_AthExHelloWorld.sh
- LOG_IGNORE_PATTERN "AthenaHiveEventLoopMgr.* processing event|^HelloWorld .*(INFO|WARNING A WARNING|ERROR An ERROR|FATAL A FATAL)|my message to the world" #processing order can change
- )
-
-atlas_add_test( AthExHelloWorld_CfgTest SCRIPT python -m AthExHelloWorld.HelloWorldConfig POST_EXEC_SCRIPT nopost.sh )
+ ENVIRONMENT THREADS=2
+ SCRIPT test/test_AthExHelloWorld.sh
+ LOG_IGNORE_PATTERN "AthenaHiveEventLoopMgr.* processing event|^HelloWorld .*(INFO|WARNING A WARNING|ERROR An ERROR|FATAL A FATAL)|my message to the world" #processing order can change
+ )
+
+atlas_add_test( AthExHelloWorld_CfgTest
+ SCRIPT python -m AthExHelloWorld.HelloWorldConfig
+ POST_EXEC_SCRIPT nopost.sh )
diff --git a/Control/AthenaExamples/AthExHistNtup/CMakeLists.txt b/Control/AthenaExamples/AthExHistNtup/CMakeLists.txt
index a36347ca4948964739b93b01ca5a695aa428abad..daf3ff1524b4d213c463437d953a1c9de5626adb 100644
--- a/Control/AthenaExamples/AthExHistNtup/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExHistNtup/CMakeLists.txt
@@ -1,16 +1,8 @@
-################################################################################
-# Package: AthExHistNtup
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExHistNtup )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Event/xAOD/xAODEventInfo
- GaudiKernel )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -22,5 +14,4 @@ atlas_add_component( AthExHistNtup
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODEventInfo GaudiKernel )
# Install files from the package:
-atlas_install_joboptions( share/HistNtupOptions.txt share/HistNtupOptions.py )
-
+atlas_install_joboptions( share/HistNtupOptions.py )
diff --git a/Control/AthenaExamples/AthExHistNtup/share/HistNtupOptions.txt b/Control/AthenaExamples/AthExHistNtup/share/HistNtupOptions.txt
deleted file mode 100755
index b65951289491d3069760b0ee4b14264cc67d66e2..0000000000000000000000000000000000000000
--- a/Control/AthenaExamples/AthExHistNtup/share/HistNtupOptions.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-//##############################################################
-//
-// Job options file
-//
-//==============================================================
-
-#include "AthenaCommon/Atlas_ZebraTDR.UnixStandardJob.txt"
-
-// For ddcnvsvc
-#include "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.txt"
-#include"InDetMgrDetDescrCnv/InDetMgrDetDescrCnv_joboptions.txt"
-#include "LArDetMgrDetDescrCnv/LArDetMgrDetDescrCnv_joboptions.txt"
-//FIXME #include "TileDetMgrDetDescrCnv/TileDetMgrDetDescrCnv_joboptions.txt"
-#include "MuonDetMgrDetDescrCnv/MuonDetMgrDetDescrCnv_joboptions.txt"
-
-// Turn on the reading of the dictionary
-DetDescrCnvSvc.DecodeIdDict = true;
-
-//--------------------------------------------------------------
-// Private Application Configuration options
-//--------------------------------------------------------------
-//load relevant libraries
-ApplicationMgr.DLLs += { "AthExHistNtup" };
-
-// Select the appropriate shared library
-ApplicationMgr.DLLs += { "HbookCnv" };
-////ApplicationMgr.DLLs += { "RootHistCnv" };
-
-// Select HBOOK or ROOT persistency (HBOOK is default)
-ApplicationMgr.HistogramPersistency = "HBOOK";
-
-ApplicationMgr.TopAlg = { "Hist" };
-ApplicationMgr.TopAlg += { "Ntup" };
-
-//--------------------------------------------------------------
-// For Zebra input: identify your input runs.
-//--------------------------------------------------------------
-
-// Provide a first/last range or a list
-//EventSelector.runs = {1, 100000};
-EventSelector.firstRun = 1;
-EventSelector.lastRun = 100000;
-//--------------------------------------------------------------
-// Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-//--------------------------------------------------------------
-
-Hist.OutputLevel = 2;
-Ntup.OutputLevel = 2;
-MessageSvc.useColors = true;
-
-//--------------------------------------------------------------
-// Histogram output file
-//--------------------------------------------------------------
-
-// Specify the appropriate output file type
-HistogramPersistencySvc.OutputFile = "histo.hbook";
-//HistogramPersistencySvc.OutputFile = "histo.rt";
-
-//--------------------------------------------------------------
-// Ntuples
-//--------------------------------------------------------------
-
-NTupleSvc.Output = { "FILE1 DATAFILE='tuple1.hbook' OPT='NEW'" };
-
-//--------------------------------------------------------------
-// Event related parameters
-//--------------------------------------------------------------
-
-// Number of events to be processed (default is 10)
-ApplicationMgr.EvtMax = 10;
-
-//--------------------------------------------------------------
-// Algorithms Private Options
-//--------------------------------------------------------------
-
-//==============================================================
-//
-// End of job options file
-//
-//##############################################################
-
diff --git a/Control/AthenaExamples/AthExHive/CMakeLists.txt b/Control/AthenaExamples/AthExHive/CMakeLists.txt
index 36e4966543212d6b39add94051ee20de2b3c619e..07fd1441b11401c304a0b0fa0b8f18fec2c5eb04 100644
--- a/Control/AthenaExamples/AthExHive/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExHive/CMakeLists.txt
@@ -1,38 +1,30 @@
-################################################################################
-# Package: AthExHive
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExHive )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/StoreGate
- Event/xAOD/xAODEventInfo
- GaudiKernel )
+# External dependencies:
+find_package( Boost )
+# Component(s) in the package:
atlas_add_library( AthExHiveLib
AthExHive/*.h
INTERFACE
PUBLIC_HEADERS AthExHive
LINK_LIBRARIES AthenaKernel GaudiKernel)
-# Component(s) in the package:
atlas_add_component( AthExHive
src/*.cxx
src/condEx/*.cxx
src/loopTest/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaKernel AthenaBaseComps xAODEventInfo AthExHiveLib )
+ LINK_LIBRARIES AthenaKernel AthenaBaseComps StoreGateLib xAODEventInfo AthExHiveLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/condDb.txt )
+# Tests in the package:
atlas_add_test ( AthExHive_test
SCRIPT test/AthExHive_test.sh
PROPERTIES TIMEOUT 300
diff --git a/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt b/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt
index c4c11a9058091c4caca280e68527f66478e9b5c0..18a1048dae4de9ed9d6f05a25852f57409b34b98 100644
--- a/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExJobOptions/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: AthExJobOptions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExJobOptions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/StoreGate
- Event/EventInfo )
-
# Component(s) in the package:
atlas_add_component( AthExJobOptions
src/*.cxx
@@ -22,9 +10,7 @@ atlas_add_component( AthExJobOptions
LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel StoreGateLib SGtests EventInfo )
# Install files from the package:
-atlas_install_headers( AthExJobOptions )
-atlas_install_python_modules( python/*.py
- POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
# Tests in this package:
diff --git a/Control/AthenaExamples/AthExMonitored/CMakeLists.txt b/Control/AthenaExamples/AthExMonitored/CMakeLists.txt
index 9e81614b6749b54261dbe0c4eac6ce6e043d2f70..fdb8f84aee74b7d98573fe47c4af132a59614bb3 100644
--- a/Control/AthenaExamples/AthExMonitored/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExMonitored/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: AthExMonitored
-################################################################################
+# Copyright (C) 20022020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExMonitored )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaMonitoringKernel )
-
# Component(s) in the package:
atlas_add_component( AthExMonitored
src/*.cxx
@@ -20,4 +11,4 @@ atlas_add_component( AthExMonitored
# Install files from the package:
atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Control/AthenaExamples/AthExRunExamples/CMakeLists.txt b/Control/AthenaExamples/AthExRunExamples/CMakeLists.txt
deleted file mode 100644
index ea0cc987cdf33315acb06715d4419cd905b837a8..0000000000000000000000000000000000000000
--- a/Control/AthenaExamples/AthExRunExamples/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Package: AthExRunExamples
-################################################################################
-
-# Declare the package name:
-atlas_subdir( AthExRunExamples )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaExamples/AthExFortranAlgorithm
- Control/AthenaExamples/AthExHelloWorld
- Control/AthenaExamples/AthExHistNtup
- Control/AthenaExamples/AthExStoreGateExample
- Control/AthenaExamples/ToyConversion
- Control/MinimalRunTime )
-
diff --git a/Control/AthenaExamples/AthExRunHelloWorld/CMakeLists.txt b/Control/AthenaExamples/AthExRunHelloWorld/CMakeLists.txt
deleted file mode 100644
index 912845c46ffb452d9ff82206af5af8c4ebf5547a..0000000000000000000000000000000000000000
--- a/Control/AthenaExamples/AthExRunHelloWorld/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-# Package: AthExRunHelloWorld
-################################################################################
-
-# Declare the package name:
-atlas_subdir( AthExRunHelloWorld )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaExamples/AthExHelloWorld
- Control/MinimalRunTime )
-
diff --git a/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt b/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt
index 392daf9e3bb4acc4dcfcb0fd6b31babb63494bcd..9cdec175534b6bd79c46b31366e1a9a2066fda2b 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExStoreGateExample/CMakeLists.txt
@@ -1,63 +1,35 @@
-################################################################################
-# Package: AthExStoreGateExample
-################################################################################
+# Copyright (C) 20022020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExStoreGateExample )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/SGTools
- PRIVATE
- AtlasTest/TestTools
- Control/AthContainers
- Control/AthLinks
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/PileUpTools
- Control/StoreGate
- Event/EventInfo
- Event/xAOD/xAODEventInfo
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( SGTutorialLib
Tutorial/LinkObj.cxx
Tutorial/SGRead.cxx
Tutorial/SGWrite.cxx
PUBLIC_HEADERS AthExStoreGateExample
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaKernel SGTools PileUpToolsLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools AthContainers AthLinks AthenaBaseComps CxxUtils EventInfo xAODEventInfo GaudiKernel )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel StoreGateLib
+ PRIVATE_LINK_LIBRARIES AthLinks )
-atlas_add_library( SGTutorial
- Tutorial/SGTutorial_entries.cxx
- PUBLIC_HEADERS AthExStoreGateExample
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaKernel SGTools PileUpToolsLib StoreGateLib SGtests SGTutorialLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools AthContainers AthLinks AthenaBaseComps CxxUtils EventInfo xAODEventInfo GaudiKernel )
+atlas_add_component( SGTutorial
+ Tutorial/SGTutorial_entries.cxx
+ LINK_LIBRARIES SGTutorialLib )
atlas_add_component( AthExStoreGateExample
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES SGTutorialLib )
+ LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps EventInfo PileUpToolsLib SGTools SGTutorialLib TestTools )
atlas_add_component( AthExDFlow
src_dflow/*.cxx
src_dflow/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES SGTutorialLib )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel SGTools StoreGateLib xAODEventInfo )
atlas_add_dictionary( AthExStoreGateExampleDict
AthExStoreGateExample/AthExStoreGateExampleDict.h
AthExStoreGateExample/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel SGTools TestTools AthContainers AthLinks AthenaBaseComps CxxUtils PileUpToolsLib StoreGateLib SGtests EventInfo xAODEventInfo GaudiKernel SGTutorialLib SGTutorial )
+ LINK_LIBRARIES SGTutorialLib )
# Install files from the package:
atlas_install_joboptions( share/StoreGateExample_Gen_jobOptions.txt share/StoreGateExample_Gen_jobOptions.py share/StoreGateExample_Del_jobOptions.py share/StoreGateExample_Reentrant_jobOptions.py share/dflow_jobo.py share/StoreGateHiveExample.py share/HandleTest_jobOptions.py )
diff --git a/Control/AthenaExamples/AthExThinning/CMakeLists.txt b/Control/AthenaExamples/AthExThinning/CMakeLists.txt
index d9772fad11e3e81853506f673268f051a46fccf2..23b8c785e64109549caeed3b350b99a14a04949a 100644
--- a/Control/AthenaExamples/AthExThinning/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExThinning/CMakeLists.txt
@@ -1,29 +1,8 @@
-################################################################################
-# Package: AthExThinning
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExThinning )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthLinks
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthenaPython
- Control/AthenaServices
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolUtilities
- GaudiKernel
- PRIVATE
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
-# External dependencies:
-find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( AthExThinningEvent
src_lib/AthExIParticle.cxx
@@ -38,31 +17,25 @@ atlas_add_library( AthExThinningEvent
src_lib/AthExParticles_p1.cxx
src_lib/AthExFatObject_p1.cxx
PUBLIC_HEADERS AthExThinning
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps AthenaKernel AthenaPoolUtilities GaudiKernel DataModelAthenaPoolLib StoreGateLib SGtests AthenaPoolCnvSvcLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} )
+ LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib GaudiKernel StoreGateLib )
atlas_add_component( AthExThinningAlgs
src_lib/CreateData.cxx
src_lib/WriteThinnedData.cxx
src_lib/ReadThinnedData.cxx
src_lib/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent )
+ LINK_LIBRARIES AthExThinningEvent )
atlas_add_poolcnv_library( AthExThinningPoolCnv
src/*.cxx
FILES AthExThinning/AthExParticles.h AthExThinning/AthExIParticles.h AthExThinning/AthExDecay.h AthExThinning/AthExElephantino.h AthExThinning/AthExFatObject.h
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent )
+ LINK_LIBRARIES AthExThinningEvent AthenaPoolCnvSvcLib )
atlas_add_dictionary( AthExThinningEventDict
AthExThinning/AthExThinningEventDict.h
AthExThinning/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent
- ELEMENT_LINKS AthExParticles AthExIParticles )
+ LINK_LIBRARIES AthExThinningEvent
+ ELEMENT_LINKS AthExParticles AthExIParticles )
# Install files from the package:
atlas_install_python_modules( python/*.py
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
index ca46b7f5cb5b50f0c04ed123e443382b4abef7f7..dc888c9f957b9b7ff92ad561959ac7b3be36048a 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// CreateData.cxx
@@ -14,9 +14,7 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-
-// CLHEP
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
@@ -133,10 +131,10 @@ StatusCode CreateData::makeData( const std::string& test )
}
for ( unsigned int i = 0; i != m_nbrParticles.value(); ++i ) {
- AthExParticle * p = new AthExParticle( (i+1) * 10. * CLHEP::GeV,
- (i+1) * 10. * CLHEP::GeV,
- (i+1) * 10. * CLHEP::GeV,
- (i+2) * 10. * CLHEP::GeV );
+ AthExParticle * p = new AthExParticle( (i+1) * 10. * Gaudi::Units::GeV,
+ (i+1) * 10. * Gaudi::Units::GeV,
+ (i+1) * 10. * Gaudi::Units::GeV,
+ (i+2) * 10. * Gaudi::Units::GeV );
particles->push_back(p);
}
@@ -174,7 +172,7 @@ StatusCode CreateData::makeData( const std::string& test )
dcy->setDecay( p1, p2, l1, l2 );
- const double igev = 1. / CLHEP::GeV;
+ const double igev = 1. / Gaudi::Units::GeV;
ATH_MSG_INFO
("Created a Decay from :" << endmsg
<< " p1: px= " << dcy->p1()->px() * igev << endmsg
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
index 2910d8f7045dcacfb3574136ffbce966961e9630..041cd35a1593b3ae4177cc37d3df23cbcc711736 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ReadThinnedData.cxx
@@ -15,13 +15,11 @@
// FrameWork includes
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Property.h"
+#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
-// CLHEP includes
-#include "CLHEP/Units/SystemOfUnits.h"
-
// AthExThinning includes
#include "AthExThinning/AthExParticles.h"
#include "AthExThinning/AthExDecay.h"
@@ -150,7 +148,7 @@ StatusCode ReadThinnedData::checkTest( const std::string& testName )
return StatusCode::RECOVERABLE;
}
- const double igev = 1. / CLHEP::GeV;
+ const double igev = 1. / Gaudi::Units::GeV;
ATH_MSG_DEBUG
("IN particles: " << particles->size() << endmsg
<< "IN iparticles: " << iparticles->size() << endmsg
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
index 4b87c15154e622c3808e9bff760a040f8f084606..fd310189da9dd485893c179befbbeb500eeced74 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// WriteThinnedData.cxx
@@ -16,9 +16,7 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-
-// CLHEP
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
@@ -160,7 +158,7 @@ StatusCode WriteThinnedData::test( const EventContext& ctx,
// fetch Elephantino
SG::ReadHandle<AthExElephantino> elephantino (m_elephantinoKeys[testNum], ctx);
- const double igev = 1. / CLHEP::GeV;
+ const double igev = 1. / Gaudi::Units::GeV;
ATH_MSG_DEBUG("IN particles: " << particles->size() << endmsg
<< "IN decay: " << endmsg
<< " p1: px= " << decay->p1()->px() * igev << endmsg
@@ -224,7 +222,7 @@ StatusCode WriteThinnedData::doThinningTest1( const EventContext& ctx,
SG::ThinningHandle<AthExParticles> particles (particlesKey, ctx);
std::vector<bool> filter = m_filter.value();
- const double igev = 1. / CLHEP::GeV;
+ const double igev = 1. / Gaudi::Units::GeV;
msg(MSG::INFO) << "Particles | filter :" << endmsg;
for ( unsigned int i = 0; i != particles->size(); ++i ) {
const std::string kr = filter[i] ? "keep" : "remove";
@@ -303,7 +301,7 @@ StatusCode WriteThinnedData::doThinningTest2( const EventContext& ctx,
SG::ThinningHandle<AthExParticles> particles (particlesKey, ctx);
std::vector<bool> filter = m_filter.value();
- const double igev = 1. / CLHEP::GeV;
+ const double igev = 1. / Gaudi::Units::GeV;
msg(MSG::INFO) << "Particles | filter :" << endmsg;
for ( unsigned int i = 0; i != particles->size(); ++i ) {
const std::string kr = filter[i] ? "keep" : "remove";
@@ -383,7 +381,7 @@ WriteThinnedData::doThinningTest3( const EventContext& ctx,
SG::ThinningHandle<AthExIParticles> iparticles (iparticlesKey, ctx);
std::vector<bool> filter = m_filter.value();
- const double igev = 1. / CLHEP::GeV;
+ const double igev = 1. / Gaudi::Units::GeV;
msg(MSG::INFO) << "IParticles | filter :" << endmsg;
for ( unsigned int i = 0; i != iparticles->size(); ++i ) {
const std::string kr = filter[i] ? "keep" : "remove";
diff --git a/Control/AthenaExamples/AthExUnittest/CMakeLists.txt b/Control/AthenaExamples/AthExUnittest/CMakeLists.txt
index 17e031707b6333b6eca12ec90d4c8d2c2234d329..f6961cf34b356be27279388eab439e27f5ff0c3a 100644
--- a/Control/AthenaExamples/AthExUnittest/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExUnittest/CMakeLists.txt
@@ -1,22 +1,8 @@
-
-#
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-#
-
-################################################################################
-# Package: MyPackage
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthExUnittest )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- AtlasTest/GoogleTestTools )
-
# The component lib:
atlas_add_component( AthExUnittest
AthExUnittest/*.h src/*.cxx
@@ -28,5 +14,3 @@ atlas_add_component( AthExUnittest
atlas_add_test( gt_AthExUnittest
SOURCES test/gt_AthExUnittest.cxx
LINK_LIBRARIES GaudiKernel GoogleTestTools AthenaBaseComps )
-
-
diff --git a/Control/AthenaExamples/MultiInputExample/CMakeLists.txt b/Control/AthenaExamples/MultiInputExample/CMakeLists.txt
index b128b6b1751901f10608a98abc6f1d871db1f653..e81a67699c0170fc3b489290d91df91f16f18a7c 100644
--- a/Control/AthenaExamples/MultiInputExample/CMakeLists.txt
+++ b/Control/AthenaExamples/MultiInputExample/CMakeLists.txt
@@ -1,27 +1,13 @@
-################################################################################
-# Package: MultiInputExample
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MultiInputExample )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- PRIVATE
- Control/PileUpTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData
- Event/EventInfo )
-
# Component(s) in the package:
atlas_add_component( MultiInputExample
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel PileUpToolsLib StoreGateLib SGtests AthenaPoolExampleData EventInfo )
+ LINK_LIBRARIES AthenaBaseComps AthenaPoolExampleData EventInfo GaudiKernel PileUpToolsLib )
# Install files from the package:
-atlas_install_headers( MultiInputExample )
atlas_install_joboptions( share/MultiInputInit.py )
-
diff --git a/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx b/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx
index 157ff28157ea49605fbb22ee189846336f2aa8bd..08516518720e4b412601c7cb1ee76dbd09a2eede 100644
--- a/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx
+++ b/Control/AthenaExamples/MultiInputExample/src/MyAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "MultiInputExample/MyAlg.h"
+#include "MyAlg.h"
#include "GaudiKernel/MsgStream.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Control/AthenaExamples/MultiInputExample/MultiInputExample/MyAlg.h b/Control/AthenaExamples/MultiInputExample/src/MyAlg.h
similarity index 100%
rename from Control/AthenaExamples/MultiInputExample/MultiInputExample/MyAlg.h
rename to Control/AthenaExamples/MultiInputExample/src/MyAlg.h
diff --git a/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx b/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx
index 3d26b089e0588debb8e35f85dd4b6a2008e7a924..4d5a7ec94d29a4ea4071bffb52905876320312bf 100644
--- a/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx
+++ b/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "MultiInputExample/MyMultiInputAlg.h"
+#include "MyMultiInputAlg.h"
#include "GaudiKernel/MsgStream.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Control/AthenaExamples/MultiInputExample/MultiInputExample/MyMultiInputAlg.h b/Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.h
similarity index 100%
rename from Control/AthenaExamples/MultiInputExample/MultiInputExample/MyMultiInputAlg.h
rename to Control/AthenaExamples/MultiInputExample/src/MyMultiInputAlg.h
diff --git a/Control/AthenaExamples/MultiInputExample/src/components/MultiInputExample_entries.cxx b/Control/AthenaExamples/MultiInputExample/src/components/MultiInputExample_entries.cxx
index a5f5eecb394179c35c485b1ebaa71cfeb99d0f25..d6a5ea0486c19018875fc1956fc73d939f2165ac 100644
--- a/Control/AthenaExamples/MultiInputExample/src/components/MultiInputExample_entries.cxx
+++ b/Control/AthenaExamples/MultiInputExample/src/components/MultiInputExample_entries.cxx
@@ -1,4 +1,4 @@
-#include "MultiInputExample/MyMultiInputAlg.h"
+#include "../MyMultiInputAlg.h"
DECLARE_COMPONENT( MyMultiInputAlg )
diff --git a/Control/AthenaExamples/ToyConversion/CMakeLists.txt b/Control/AthenaExamples/ToyConversion/CMakeLists.txt
index 328473afacd9a41822d901060993614559d058f2..b77ed8aceabb33dc29502a70ce3d52e47aea1b54 100644
--- a/Control/AthenaExamples/ToyConversion/CMakeLists.txt
+++ b/Control/AthenaExamples/ToyConversion/CMakeLists.txt
@@ -1,15 +1,8 @@
-################################################################################
-# Package: ToyConversion
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ToyConversion )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_library( ToyConversionLib
src/*.cxx
@@ -22,4 +15,3 @@ atlas_add_component( ToyConversion
# Install files from the package:
atlas_install_joboptions( share/ToyConversionOpts.txt share/ToyConversionOpts.py )
-