diff --git a/AtlasTest/AthenaMPTest/cmt/requirements b/AtlasTest/AthenaMPTest/cmt/requirements
deleted file mode 100644
index c85c632d5b29e105a2780725f750179ed3d84d9f..0000000000000000000000000000000000000000
--- a/AtlasTest/AthenaMPTest/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package AthenaMPTest
-author Mous Tatarkhanov <tmmous@berkeley.edu>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasReconstructionRunTime AtlasReconstructionRunTime-* -no_auto_imports
-use TestPolicy TestPolicy-*
-use TestTools TestTools-* AtlasTest
-
-apply_pattern declare_joboptions files="*.py"
-
-#integration tests
-apply_pattern install_applications
-apply_pattern install_xmls
-
-private
-apply_pattern validate_xml
-public
-
diff --git a/AtlasTest/ControlTest/cmt/requirements b/AtlasTest/ControlTest/cmt/requirements
deleted file mode 100644
index 10dc87460bf1d752b6f5bcca53c01a81d6bacb2d..0000000000000000000000000000000000000000
--- a/AtlasTest/ControlTest/cmt/requirements
+++ /dev/null
@@ -1,106 +0,0 @@
-package ControlTest
-author Paolo Calafiura <Paolo.Calafiura@cern.ch>
-use AtlasPolicy AtlasPolicy-*
-
-use MinimalRunTime MinimalRunTime-* Control -no_auto_imports
-
-#apply_pattern declare_runtime_extras extras="pre.sh"
-#apply_pattern declare_scripts files="pre.sh"
-
-use TestPolicy TestPolicy-*
-use TestTools TestTools-* AtlasTest
-
-#FIXME AthenaServices should not be needed but actually is (make check fails)
-#use AthenaServices AthenaServices-* Control
-use AthenaPython AthenaPython-* Control -no_auto_imports
-
-#SGTools/SGComps test that can't be run there due to ToyConversion dep
-#use SGComps SGComps-* Control
-
-private
-use GaudiInterface GaudiInterface-* External
-use CxxUtils CxxUtils-* Control
-use AthenaKernel AthenaKernel-* Control
-use AthContainers AthContainers-* Control
-use AthLinks AthLinks-* Control
-use SGTools SGTools-* Control
-use StoreGate StoreGate-* Control
-use ToyConversion ToyConversion-* Control/AthenaExamples
-end_private
-
-macro PPSoptignore "" \
- optimized "requestRelease|"
-
-
-apply_pattern UnitTest_run unit_test=DataProxy \
- extrapatterns="HistogramPersis.* +INFO|EventPersistenc.*INFO|^JobOptionsSvc +INFO|IConversionSvc ptr not set"
-apply_pattern UnitTest_run unit_test=ProxyProviderSvc \
- extrapatterns="$(PPSoptignore)^ClassIDSvc +DEBUG|Histogram.* (DEBUG|INFO)|DetectorStore +DEBUG|ToyConversionSvc +DEBUG|EventDataSvc +DEBUG|EventPersis.* +(DEBUG|INFO)|HistoryStore +DEBUG|^JobOptionsSvc +INFO|^DataProxy +VERBOSE|^ProxyProviderSvc +DEBUG|^ServiceManager +DEBUG|Service base class initialized successfully|found service"
-
-#DataModel tests that can't be run there due to StoreGate dep
-apply_pattern UnitTest_run unit_test=CircularDep \
- extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-apply_pattern UnitTest_run unit_test=SGDataLink \
- extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-apply_pattern UnitTest_run unit_test=ElementLink \
- extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-apply_pattern UnitTest_run unit_test=ElementLinkVector \
- extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-
-#StoreGate tests that are better run here due to the SGComps (PPS) run-time dependency
-apply_pattern declare_joboptions files="StoreGateTestCommon.txt *.py"
-
-apply_pattern UnitTest_run unit_test=StoreGateSvcClient extrapatterns="modifiable when retrieved|HistogramPersis.* +INFO|^JobOptionsSvc +INFO|Service base class initialized successfully|VERBOSE committing dataObj|DetectorStore.*error setting up proxy|DetectorStore.*record_impl: failed"
-macro_append StoreGateSvcClient_testlinkopts " -lSGtests"
-apply_pattern UnitTest_run unit_test=ClearStore \
- extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-macro_append ClearStore_testlinkopts " -lSGtests"
-#macro ClearStore_test_cppflags " -D __PROXYDEBUG"
-
-apply_pattern UnitTest_run unit_test=StoreID \
- extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
-
-#integration tests
-apply_pattern install_applications
-apply_pattern install_xmls
-
-#FIXME does not work
-#apply_pattern athenarun_test name="<example>" \
-# pre_script="../cmt/setup.sh" \
-# options=" AthEx<example>/<example>Options.txt" \
-# post_script="'${TESTTOOLSROOT}/share/post.sh <example>'"
-
-#apply_pattern athexample_run example="FortranAlgorithm"
-
-use AthExFortranAlgorithm AthExFortranAlgorithm-* Control/AthenaExamples -no_auto_imports
-apply_pattern athenarun_test name="FortranAlgorithm" \
- pre_script="preFortAlgEx.sh" \
- options="AthExFortranAlgorithm/FortranAlgorithmOptions.py" \
- post_script="${TESTTOOLSROOT}/share/post.sh FortranAlgorithm $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^ newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc$(q)"
-
-macro SGGoptignore "" \
- optimized "|Retrieved const handle to default object|of type EventInfo|object not modifiable when retrieved|requestRelease"
-use AthExStoreGateExample AthExStoreGateExample-* Control/AthenaExamples -no_auto_imports
-
-apply_pattern athenarun_test name="StoreGateReentrant" \
- pre_script="../cmt/setup.sh" \
- options="AthExStoreGateExample/StoreGateExample_Reentrant_jobOptions.py" \
- post_script="${TESTTOOLSROOT}/share/post.sh StoreGateReentrant $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$$(SGGoptignore)|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^ newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc|TExMap::Remove$(q)"
-
-apply_pattern athenarun_test name="StoreGateGen" \
- pre_script="../cmt/setup.sh" \
- options="AthExStoreGateExample/StoreGateExample_Gen_jobOptions.py" \
- post_script="${TESTTOOLSROOT}/share/post.sh StoreGateGen $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$$(SGGoptignore)|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^ newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|Start StoreGateSvc$(q)"
-
-apply_pattern athenarun_test name="StoreGateDFlow" \
- pre_script="../cmt/setup.sh" \
- options="AthExStoreGateExample/dflow_jobo.py" \
- post_script="${TESTTOOLSROOT}/share/post.sh StoreGateDFlow $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|ToolSvc.finalize.. +INFO|^WriteData +INFO in initialize$$| [A-Z]+ 2[0-9][0-9][0-9]$$$(SGGoptignore)|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^ newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|object not modifiable when retrieved|Retrieved const handle to default|type EventInfo|^StoreGateSvc +DEBUG|^ of type|object modifiable when retrieved|ApplicationMgr +INFO|WARNING could not get proxy for key|Start StoreGateSvc$(q)"
-
-apply_pattern athenarun_test name="test_interactive_athena" \
- pre_script="../cmt/setup.sh" \
- options="ControlTest/test_interactive_athena.py" \
- post_script="${TESTTOOLSROOT}/share/post.sh test_interactive_athena $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^ newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc|already in TClassTable$(q)"
-
-## AthenaCommon/python unit-test
-apply_pattern declare_python_modules files="*.py"
diff --git a/AtlasTest/CppUnitExample/cmt/requirements b/AtlasTest/CppUnitExample/cmt/requirements
deleted file mode 100755
index b308548bf678aed8e20402715cd5df52b7eff864..0000000000000000000000000000000000000000
--- a/AtlasTest/CppUnitExample/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package CppUnitExample
-
-author Alex Undrus <undrus@bnl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use TestPolicy TestPolicy-*
-use TestTools TestTools-* AtlasTest
-
-# Run CppUnit tests:
-apply_pattern CppUnit name=ComplexNumber files="-s=../test ComplexNumberTest_CppUnit.cxx"
-
-# Can add a second test:
-apply_pattern CppUnit name=2ndComplexNumber files="-s=../test ComplexNumberTest_CppUnit.cxx"
-
-
-
-
diff --git a/AtlasTest/CppUnitSGServiceExample/cmt/requirements b/AtlasTest/CppUnitSGServiceExample/cmt/requirements
deleted file mode 100755
index 8e2c5a0e1b92839f448d327de52b9db43b9bae60..0000000000000000000000000000000000000000
--- a/AtlasTest/CppUnitSGServiceExample/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package CppUnitSGServiceExample
-
-author Alex Undrus <undrus@bnl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use TestPolicy TestPolicy-*
-use TestTools TestTools-* AtlasTest
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use DataModel DataModel-* Control
-use StoreGate StoreGate-* Control
-
-# Run CppUnit tests:
-apply_pattern CppUnit name=SimpleDataVector files="-s=../test SimpleDataVectorTest_CppUnit.cxx"
-
-
-
-
-
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements b/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements
deleted file mode 100644
index 1956dd63e16bba7cb3f902700f1778ffec5a79c6..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/cmt/requirements
+++ /dev/null
@@ -1,49 +0,0 @@
-package AthenaDBTestRec
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use CLIDSvc CLIDSvc-* Control
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use AtlasConditionsRunTime AtlasConditionsRunTime-* -no_auto_imports
-
-
-private
-
-use AtlasReflex AtlasReflex-* External
-use AtlasPOOL AtlasPOOL-* External
-use AtlasCOOL AtlasCOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-
-use EventInfo EventInfo-* Event
-use AtlasBoost AtlasBoost-* External
-use CoraCool CoraCool-* Database
-use PersistentDataModel PersistentDataModel-* Database
-
-apply_tag NEEDS_COOL_FACTORY
-
-# Apply the cmake-specific command to access the private headers
-apply_pattern cmake_add_command command="include_directories(src)"
-
-# this builds a dualuse library for Athena from the files in the src/lib dir
-# and a standalone application TestCoolRecWriter from the files in src/app
-# dictionary and POOL converter libraries are also built for the POOL
-# test objects
-
-apply_pattern dual_use_library files="-s=lib *.cxx"
-
-apply_pattern lcgdict dict=AthenaDBTestRecData selectionfile="selection.xml" headerfiles="../AthenaDBTestRec/AthenaDBTestRecDataDict.h"
-
-apply_pattern poolcnv multChanTypes=" TestCoolRecPoolDataColl " files="-s=${AthenaDBTestRec_root}/AthenaDBTestRec TestCoolRecPoolData.h TestCoolRecPoolDataColl.h"
-
-macro_append AthenaDBTestRecPoolCnv_dependencies " AthenaDBTestRecDataDict"
-
-application TestCoolRecWriter -s=app *.cxx
-macro_append TestCoolRecWriter_dependencies " AthenaDBTestRecLib"
-
-apply_pattern declare_joboptions files="*.py"
-
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
index 7283eff42addf9affd9e1d4d4dc1fe6fd275e8b7..ee7fac071580f8ab79284f3a048427327d700f4a 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AthenaDBTestRec/TestCoolRecRead.h"
#include "AthenaDBTestRec/DetStoreDump.h"
-DECLARE_ALGORITHM_FACTORY( TestCoolRecRead )
-DECLARE_ALGORITHM_FACTORY( DetStoreDump )
-
-DECLARE_FACTORY_ENTRIES( AthenaDBTestRec )
-{
- DECLARE_ALGORITHM( TestCoolRecRead )
- DECLARE_ALGORITHM( DetStoreDump )
-}
+DECLARE_COMPONENT( TestCoolRecRead )
+DECLARE_COMPONENT( DetStoreDump )
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
deleted file mode 100644
index f9c746beb1eda23bddcde7146f43ebcf02551923..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaDBTestRec )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/cmt/requirements b/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/cmt/requirements
deleted file mode 100755
index d1db518decb9c6d5969743bfd623e57c3afe21c0..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolDataModelTest/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package AthenaPoolDataModelTest
-
-author Peter van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-01-*
-
-# Test infrastructure
-use TestPolicy TestPolicy-00-*
-use MinimalRunTime MinimalRunTime-00-* Control -no_auto_imports
-
-apply_pattern declare_joboptions files="-s=../share *.py"
-
-# Setup automatic testing which runs with gmake check
-# We define here a macro which can be used to run the tests only on optimized mode.
-macro test_pattern_opt_only "athenarun_test" \
- debug ""
-# ESD_base
-apply_pattern athenarun_test name="ESD_base" pre_script="../test/pre_check.sh ESD_base" options="esdtoesd_base.py" post_script="../test/post_check.sh ESD_base ESDout.pool.root"
-
-# AOD_base
-apply_pattern athenarun_test name="AOD_base" pre_script="../test/pre_check.sh AOD_base" options="aodtoaod_base.py" post_script="../test/post_check.sh AOD_base AODout.pool.root"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/cmt/requirements b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/cmt/requirements
deleted file mode 100755
index 0465ac9dcc207ea217adb067d3119f2a2972a22c..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/cmt/requirements
+++ /dev/null
@@ -1,73 +0,0 @@
-package AthenaPoolMultiTest
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolExampleAlgorithms AthenaPoolExampleAlgorithms-* Database/AthenaPOOL/AthenaPoolExample
-
-use MinimalRunTime MinimalRunTime-* Control -no_auto_imports
-
-private
-use TestPolicy TestPolicy-*
-use AtlasPOOL AtlasPOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use SGTools SGTools-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-use EventInfo EventInfo-* Event
-use ByteStreamData ByteStreamData-* Event
-use ByteStreamCnvSvc ByteStreamCnvSvc-* Event -no_auto_imports
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use DBDataModel DBDataModel-* Database/AthenaPOOL
-use AthenaPoolTestData AthenaPoolTestData-* AtlasTest/DatabaseTest
-use AthenaPoolExampleData AthenaPoolExampleData-* Database/AthenaPOOL/AthenaPoolExample
-use GoodRunsLists GoodRunsLists-* DataQuality
-
-public
-
-# apply_pattern component_library
-apply_pattern dual_use_library files=*.cxx
-
-macro test_patter_opt_only "athenarun_test" \
- debug ""
-
-#macro DOXYGEN_OUTPUT_DIRECTORY "$(doc)Doxygen"
-#macro DOXYGEN_FILE_PATTERNS "*.cxx *.h *.py"
-#macro DOXYGEN_INPUT "../src ../$(package) ../share ../doc"
-
-apply_pattern install_runtime
-#apply_pattern install_applications
-apply_pattern declare_joboptions files="-s=../share *.py"
-
-macro_append AthenaPoolMultiTest_cppflags " `xml2-config --cflags`"
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestBuildInput" pre_script="../test/pre_check.sh AthenaPoolMultiTestBuildInput " options="AthenaPoolMultiTest/SplittableData_jo.py" post_script="../test/post_check_bi.sh AthenaPoolMultiTestBuildInput "
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestCollectInput" pre_script="../test/pre_check.sh AthenaPoolMultiTestCollectInput " options="AthenaPoolMultiTest/TestSimpleCollection.py" post_script="../test/post_check_ci.sh AthenaPoolMultiTestCollectInput "
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestEventSplit" pre_script="../test/pre_check.sh AthenaPoolMultiTestEventSplit " options="AthenaPoolMultiTest/EventSplit_jo.py" post_script="../test/post_check_es.sh AthenaPoolMultiTestEventSplit "
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestCheckCollections" pre_script="../test/pre_check.sh CheckExplicit " options="AthenaPoolMultiTest/CheckExplicit_jo.py" post_script="../test/post_check_co.sh AthenaPoolMultiTestCheckCollections "
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestCheckNull" pre_script="../test/pre_check.sh CheckNull " options="AthenaPoolMultiTest/CheckNull_jo.py" post_script="../test/post_check_cn.sh AthenaPoolMultiTestCheckNull "
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestCheckOutput" pre_script="../test/pre_check.sh CheckImplicit " options="AthenaPoolMultiTest/CheckImplicit_jo.py" post_script="../test/post_check_co.sh AthenaPoolMultiTestCheckOutput "
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestBSMetaWrite" pre_script="../test/pre_check_bs.sh CheckBSWrite " options="AthenaPoolMultiTest/BSMetaWrite.py" post_script="../test/post_check_bs.sh AthenaPoolMultiTestBSMetaWrite "
-
-apply_pattern athenarun_test name="AthenaPoolMultiTestBSMetaWriteNone" pre_script="../test/pre_check.sh CheckBSWriteNone " options="AthenaPoolMultiTest/BSMetaWriteNone.py" post_script="../test/post_check_bs.sh AthenaPoolMultiTestBSMetaWriteNone "
-
-# Tests dependencies
-private
-# CheckExplicit, CheckNull and CheckImplicit tests depend on EventSplit
-macro_append AthenaPoolMultiTestCheckCollections_test_dependencies " AthenaPoolMultiTestEventSplit_test "
-macro_append AthenaPoolMultiTestCheckNull_test_dependencies " AthenaPoolMultiTestEventSplit_test "
-macro_append AthenaPoolMultiTestCheckOutput_test_dependencies " AthenaPoolMultiTestEventSplit_test "
-# EventSplit and TestSimpleCollection depend on SplittableData.
-macro_append AthenaPoolMultiTestEventSplit_test_dependencies " AthenaPoolMultiTestBuildInput_test "
-macro_append AthenaPoolMultiTestCollectInput_test_dependencies " AthenaPoolMultiTestBuildInput_test "
-# SplittableData is first.
-# BS Read must come after write
-macro_append AthenaPoolMultiTestBSMetaWriteNone_test_dependencies " AthenaPoolMultiTestBSMetaWrite_test "
-end_private
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
old mode 100755
new mode 100644
index ff3540db7af16a7d08991b02da39cb1c5aac52b5..9c98761e4f53cc49cbb860e5a439492e276dc281
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
@@ -1,8 +1,3 @@
-/**
- * @file AthenaPoolMultiTest_entries.cxx
- * @brief Required by Gaudi class factory
- */
-
#include "../StoreDump.h"
#include "../PassAllFilter.h"
#include "../PassNoneFilter.h"
@@ -14,30 +9,16 @@
#include "../RunEventTagWriter.h"
#include "../RunEventMetaWriter.h"
#include "../DummyLumirangeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(StoreDump)
-DECLARE_ALGORITHM_FACTORY(PassAllFilter)
-DECLARE_ALGORITHM_FACTORY(PassNoneFilter)
-DECLARE_ALGORITHM_FACTORY(AddTrigMap)
-DECLARE_ALGORITHM_FACTORY(EventSplit)
-DECLARE_ALGORITHM_FACTORY(EventTagReader)
-DECLARE_ALGORITHM_FACTORY(EventTagWriter)
-DECLARE_ALGORITHM_FACTORY(TagEventTagWriter)
-DECLARE_ALGORITHM_FACTORY(RunEventTagWriter)
-DECLARE_ALGORITHM_FACTORY(RunEventMetaWriter)
-DECLARE_ALGORITHM_FACTORY(DummyLumirangeTool)
+DECLARE_COMPONENT( StoreDump )
+DECLARE_COMPONENT( PassAllFilter )
+DECLARE_COMPONENT( PassNoneFilter )
+DECLARE_COMPONENT( AddTrigMap )
+DECLARE_COMPONENT( EventSplit )
+DECLARE_COMPONENT( EventTagReader )
+DECLARE_COMPONENT( EventTagWriter )
+DECLARE_COMPONENT( TagEventTagWriter )
+DECLARE_COMPONENT( RunEventTagWriter )
+DECLARE_COMPONENT( RunEventMetaWriter )
+DECLARE_COMPONENT( DummyLumirangeTool )
-DECLARE_FACTORY_ENTRIES(AthenaPoolMultiTest) {
- DECLARE_ALGORITHM(StoreDump)
- DECLARE_ALGORITHM(PassAllFilter)
- DECLARE_ALGORITHM(PassNoneFilter)
- DECLARE_ALGORITHM(AddTrigMap)
- DECLARE_ALGORITHM(EventSplit)
- DECLARE_ALGORITHM(EventTagReader)
- DECLARE_ALGORITHM(EventTagWriter)
- DECLARE_ALGORITHM(TagEventTagWriter)
- DECLARE_ALGORITHM(RunEventTagWriter)
- DECLARE_ALGORITHM(RunEventMetaWriter)
- DECLARE_ALGORITHM(DummyLumirangeTool)
-}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx
deleted file mode 100755
index b8a9a7543b8173601ec0e51b54dd8b32e61e785f..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file AthenaPoolMultiTest_load.cxx
- * @brief Required by Gaudi class factory
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolMultiTest)
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/cmt/requirements b/AtlasTest/DatabaseTest/AthenaPoolTest/cmt/requirements
deleted file mode 100755
index 56050068aec32df59d2d875f1320ba6bd8247efc..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/cmt/requirements
+++ /dev/null
@@ -1,239 +0,0 @@
-package AthenaPoolTest
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-private
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use StoreGate StoreGate-* Control
-use EventInfo EventInfo-* Event
-use EventInfoMgt EventInfoMgt-* Event
-use AthenaBaseComps AthenaBaseComps-* Control
-
-# Track test
-use Identifier Identifier-* DetectorDescription
-use TrkParameters TrkParameters-* Tracking/TrkEvent
-# use TrkParametersBase TrkParametersBase-* Tracking/TrkEvent
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use TrkMaterialOnTrack TrkMaterialOnTrack-* Tracking/TrkEvent
-use TrkEventPrimitives TrkEventPrimitives-* Tracking/TrkEvent
-use TrkCompetingRIOsOnTrack TrkCompetingRIOsOnTrack-* Tracking/TrkEvent
-use TrkSurfaces TrkSurfaces-* Tracking/TrkDetDescr
-use TrkVertexOnTrack TrkVertexOnTrack-* Tracking/TrkEvent
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-#InDet RIO_OnTrack test
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent
-use InDetRIO_OnTrack InDetRIO_OnTrack-* InnerDetector/InDetRecEvent
-use InDetCompetingRIOsOnTrack InDetCompetingRIOsOnTrack-* InnerDetector/InDetRecEvent
-
-# InDet RDO test
-use InDetRawData InDetRawData-* InnerDetector/InDetRawEvent
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-
-# LAr test
-use LArRecEvent LArRecEvent-* LArCalorimeter
-use CaloIdentifier CaloIdentifier-* Calorimeter
-use CaloEvent CaloEvent-* Calorimeter
-# use CaloUtils CaloUtils-* Calorimeter
-use CaloDetDescr CaloDetDescr-* Calorimeter
-
-# AthenaPoolTest Data
-use AthenaPoolTestData AthenaPoolTestData-* AtlasTest/DatabaseTest
-
-# EventInfo test
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-
-# AthenaPoolUtilities
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-# Test infrastructure
-use TestPolicy TestPolicy-*
-
-apply_pattern component_library
-
-library AthenaPoolTest " AthenaPoolTestDataReader.cxx \
- AthenaPoolTestDataWriter.cxx \
- AthenaPoolTestAttrWriter.cxx \
- AthenaPoolTestAttrReader.cxx \
-# # CaloClusterFakeWriter.cxx \
-# # CaloClusterFakeReader.cxx \
- InDetRawDataFakeReader.cxx \
- InDetRawDataFakeWriter.cxx \
- LArCellContFakeWriter.cxx \
- LArCellContFakeReader.cxx \
- EventInfoWriter.cxx \
- EventInfoReader.cxx \
- PileUpEventInfoWriter.cxx \
- PileUpEventInfoReader.cxx \
- TrkTrackFakeReader.cxx \
- TrkTrackFakeWriter.cxx \
- FakeTrackBuilder.cxx \
- components/*.cxx "
-
-apply_pattern declare_joboptions files="-s=../share *.py"
-
-
-# Setup automatic testing which runs with gmake check
-
-# We define here a macro which can be used to run the tests only on
-# optimized mode.
-macro test_pattern_opt_only "athenarun_test" \
- debug ""
-
-
-
-# Write/read out some simple objects:
-# AthenaPoolTestWrite
-apply_pattern athenarun_test name="AthenaPoolTestWrite" pre_script="../test/pre_check.sh AthenaPoolTestWrite " options="AthenaPoolTest/AthenaPoolTestWrite.py" post_script="../test/post_check_with_select.sh AthenaPoolTestWrite ^..AthenaPoolTestD "
-
-# AthenaPoolTestRead
-apply_pattern athenarun_test name="AthenaPoolTestRead" pre_script="../test/pre_check.sh AthenaPoolTestRead " options="AthenaPoolTest/AthenaPoolTestRead.py" post_script="../test/post_check_with_select.sh AthenaPoolTestRead AthenaPoolTestD "
-# Ensure AthenaPoolTestRead test runs after AthenaPoolTestWrite test completes
-macro_append AthenaPoolTestRead_test_dependencies " AthenaPoolTestWrite_test "
-
-# Add on test of navigation still using simple objects:
-# AthenaPoolTestWrite - Step2 - rewrite part in another file
-apply_pattern athenarun_test name="AthenaPoolTestStep2Write" pre_script="../test/pre_check.sh AthenaPoolTestStep2Write " options="AthenaPoolTest/AthenaPoolTestStep2Write.py" post_script="../test/post_check_with_select.sh AthenaPoolTestStep2Write ^..AthenaPoolTestD "
-macro_append AthenaPoolTestStep2Write_test_dependencies " AthenaPoolTestRead_test "
-
-# AthenaPoolTestReadNav - read back from Step2 - part in one file,
-# part in another file
-apply_pattern athenarun_test name="AthenaPoolTestReadNav" pre_script="../test/pre_check.sh AthenaPoolTestReadNav " options="AthenaPoolTest/AthenaPoolTestReadNav.py" post_script="../test/post_check_with_select.sh AthenaPoolTestReadNav AthenaPoolTestD "
-macro_append AthenaPoolTestReadNav_test_dependencies " AthenaPoolTestStep2Write_test "
-
-# # Copy the Step2 file
-# apply_pattern athenarun_test name="AthenaPoolTestCopy" pre_script="../test/pre_check.sh AthenaPoolTestCopy " options="AthenaPoolTest/AthenaPoolTestCopy.py" post_script="../test/post_check_with_select.sh AthenaPoolTestCopy ^..Stream1 "
-
-# # Remove the Step2 file and read the copy
-# apply_pattern athenarun_test name="AthenaPoolTestReadAfterCopy" pre_script="../test/pre_check.sh AthenaPoolTestReadAfterCopy SimplePoolFile1.root " options="AthenaPoolTest/AthenaPoolTestReadAfterCopy.py" post_script="../test/post_check_with_select.sh AthenaPoolTestReadAfterCopy AthenaPoolTestD "
-
-# # Write/read out PileUpEventInfo:
-# # PileUpEventInfoWrite
-# apply_pattern athenarun_test name="PileUpEventInfoWrite" pre_script="../test/pre_check.sh PileUpEventInfoWrite " options="AthenaPoolTest/PileUpEventInfoWrite.py" post_script="../test/post_check_with_select.sh PileUpEventInfoWrite ^..PileUpEventInfo "
-
-# # PileUpEventInfoRead
-# apply_pattern athenarun_test name="PileUpEventInfoRead" pre_script="../test/pre_check.sh PileUpEventInfoRead " options="AthenaPoolTest/PileUpEventInfoRead.py" post_script="../test/post_check_with_select.sh PileUpEventInfoRead ^..PileUpEventInfo "
-
-
-
-# Atlfast NOT YET WORKING
-# AtlfastPoolWrite
-# problems: apply_pattern athenarun_test name="AtlfastPoolWrite" pre_script="../test/pre_check.sh AtlfastPoolWrite " options="AthenaPoolTest/AtlfastPoolWriteOptions.py" post_script="../test/post_check_with_select.sh AtlfastPoolWrite "
-
-# AtlfastPoolRead
-#problems: apply_pattern athenarun_test name="AtlfastPoolRead" pre_script="../test/atlfast_write_pre_check.sh AtlfastPoolRead " options="AthenaPoolTest/AtlfastPoolReadOptions.py" post_script="../test/post_check_with_select.sh AtlfastPoolRead "
-
-
-
-# Test write/read of indet rdos:
-# InDetRawDataWriter
-apply_pattern athenarun_test name="InDetRawDataWriter" pre_script="../test/pre_check.sh InDetRawDataWriter " options="AthenaPoolTest/InDetRawDataWriter_jobOptions.py" post_script="../test/post_check_with_select.sh InDetRawDataWriter InDetRawDataFak "
-macro_append InDetRawDataWriter_test_dependencies " AthenaPoolTestReadNav_test "
-
-# InDetRawDataRead
-apply_pattern athenarun_test name="InDetRawDataRead" pre_script="../test/pre_check.sh InDetRawDataRead " options="AthenaPoolTest/InDetRawDataReader_jobOptions.py" post_script="../test/post_check_with_select.sh InDetRawDataRead InDetRawDataFak "
-macro_append InDetRawDataRead_test_dependencies " InDetRawDataWriter_test "
-
-
-# Test write/read of LAr cell
-# LArCellContWriter
-apply_pattern athenarun_test name="LArCellContWriter" pre_script="../test/pre_check.sh LArCellContWriter " options="AthenaPoolTest/LArCellContWriter_jobOptions.py" post_script="../test/post_check_with_select.sh LArCellContWriter LArCellContFake "
-macro_append LArCellContWriter_test_dependencies " InDetRawDataRead_test "
-
-# LArCellContRead
-apply_pattern athenarun_test name="LArCellContRead" pre_script="../test/pre_check.sh LArCellContRead " options="AthenaPoolTest/LArCellContReader_jobOptions.py" post_script="../test/post_check_with_select.sh LArCellContRead LArCellContFake "
-macro_append LArCellContRead_test_dependencies " LArCellContWriter_test "
-
-
-# # Test of explicit collection write/read
-# # LArCellContWriteReg
-# apply_pattern $(test_pattern_opt_only) name="LArCellContWriteReg" pre_script="../test/pre_check.sh LArCellContWriteReg " options="AthenaPoolTest/LArCellContWriter_jobOptionsReg.py" post_script="../test/post_check_with_select.sh LArCellContWriteReg LArCellContFake "
-
-# # LArCellContReadReg
-# apply_pattern $(test_pattern_opt_only) name="LArCellContReadReg" pre_script="../test/pre_check.sh LArCellContReadReg " options="AthenaPoolTest/LArCellContReader_jobOptionsReg.py" post_script="../test/post_check_with_select.sh LArCellContReadReg LArCellContFake "
-
-
-# #LFN test
-# # LArCellContWriteStep1
-# apply_pattern athenarun_test name="LArCellContWriteStep1" pre_script="../test/pre_check.sh LArCellContWriteStep1 " options="AthenaPoolTest/LArCellContWriter_jobOptionsStep1.py" post_script="../test/post_check_with_select.sh LArCellContWriteStep1 LArCellContFake "
-
-# # LArCellContWriteStep2
-# apply_pattern athenarun_test name="LArCellContWriteStep2" pre_script="../test/pre_check.sh LArCellContWriteStep2 " options="AthenaPoolTest/LArCellContWriter_jobOptionsStep2.py" post_script="../test/post_check_with_select.sh LArCellContWriteStep2 LArCellContFake "
-
-# # LArCellContReadByLFN
-# apply_pattern athenarun_test name="LArCellContReadByLFN" pre_script="../test/lfn_test_pre_check.sh LArCellContReadByLFN " options="AthenaPoolTest/LArCellContReader_jobOptionsByLFN.py" post_script="../test/post_check_with_select.sh LArCellContReadByLFN LArCellContFake "
-
-
-# # write/read test of calo clusters
-# # CaloClusterWriter
-# apply_pattern athenarun_test name="CaloClusterWriter" pre_script="../test/pre_check.sh CaloClusterWriter" options="AthenaPoolTest/CaloClusterWriter_jobOptions.py" post_script="../test/post_check_with_select.sh CaloClusterWriter ^..CaloClusterFakeWriter"
-# macro_append CaloClusterWriter_test_dependencies " LArCellContRead_test "
-
-# # CaloClusterReader
-# apply_pattern athenarun_test name="CaloClusterReader" pre_script="../test/pre_check.sh CaloClusterReader " options="AthenaPoolTest/CaloClusterReader_jobOptions.py" post_script="../test/post_check_with_select.sh CaloClusterReader ^..CaloClusterFakeWriter"
-# macro_append CaloClusterReader_test_dependencies " CaloClusterWriter_test "
-
-
-# # Test ElementLinks across files
-# # CaloClusterStep1Writer
-# apply_pattern athenarun_test name="CaloClusterStep1Writer" pre_script="../test/pre_check.sh CaloClusterStep1Writer" options="AthenaPoolTest/CaloClusterStep1Writer_jobOptions.py" post_script="../test/post_check_with_select.sh CaloClusterStep1Writer Fake "
-
-# # CaloClusterStep2Writer
-# apply_pattern athenarun_test name="CaloClusterStep2Writer" pre_script="../test/pre_check.sh CaloClusterStep2Writer" options="AthenaPoolTest/CaloClusterStep2Writer_jobOptions.py" post_script="../test/post_check_with_select.sh CaloClusterStep2Writer Fake "
-
-# # CaloCluster2StepReader
-# apply_pattern athenarun_test name="CaloCluster2StepReader" pre_script="../test/pre_check.sh CaloCluster2StepReader " options="AthenaPoolTest/CaloCluster2StepReader_jobOptions.py" post_script="../test/post_check_with_select.sh CaloCluster2StepReader Fake "
-
-
-# # The following four tests are for writing explicit root collections with an extra ref
-# # First write an implicit collection, then a second file and an explicit root collection
-# # Then read back with standard ref - Step1, or extra ref - Step2
-
-# # AthenaPoolTestWrite - write out implicit collection with athena pool test data
-# apply_pattern athenarun_test name="AthenaPoolTestWrite2" pre_script="../test/pre_check.sh AthenaPoolTestWrite2 " options="AthenaPoolTest/AthenaPoolTestWrite.py" post_script="../test/post_check_with_select.sh AthenaPoolTestWrite2 ^..AthenaPoolTestD "
-
-# # LArCellContWriteRegStep2 - write out explicit collection with LArCellCont
-# apply_pattern $(test_pattern_opt_only) name="LArCellContWriteRegStep2" pre_script="../test/pre_check.sh LArCellContWriteRegStep2 " options="AthenaPoolTest/LArCellContWriter_jobOptionsRegStep2.py" post_script="../test/post_check_with_select.sh LArCellContWriteRegStep2 LArCellContFake "
-
-# # LArCellContWriteRegStep3 - write out explicit collection with LArCellCont
-# # in separate step
-# apply_pattern $(test_pattern_opt_only) name="LArCellContWriteRegStep3" pre_script="../test/pre_check.sh LArCellContWriteRegStep3 " options="AthenaPoolTest/LArCellContWriter_jobOptionsRegStep3.py" post_script="../test/diff_check.sh LArCellContWriteRegStep3 LArCellContFake "
-
-# # LArCellContReadRegStep1 - read in LArCellCont
-# apply_pattern $(test_pattern_opt_only) name="LArCellContReadRegStep1" pre_script="../test/pre_check.sh LArCellContReadRegStep1 " options="AthenaPoolTest/LArCellContReader_jobOptionsRegStep1.py" post_script="../test/post_check_with_select.sh LArCellContReadRegStep1 LArCellContFake "
-
-# # LArCellContReadRegStep2 - read in athena pool test data
-# apply_pattern $(test_pattern_opt_only) name="LArCellContReadRegStep2" pre_script="../test/pre_check.sh LArCellContReadRegStep2 " options="AthenaPoolTest/LArCellContReader_jobOptionsRegStep2.py" post_script="../test/post_check_with_select.sh LArCellContReadRegStep2 LArCellContFake "
-
-
-# Check for adding DetDescr tags to event info object:
-
-
-# EventInfoWrite
-apply_pattern athenarun_test name="EventInfoWrite" pre_script="../test/pre_check.sh EventInfoWrite " options="AthenaPoolTest/EventInfoWrite.py" post_script="../test/post_check_with_select.sh EventInfoWrite ^..[TE][av][ge][In][nt][fI][on][Mf][go][rW] "
-# macro_append EventInfoWrite_test_dependencies " CaloClusterReader_test "
-macro_append EventInfoWrite_test_dependencies " LArCellContRead_test "
-
-# EventInfoWriteStep2
-apply_pattern athenarun_test name="EventInfoWriteStep2" pre_script="../test/pre_check.sh EventInfoWriteStep2 " options="AthenaPoolTest/EventInfoWriteStep2.py" post_script="../test/post_check_with_select.sh EventInfoWriteStep2 ^..[TE][av][ge][In][nt][fI][on][Mf][go][rW] "
-macro_append EventInfoWriteStep2_test_dependencies " EventInfoWrite_test "
-
-# EventInfoWriteStep3
-apply_pattern athenarun_test name="EventInfoWriteStep3" pre_script="../test/pre_check.sh EventInfoWriteStep3 " options="AthenaPoolTest/EventInfoWriteStep3.py" post_script="../test/post_check_with_select.sh EventInfoWriteStep3 ^..[TE][av][ge][In][nt][fI][on][Mf][go][rW] "
-macro_append EventInfoWriteStep3_test_dependencies " EventInfoWriteStep2_test "
-
-# EventInfoWriteStep4
-apply_pattern athenarun_test name="EventInfoWriteStep4" pre_script="../test/pre_check.sh EventInfoWriteStep4 " options="AthenaPoolTest/EventInfoWriteStep4.py" post_script="../test/post_check_with_select.sh EventInfoWriteStep4 ^..[TE][av][ge][In][nt][fI][on][Mf][go][rW] "
-macro_append EventInfoWriteStep4_test_dependencies " EventInfoWriteStep3_test "
-
-# EventInfoWriteStep5
-apply_pattern athenarun_test name="EventInfoWriteStep5" pre_script="../test/pre_check.sh EventInfoWriteStep5 " options="AthenaPoolTest/EventInfoWriteStep5.py" post_script="../test/post_check_with_select.sh EventInfoWriteStep5 ^..[TE][av][ge][In][nt][fI][on][Mf][go][rW] "
-macro_append EventInfoWriteStep5_test_dependencies " EventInfoWriteStep4_test "
-
-# EventInfoRead
-apply_pattern athenarun_test name="EventInfoRead" pre_script="../test/pre_check.sh EventInfoRead " options="AthenaPoolTest/EventInfoRead.py" post_script="../test/post_check_with_select.sh EventInfoRead ^..[TE][av][ge][In][nt][fI][on][Mf][go][rW] "
-macro_append EventInfoRead_test_dependencies " EventInfoWriteStep5_test "
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
old mode 100755
new mode 100644
index c141052555e4d89cffdb68d3345ac899454fc3d8..bc5a61a70127b6314c6380d5391fb9396b82739c
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
@@ -1,15 +1,3 @@
-/**
- * @file AthenaPoolTest_entries.cxx
- *
- * @brief Declaration of component entry points
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: AthenaPoolTest_entries.cxx,v 1.25 2007-12-05 15:47:15 emoyse Exp $
- *
- */
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../InDetRawDataFakeWriter.h"
#include "../InDetRawDataFakeReader.h"
#include "../TrkTrackFakeWriter.h"
@@ -27,38 +15,20 @@
#include "../PileUpEventInfoWriter.h"
#include "../PileUpEventInfoReader.h"
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataWriter)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataReader)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrWriter)
-DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrReader)
-// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeWriter)
-// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeReader)
-DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeWriter)
-DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeReader)
-DECLARE_ALGORITHM_FACTORY(TrkTrackFakeWriter)
-DECLARE_ALGORITHM_FACTORY(TrkTrackFakeReader)
-DECLARE_ALGORITHM_FACTORY(LArCellContFakeWriter)
-DECLARE_ALGORITHM_FACTORY(LArCellContFakeReader)
-DECLARE_ALGORITHM_FACTORY(EventInfoWriter)
-DECLARE_ALGORITHM_FACTORY(EventInfoReader)
-DECLARE_ALGORITHM_FACTORY(PileUpEventInfoWriter)
-DECLARE_ALGORITHM_FACTORY(PileUpEventInfoReader)
+DECLARE_COMPONENT( AthenaPoolTestDataWriter )
+DECLARE_COMPONENT( AthenaPoolTestDataReader )
+DECLARE_COMPONENT( AthenaPoolTestAttrWriter )
+DECLARE_COMPONENT( AthenaPoolTestAttrReader )
+// DECLARE_COMPONENT( CaloClusterFakeWriter )
+// DECLARE_COMPONENT( CaloClusterFakeReader )
+DECLARE_COMPONENT( InDetRawDataFakeWriter )
+DECLARE_COMPONENT( InDetRawDataFakeReader )
+DECLARE_COMPONENT( TrkTrackFakeWriter )
+DECLARE_COMPONENT( TrkTrackFakeReader )
+DECLARE_COMPONENT( LArCellContFakeWriter )
+DECLARE_COMPONENT( LArCellContFakeReader )
+DECLARE_COMPONENT( EventInfoWriter )
+DECLARE_COMPONENT( EventInfoReader )
+DECLARE_COMPONENT( PileUpEventInfoWriter )
+DECLARE_COMPONENT( PileUpEventInfoReader )
-DECLARE_FACTORY_ENTRIES(AthenaPoolTest) {
- DECLARE_ALGORITHM(AthenaPoolTestDataWriter)
- DECLARE_ALGORITHM(AthenaPoolTestDataReader)
- DECLARE_ALGORITHM(AthenaPoolTestAttrWriter)
- DECLARE_ALGORITHM(AthenaPoolTestAttrReader)
- // DECLARE_ALGORITHM(CaloClusterFakeWriter)
- // DECLARE_ALGORITHM(CaloClusterFakeReader)
- DECLARE_ALGORITHM(InDetRawDataFakeWriter)
- DECLARE_ALGORITHM(InDetRawDataFakeReader)
- DECLARE_ALGORITHM(LArCellContFakeWriter)
- DECLARE_ALGORITHM(LArCellContFakeReader)
- DECLARE_ALGORITHM(TrkTrackFakeWriter)
- DECLARE_ALGORITHM(TrkTrackFakeReader)
- DECLARE_ALGORITHM(EventInfoWriter)
- DECLARE_ALGORITHM(EventInfoReader)
- DECLARE_ALGORITHM(PileUpEventInfoWriter)
- DECLARE_ALGORITHM(PileUpEventInfoReader)
-}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx
deleted file mode 100755
index 1a1fbfa8708f8e2bc7588332cd912c310299e758..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @file AthenaPoolTest_load.cxx
- *
- * @brief Declaration of component factory
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: AthenaPoolTest_load.cxx,v 1.2 2005-01-10 18:05:52 schaffer Exp $
- *
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaPoolTest )
-
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/cmt/requirements b/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/cmt/requirements
deleted file mode 100755
index 51e8d78e8b3990ddbb61d306415c4e2ae3120d3e..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolTestAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package AthenaPoolTestAthenaPool
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use DataModelAthenaPool DataModelAthenaPool-* Control
-
-private
-use AthenaPoolTestData AthenaPoolTestData-* AtlasTest/DatabaseTest
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-use AtlasReflex AtlasReflex-* External
-
-
-
-apply_pattern poolcnv files="-s=${AthenaPoolTestData_root}/AthenaPoolTestData \
- IAthenaPoolTestCollection.h \
- AthenaPoolTestMatrix.h \
- AthenaPoolTestMap.h \
- FauxTriggerMap.h \
- dummy_A.h \
- dummy_E.h \
- TrigPath.h \
- TestGaudiProperty.h \
- PixelRDOElemLinkVec.h"
-
-#macro_append CaloAthenaPoolPoolCnvGen_dependencies " AthenaPoolTestAthenaPool "
-apply_pattern lcgdict dict=AthenaPoolTestAthenaPoolCnv selectionfile=selection.xml headerfiles="../AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolDict.h"
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/cmt/requirements b/AtlasTest/DatabaseTest/AthenaPoolTestData/cmt/requirements
deleted file mode 100755
index 05b41c4f2172afe7d2f2bdedb154d9565b9c4fca..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/cmt/requirements
+++ /dev/null
@@ -1,41 +0,0 @@
-package AthenaPoolTestData
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AtlasCLHEP AtlasCLHEP-* External
-use DataModel DataModel-* Control
-use CLIDSvc CLIDSvc-* Control
-#use TrkTrack TrkTrack-* Tracking/TrkEvent
-use InDetRawData InDetRawData-* InnerDetector/InDetRawEvent
-
-#use GeneratorObjects GeneratorObjects-* Generators
-
-
-# If this package is to be linked against, installed_library is required
-apply_pattern installed_library
-
-library AthenaPoolTestData \
- IAthenaPoolTestData.cxx \
- AthenaPoolTestA.cxx \
- AthenaPoolTestB.cxx \
- AthenaPoolTestC.cxx \
- AthenaPoolTestD.cxx \
- AthenaPoolTestMatrix.cxx \
- AthenaPoolTestMap.cxx \
- AthenaPoolTestMapData.cxx \
- FauxTriggerMap.cxx \
- TestGaudiProperty.cxx
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See MissingETDict
-# A selection file must be created by hand. This file lists the
-# classes to be added to the dictionary, and which fields are
-# transient. It should be put in ../<package> dir and is conventionally called
-# selection.xml.
-apply_pattern lcgdict dict=AthenaPoolTestData selectionfile=selection.xml headerfiles="-s=${AthenaPoolTestData_root}/AthenaPoolTestData AthenaPoolTestDataDict.h"
-
diff --git a/AtlasTest/DatabaseTest/CoraCoolTest/cmt/requirements b/AtlasTest/DatabaseTest/CoraCoolTest/cmt/requirements
deleted file mode 100755
index c83c742ccc700aed64851ffec5ee660155b5d882..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/CoraCoolTest/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package CoraCoolTest
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use AtlasCOOL AtlasCOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-use CoraCool CoraCool-* Database
-
-use AtlasConditionsRunTime AtlasConditionsRunTime-*
-
-# macro_append CORAL_linkopts " -llcg_coral_RelationalAccess"
-# macro_append COOL_linkopts " -llcg_CoolApplication "
-# moved to CoraCool as the CoraCool factory is there
-# apply_tag NEEDS_COOL_FACTORY
-
-application CoraCoolExample CoraCoolExample.cxx
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/cmt/requirements b/AtlasTest/DatabaseTest/IOVDbTestAlg/cmt/requirements
deleted file mode 100755
index 15eebf0abcdc8c1c3e6a52406524cd38535b1d5e..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/cmt/requirements
+++ /dev/null
@@ -1,108 +0,0 @@
-package IOVDbTestAlg
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use StoreGate StoreGate-* Control
-use IOVDbTestConditions IOVDbTestConditions-* AtlasTest/DatabaseTest
-use AthenaKernel AthenaKernel-* Control
-use GaudiInterface GaudiInterface-* External
-# use AtlasPOOL AtlasPOOL-* External
-# use AtlasReflex AtlasReflex-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AtlasCORAL AtlasCORAL-* External
-use EventInfo EventInfo-* Event
-use RegistrationServices RegistrationServices-* Database
-end_private
-
-# Test infrastructure
-use TestPolicy TestPolicy-*
-use AtlasConditionsRunTime AtlasConditionsRunTime-*
-
-
-library IOVDbTestAlg \
- IOVDbTestAlg.cxx \
- IOVDbTestCoolDCS.cxx \
- IOVDbTestAlg_entries.cxx \
- IOVDbTestAlg_load.cxx
-
-apply_pattern component_library
-apply_pattern declare_joboptions files="-s=../share *.py"
-
-# Setup automatic testing which runs with gmake check
-
-# We define here a macro which can be used to run the tests only on
-# optimized mode.
-macro test_pattern_opt_only "athenarun_test" \
- debug ""
-
-
-# COOL:
-
-# Write out some simple objects and register them in IOVDb - COOL version:
-# IOVDbTestWriteCool
-apply_pattern athenarun_test name="IOVDbTestWriteCool" pre_script="../test/pre_check.sh IOVDbTestWriteCool " options="IOVDbTestAlg/IOVDbTestAlgWriteCool.py" post_script="../test/post_check_with_select.sh IOVDbTestWriteCool ^..IOVDbTestAlg "
-
-# Read back the object using IOVDb - COOL version:
-# IOVDbTestReadCool
-apply_pattern athenarun_test name="IOVDbTestReadCool" pre_script="../test/pre_check.sh IOVDbTestReadCool " options="IOVDbTestAlg/IOVDbTestAlgReadCool.py" post_script="../test/post_check_with_select.sh IOVDbTestReadCool ^..IOVDbTestAlg "
-macro_append IOVDbTestReadCool_test_dependencies " IOVDbTestWriteCool_test "
-
-
-# Write out some the same simple objects and register them with a later IOV in IOVDb - COOL version:
-# IOVDbTestWriteCoolStep2
-apply_pattern athenarun_test name="IOVDbTestWriteCoolStep2" pre_script="../test/pre_check.sh IOVDbTestWriteCoolStep2 " options="IOVDbTestAlg/IOVDbTestAlgWriteCoolStep2.py" post_script="../test/post_check_with_select.sh IOVDbTestWriteCoolStep2 ^..IOVDbTestAlg "
-macro_append IOVDbTestWriteCoolStep2_test_dependencies " IOVDbTestReadCool_test "
-
-# Read back the object using IOVDb - COOL version:
-# IOVDbTestReadCool2
-apply_pattern athenarun_test name="IOVDbTestReadCool2" pre_script="../test/pre_check.sh IOVDbTestReadCool2 " options="IOVDbTestAlg/IOVDbTestAlgReadCool.py" post_script="../test/post_check_with_select.sh IOVDbTestReadCool2 ^..IOVDbTestAlg "
-macro_append IOVDbTestReadCool2_test_dependencies " IOVDbTestWriteCoolStep2_test "
-
-# Write out some the same simple objects and register them with a later IOV in IOVDb - COOL version:
-# IOVDbTestWriteCoolStep3
-apply_pattern athenarun_test name="IOVDbTestWriteCoolStep3" pre_script="../test/pre_check.sh IOVDbTestWriteCoolStep3 " options="IOVDbTestAlg/IOVDbTestAlgWriteCoolStep3.py" post_script="../test/post_check_with_select.sh IOVDbTestWriteCoolStep3 ^..IOVDbTestAlg "
-macro_append IOVDbTestWriteCoolStep3_test_dependencies " IOVDbTestReadCool2_test "
-
-# Read back the object using IOVDb - COOL version:
-# IOVDbTestReadCool3
-apply_pattern athenarun_test name="IOVDbTestReadCool3" pre_script="../test/pre_check.sh IOVDbTestReadCool3 " options="IOVDbTestAlg/IOVDbTestAlgReadCool.py" post_script="../test/post_check_with_select.sh IOVDbTestReadCool3 ^..IOVDbTestAlg "
-macro_append IOVDbTestReadCool3_test_dependencies " IOVDbTestWriteCoolStep3_test "
-
-# Write to file meta data
-apply_pattern athenarun_test name="IOVDbTestReadCoolWriteMD" pre_script="../test/pre_check.sh IOVDbTestReadCoolWriteMD " options="IOVDbTestAlg/IOVDbTestAlgReadCoolWriteMD.py" post_script="../test/post_check_with_select.sh IOVDbTestReadCoolWriteMD ^..IOVDbTestAlg "
-macro_append IOVDbTestReadCoolWriteMD_test_dependencies " IOVDbTestReadCool3_test "
-
-# Read back from file meta data
-apply_pattern athenarun_test name="IOVDbTestReadCoolFromMD" pre_script="../test/pre_check.sh IOVDbTestReadCoolFromMD " options="IOVDbTestAlg/IOVDbTestAlgReadCoolFromMetaData.py" post_script="../test/post_check_with_select.sh IOVDbTestReadCoolFromMD ^..IOVDbTestAlg "
-macro_append IOVDbTestReadCoolFromMD_test_dependencies " IOVDbTestReadCoolWriteMD_test "
-
-
-# TwoStep write/reg:
-
-# Write out some the same simple objects BUT DO NOT register them
-# IOVDbTestAlgWriteCoolNoReg
-apply_pattern athenarun_test name="IOVDbTestAlgWriteCoolNoReg" pre_script="../test/pre_check.sh IOVDbTestAlgWriteCoolNoReg " options="IOVDbTestAlg/IOVDbTestAlgWriteCoolNoReg.py" post_script="../test/post_check_with_select.sh IOVDbTestAlgWriteCoolNoReg ^..IOVDbTestAlg "
-macro_append IOVDbTestAlgWriteCoolNoReg_test_dependencies " IOVDbTestReadCoolFromMD_test "
-
-# Read back objects NOT registered
-# IOVDbTestAlgReadCoolNoReg
-#apply_pattern athenarun_test name="IOVDbTestAlgReadCoolNoReg" pre_script="../test/pre_check.sh IOVDbTestAlgReadCoolNoReg " options="IOVDbTestAlg/IOVDbTestAlgReadCoolNoReg.py" post_script="../test/post_check_with_select.sh IOVDbTestAlgReadCoolNoReg ^..IOVDbTestAlg "
-
-# Read back objects NOT registered and NOW register them
-# IOVDbTestAlgReadCoolAndReg
-#apply_pattern athenarun_test name="IOVDbTestAlgReadCoolAndReg" pre_script="../test/pre_check.sh IOVDbTestAlgReadCoolAndReg " options="IOVDbTestAlg/IOVDbTestAlgReadCoolAndReg.py" post_script="../test/post_check_with_select.sh IOVDbTestAlgReadCoolAndReg ^..IOVDbTestAlg "
-
-# Read back objects via IOVDB
-# IOVDbTestAlgReadCoolAfterTwoStep
-apply_pattern athenarun_test name="IOVDbTestAlgReadCoolAfterTwoStep" pre_script="../test/pre_check.sh IOVDbTestAlgReadCoolAfterTwoStep " options="IOVDbTestAlg/IOVDbTestAlgReadCoolAfterTwoStep.py" post_script="../test/post_check_with_select.sh IOVDbTestAlgReadCoolAfterTwoStep ^..IOVDbTestAlg "
-macro_append IOVDbTestAlgReadCoolAfterTwoStep_test_dependencies " IOVDbTestAlgWriteCoolNoReg_test "
-
-
-# Check of online mode updates
-# HotSwapTEST
-apply_pattern athenarun_test name="HotSwapTEST" pre_script="../test/HotSwapTEST.sh" options="IOVDbTestAlg/dummy.py" post_script="../test/post_check_with_select.sh HotSwapTEST ^..HotSwapTEST "
-macro_append HotSwapTEST_test_dependencies " IOVDbTestAlgReadCoolAfterTwoStep_test "
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
old mode 100755
new mode 100644
index ba1fa047e93cb8843a32b835f9065a76e7fe0132..4cb36bb1e0773e7d9d847b617649395e24840e9c
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
@@ -1,16 +1,6 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "IOVDbTestAlg/IOVDbTestAlg.h"
#include "IOVDbTestAlg/IOVDbTestCoolDCS.h"
-DECLARE_ALGORITHM_FACTORY(IOVDbTestAlg)
-DECLARE_ALGORITHM_FACTORY(IOVDbTestCoolDCS)
+DECLARE_COMPONENT( IOVDbTestAlg )
+DECLARE_COMPONENT( IOVDbTestCoolDCS )
-DECLARE_FACTORY_ENTRIES(IOVDbTestAlg) {
- DECLARE_ALGORITHM( IOVDbTestAlg );
- DECLARE_ALGORITHM( IOVDbTestCoolDCS );
-}
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx
deleted file mode 100755
index a372dda99f67dc6de7f52089b5ac0a54e99d7203..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbTestAlg)
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAthenaPool/cmt/requirements b/AtlasTest/DatabaseTest/IOVDbTestAthenaPool/cmt/requirements
deleted file mode 100755
index a15b2e606bba5d0605fc40702910b3a46ac9f079..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,14 +0,0 @@
-package IOVDbTestAthenaPool
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-#use AtlasReflex AtlasReflex-* External
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-
-apply_pattern poolcnv multChanTypes=" IOVDbTestMDTEleMapColl " files="-s=${IOVDbTestConditions_root}/IOVDbTestConditions IOVDbTestAmdbCorrection.h IOVDbTestMDTEleMap.h IOVDbTestMDTEleMapColl.h "
-
-private
-use IOVDbTestConditions IOVDbTestConditions-* AtlasTest/DatabaseTest
-
diff --git a/AtlasTest/DatabaseTest/IOVDbTestConditions/cmt/requirements b/AtlasTest/DatabaseTest/IOVDbTestConditions/cmt/requirements
deleted file mode 100755
index 43e71f192684508b537e3ce12a7a55796a96a867..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestConditions/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package IOVDbTestConditions
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-apply_pattern installed_library
-library IOVDbTestConditions "IOVDbTestAmdbCorrection.cxx IOVDbTestMDTEleMap.cxx"
-
-# The following use is to get the lcgdict pattern.
-# This is "hidden" behind "private" and "no_auto_imports" to keep
-# clients of IOVDbTestConditions from seeing excess dependencies
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See EventInfoDict
-apply_pattern lcgdict dict=IOVDbTestConditions selectionfile=selection.xml headerfiles="../IOVDbTestConditions/IOVDbTestConditionsDict.h"
-
diff --git a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/cmt/requirements b/AtlasTest/DatabaseTest/POOLCollectionToolsTest/cmt/requirements
deleted file mode 100755
index d81b58d01000517cc6baac830897feb0ae8a649a..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/POOLCollectionToolsTest/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package POOLCollectionToolsTest
-
-author Jack Cranshaw <Jack.Cranshaw@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use ByteStreamCnvSvc ByteStreamCnvSvc-* Event -no_auto_imports
-use AtlasCollectionTools AtlasCollectionTools-* Database/AthenaPOOL -no_auto_imports
-
-apply_pattern declare_runtime files="../share/*.py ../test/*.pickle ../test/POOLCollectionToolsTest_TestConfiguration.xml ../data/*logCheck*"
-
-macro POOLCollectionTools_TestConfiguration "../test/POOLCollectionToolsTest_TestConfiguration.xml"
-
-
-private
-use TestPolicy TestPolicy-*
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/cmt/requirements b/AtlasTest/DatabaseTest/TagCollectionTest/cmt/requirements
deleted file mode 100755
index 77e1b5b1b287c1e056f4d4afdcdb485451e43dcf..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/TagCollectionTest/cmt/requirements
+++ /dev/null
@@ -1,97 +0,0 @@
-package TagCollectionTest
-
-author Jack Cranshaw <Jack.Cranshaw@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use TestPolicy TestPolicy-*
-use AtlasDoxygen AtlasDoxygen-* Tools
-
-use MinimalRunTime MinimalRunTime-* Control -no_auto_imports
-
-#library TagCollectionTest EventTagReader.cxx EventTagWriter.cxx RunEventTagWriter.cxx RunEventTagWriter2.cxx components/*.cxx
-#apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-
-#apply_pattern athenarun_test name="justRSProperties" pre_script="../test/pre_check.sh justRSProperties " options="TagCollectionTest/test_justRSProperties.py" post_script="../test/post_check.sh justRSProperties MakeCollection"
-
-# Read/Write Implicit and Explicit collections
-# w and w/o metadata
-apply_pattern athenarun_test name="MakeDummyRootCollection" pre_script="../test/pre_check.sh MakeDummyRootCollection " options="TagCollectionTest/test_MakeDummyRootCollection.py" post_script="../test/post_check.sh MakeDummyRootCollection MakeCollection"
-#
-apply_pattern athenarun_test name="ReadDummyRootCollection" pre_script="../test/pre_check.sh ReadDummyRootCollection " options="TagCollectionTest/test_ReadDummyRootCollection.py" post_script="../test/post_check.sh ReadDummyRootCollection ReadCollection"
-
-# Use tag builder algorithm with only EventInfo metadata (simple tag)
-apply_pattern athenarun_test name="MakeEventInfoRootCollection" pre_script="../test/pre_check.sh MakeEventInfoRootCollection " options="TagCollectionTest/test_MakeEventInfoRootCollection.py" post_script="../test/post_check.sh MakeEventInfoRootCollection MakeCollection"
-
-#
-apply_pattern athenarun_test name="ReadNoMetaRootCollection" pre_script="../test/pre_check.sh ReadNoMetaRootCollection " options="TagCollectionTest/test_ReadNoMetaRootCollection.py" post_script="../test/post_check.sh ReadNoMetaRootCollection ReadCollection"
-
-# Use tag builder algorithm for event with full metadata
-apply_pattern athenarun_test name="MakeGlobalEventRootCollection" pre_script="../test/pre_check.sh MakeGlobalEventRootCollection " options="TagCollectionTest/test_MakeGlobalEventRootCollection.py" post_script="../test/post_check.sh MakeGlobalEventRootCollection MakeCollection"
-#
-apply_pattern athenarun_test name="ReadGlobalEventRootCollection" pre_script="../test/pre_check.sh ReadGlobalEventRootCollection " options="TagCollectionTest/test_ReadGlobalEventRootCollection.py" post_script="../test/post_check.sh ReadGlobalEventRootCollection ReadCollection"
-
-#
-apply_pattern athenarun_test name="ReadLumiBlockRootCollection" pre_script="../test/pre_check.sh ReadLumiBlockRootCollection " options="TagCollectionTest/LumiMetaDataTool_jobOptions.py" post_script="../test/post_check.sh ReadLumiBlockRootCollection Lumi"
-
-# Build implicit and explicit collections from implicit input
-apply_pattern athenarun_test name="MakeDummyRootCollection2" pre_script="../test/pre_check.sh MakeDummyRootCollection2 " options="TagCollectionTest/test_MakeDummyRootCollection2.py" post_script="../test/post_check.sh MakeDummyRootCollection2 MakeCollection"
-#
-apply_pattern athenarun_test name="ReadDummyRootCollection2" pre_script="../test/pre_check.sh ReadDummyRootCollection2 " options="TagCollectionTest/test_ReadDummyRootCollection2.py" post_script="../test/post_check.sh ReadDummyRootCollection2 ReadCollection"
-
-# Read/Write multiple tokens
-# Can point to input dataheader rather than just output dataheader
-apply_pattern athenarun_test name="MakeDummyRootCollection3" pre_script="../test/pre_check.sh MakeDummyRootCollection3 " options="TagCollectionTest/test_MakeDummyRootCollection3.py" post_script="../test/post_check.sh MakeDummyRootCollection3 MakeCollection"
-#
-apply_pattern athenarun_test name="ReadDummyRootCollection3" pre_script="../test/pre_check.sh ReadDummyRootCollection3 " options="TagCollectionTest/test_ReadDummyRootCollection3.py" post_script="../test/post_check.sh ReadDummyRootCollection3 ReadCollection"
-
-# Test 4
-apply_pattern athenarun_test name="MakeDummyRootCollection4" pre_script="../test/pre_check.sh MakeDummyRootCollection4 " options="TagCollectionTest/test_MakeDummyRootCollection4.py" post_script="../test/post_check.sh MakeDummyRootCollection4 MakeCollection"
-#
-apply_pattern athenarun_test name="ReadDummyRootCollection4" pre_script="../test/pre_check.sh ReadDummyRootCollection4 " options="TagCollectionTest/test_ReadDummyRootCollection4.py" post_script="../test/post_check.sh ReadDummyRootCollection4 ReadCollection"
-
-# Test 5
-apply_pattern athenarun_test name="MakeDummyRootCollection5" pre_script="../test/pre_check.sh MakeDummyRootCollection5 " options="TagCollectionTest/test_MakeDummyRootCollection5.py" post_script="../test/post_check.sh MakeDummyRootCollection5 MakeCollection"
-#
-apply_pattern athenarun_test name="ReadDummyRootCollection5" pre_script="../test/pre_check.sh ReadDummyRootCollection5 " options="TagCollectionTest/test_ReadDummyRootCollection5.py" post_script="../test/post_check.sh ReadDummyRootCollection5 ReadCollection"
-
-# Test 6
-apply_pattern athenarun_test name="MakeDummyRootCollection6" pre_script="../test/pre_check.sh MakeDummyRootCollection6 " options="TagCollectionTest/test_MakeDummyRootCollection6.py" post_script="../test/post_check.sh MakeDummyRootCollection6 MakeCollection"
-#
-apply_pattern athenarun_test name="ReadDummyRootCollection6" pre_script="../test/pre_check.sh ReadDummyRootCollection6 " options="TagCollectionTest/test_ReadDummyRootCollection6.py" post_script="../test/post_check.sh ReadDummyRootCollection6 ReadCollection"
-
-# Test 7
-apply_pattern athenarun_test name="MakeDummyRootCollection7" pre_script="../test/pre_check.sh MakeDummyRootCollection7 " options="TagCollectionTest/test_MakeDummyRootCollection7.py" post_script="../test/post_check.sh MakeDummyRootCollection7 MakeCollection"
-#
-apply_pattern athenarun_test name="ReadDummyRootCollection7" pre_script="../test/pre_check.sh ReadDummyRootCollection7 " options="TagCollectionTest/test_ReadDummyRootCollection7.py" post_script="../test/post_check.sh ReadDummyRootCollection7 ReadCollection"
-
-private
-# Add a harmless fix for a limitation with v1r18p20050501 include_dirs
-macro poolcnv_include_extras "../"
-macro_append ReadDummyRootCollection_test_dependencies MakeDummyRootCollection_test
-macro_append ReadNoMetaRootCollection_test_dependencies ReadDummyRootCollection_test
-macro_append MakeEventInfoRootCollection_test_dependencies ReadNoMetaRootCollection_test
-
-macro_append MakeDummyRootCollection2_test_dependencies MakeEventInfoRootCollection_test
-macro_append ReadDummyRootCollection2_test_dependencies MakeDummyRootCollection2_test
-
-macro_append MakeDummyRootCollection3_test_dependencies ReadDummyRootCollection2_test
-macro_append ReadDummyRootCollection3_test_dependencies MakeDummyRootCollection3_test
-
-macro_append MakeDummyRootCollection4_test_dependencies ReadDummyRootCollection3_test
-macro_append ReadDummyRootCollection4_test_dependencies MakeDummyRootCollection4_test
-
-macro_append MakeDummyRootCollection5_test_dependencies ReadDummyRootCollection4_test
-macro_append ReadDummyRootCollection5_test_dependencies MakeDummyRootCollection5_test
-
-macro_append MakeDummyRootCollection6_test_dependencies ReadDummyRootCollection5_test
-macro_append ReadDummyRootCollection6_test_dependencies MakeDummyRootCollection6_test
-
-macro_append MakeDummyRootCollection7_test_dependencies ReadDummyRootCollection6_test
-macro_append ReadDummyRootCollection7_test_dependencies MakeDummyRootCollection7_test
-
-macro_append MakeGlobalEventRootCollection_test_dependencies ReadDummyRootCollection7_test
-macro_append ReadGlobalEventRootCollection_test_dependencies MakeGlobalEventRootCollection_test
-
-
diff --git a/AtlasTest/EventTest/EventLoopTest/cmt/requirements b/AtlasTest/EventTest/EventLoopTest/cmt/requirements
deleted file mode 100755
index 95538ca1478cc12e6470e9af49b841089598985d..0000000000000000000000000000000000000000
--- a/AtlasTest/EventTest/EventLoopTest/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package EventLoopTest
-
-author Paolo Calafiura <pcalafiura@lbl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use MinimalRunTime MinimalRunTime-* Control -no_auto_imports
-
-#integration tests
-apply_pattern install_applications
-apply_pattern install_xmls
-apply_pattern declare_joboptions files="*.py"
-
-private
-use TestTools TestTools-* AtlasTest
-use AthExBeginRun AthExBeginRun-* Control/AthenaExamples -no_auto_imports
-#we need mostly to prepare for the real BeginRun test
-apply_pattern athenarun_test name="BeginRunWriteCond" \
- pre_script="../cmt/setup.sh" \
- options="AthExBeginRun/AthExBeginRunWriteCond.py" \
- post_script="${TESTTOOLSROOT}/share/post.sh BeginRunWriteCond $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file .*athenarc|Warning in .TEnvRec::ChangeValue.: duplicate entry|^CORAL/Services/ConnectionService|^RalSessionMgr|^XMLFileCatalog|^PoolXMLFileCatalog|^IOVDbConnection|^RelationalDatabase$(q)"
-#here is what we want to test
-apply_pattern athenarun_test name="BeginRun" \
- pre_script="../cmt/setup.sh" \
- options="AthExBeginRun/AthExBeginRunOptions.py" \
- post_script="${TESTTOOLSROOT}/share/post.sh BeginRun $(q)^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file .*athenarc|Warning in .TEnvRec::ChangeValue.: duplicate entry|^CORAL/Services/ConnectionService|^RalSessionMgr|^XMLFileCatalog|^IOVDbConnection|^RelationalDatabase$(q)"
-macro_append BeginRun_test_dependencies " BeginRunWriteCond_test "
diff --git a/AtlasTest/GoogleTestTools/cmt/requirements b/AtlasTest/GoogleTestTools/cmt/requirements
deleted file mode 100644
index 3ea01812fbd8e0c710f6af57ec8774e7a0adfed9..0000000000000000000000000000000000000000
--- a/AtlasTest/GoogleTestTools/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-## automatically generated CMT requirements file
-package GoogleTestTools
-author sklutha
-
-## for athena policies: this has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-
-## for gaudi tools, services and objects
-use GaudiInterface GaudiInterface-* External
-
-## put here your package dependencies...
-
-branches src src/components doc python share GoogleTestTools
-
-library GoogleTestTools *.cxx
-apply_pattern installed_library
-
-## default is to make component library. See: https://twiki.cern.ch/twiki/bin/view/Main/LearningAthena#Libraries_in_CMT for alternatives
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-use AtlasGoogleTest AtlasGoogleTest-* External
-
diff --git a/AtlasTest/NightlyTestTools/ATNight/cmt/requirements b/AtlasTest/NightlyTestTools/ATNight/cmt/requirements
deleted file mode 100755
index d0c30edc458fbfa00d459ad46e555e87a0f1bb6f..0000000000000000000000000000000000000000
--- a/AtlasTest/NightlyTestTools/ATNight/cmt/requirements
+++ /dev/null
@@ -1,3 +0,0 @@
-package ATNight
-author Alex Undrus <undrus@bnl.gov>
-
diff --git a/AtlasTest/NightlyTestTools/Nicos/cmt/requirements b/AtlasTest/NightlyTestTools/Nicos/cmt/requirements
deleted file mode 100755
index 089c826aee463211b882e3edbb6cd1a3420a0ca5..0000000000000000000000000000000000000000
--- a/AtlasTest/NightlyTestTools/Nicos/cmt/requirements
+++ /dev/null
@@ -1,3 +0,0 @@
-package Nicos
-author Alex Undrus <undrus@bnl.gov>
-
diff --git a/AtlasTest/PyAthenaTests/cmt/requirements b/AtlasTest/PyAthenaTests/cmt/requirements
deleted file mode 100644
index 45c1d20a5186b8ed9d6c7c22e6885d8b276e6f9c..0000000000000000000000000000000000000000
--- a/AtlasTest/PyAthenaTests/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package PyAthenaTests
-author Sebastien Binet <binet@cern.ch>
-
-## For Athena policies: it has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-
-## Put here your package dependencies...
-use AthenaPython AthenaPython-* Control -no_auto_imports
-use AthExThinning AthExThinning-* Control/AthenaExamples -no_auto_imports
-##
-
-branches python share
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-apply_pattern declare_runtime extras="-s=$(PyAthenaTests_root)/test *.ref"
-apply_pattern declare_scripts files="$(PyAthenaTests_root)/test/*.py"
-
-private
-# for unit tests
-use TestPolicy TestPolicy-*
-
-# automatic xml file validation for tests
-apply_pattern validate_xml
-
-end_private
diff --git a/AtlasTest/TestTools/cmt/Makefile.RootCore b/AtlasTest/TestTools/cmt/Makefile.RootCore
deleted file mode 100644
index d59368a1625a5812f517e989b2fa6791d82bdebd..0000000000000000000000000000000000000000
--- a/AtlasTest/TestTools/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,24 +0,0 @@
-# this makefile also gets parsed by shell scripts
-# therefore it does not support full make syntax and features
-# edit with care
-
-# for full documentation check:
-# https://twiki.cern.ch/twiki/bin/viewauth/Atlas/RootCore#Package_Makefile
-
-PACKAGE = TestTools
-PACKAGE_PRELOAD =
-PACKAGE_CXXFLAGS =
-PACKAGE_OBJFLAGS =
-PACKAGE_LDFLAGS =
-PACKAGE_BINFLAGS =
-PACKAGE_LIBFLAGS =
-PACKAGE_DEP =
-PACKAGE_TRYDEP =
-PACKAGE_CLEAN =
-PACKAGE_NOGRID =
-PACKAGE_PEDANTIC = 0
-PACKAGE_NOOPT = 0
-PACKAGE_NOCC = 1
-PACKAGE_REFLEX = 0
-
-include $(ROOTCOREDIR)/Makefile-common
diff --git a/AtlasTest/TestTools/cmt/requirements b/AtlasTest/TestTools/cmt/requirements
deleted file mode 100644
index c785e43bb64232224ea98fc650b4186fb03d58e5..0000000000000000000000000000000000000000
--- a/AtlasTest/TestTools/cmt/requirements
+++ /dev/null
@@ -1,45 +0,0 @@
-package TestTools
-author Paolo Calafiura <Paolo.Calafiura@cern.ch>
-author Sebastien Binet <binet@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPython AtlasPython-* External -no_auto_imports
-
-use AthenaCommon AthenaCommon-* Control -no_auto_imports
-
-use TestPolicy TestPolicy-*
-
-private
-use GaudiInterface GaudiInterface-* External
-branches python share src TestTools test
-end_private
-
-library TestTools *.cxx
-apply_pattern installed_library
-
-apply_pattern declare_scripts files="runUnitTests.sh post.sh"
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_joboptions files="*.py"
-
-macro whichGroup check
-#macro whichGroup "NONE" \
-# debug "check"
-
-pattern UnitTest_run \
- application <unit_test>_test -group=$(whichGroup) ../test/<unit_test>_test.cxx <extra_sources> ; \
- document athenarun_launcher <unit_test>_utest -group=$(whichGroup) \
- athenarun_exe="'../${CMTCONFIG}/<unit_test>_test.exe'" \
- athenarun_pre="'. ../cmt/setup.sh'" \
- athenarun_opt="" \
- athenarun_out="' > <unit_test>_test.log 2>&1'" \
- athenarun_post="'post.sh <unit_test>_test $(q)<extrapatterns>$(q)'" ; \
- private ; \
- macro_append <unit_test>_utest_dependencies " <unit_test>_test " ; \
- end_private
-
-private
-
-macro_append DOXYGEN_INPUT " ../doc"
-macro_append DOXYGEN_INPUT " ../share"
-macro_append DOXYGEN_FILE_PATTERNS " *.sh"
-macro_append DOXYGEN_FILE_PATTERNS " *.txt"
diff --git a/Commission/CommissionAthenaPool/cmt/requirements b/Commission/CommissionAthenaPool/cmt/requirements
deleted file mode 100755
index f45001e1a80d5ce69aef91d18e831ed7cee6f4fe..0000000000000000000000000000000000000000
--- a/Commission/CommissionAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package CommissionAthenaPool
-
-author Hong Ma <hma@bnl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use CommissionEvent CommissionEvent-* Commission
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-end_private
-
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-# use AtlasReflex AtlasReflex-00-* External
-
-# use AthenaPoolServices AthenaPoolServices-00-* Database/AthenaPOOL
-
-apply_pattern declare_joboptions files="*.txt *.py"
-
-macro converters "-s=${CommissionEvent_root}/CommissionEvent ComTime.h "
-
-apply_pattern poolcnv files=${converters}
-
-macro_append CommissionAthenaPoolPoolCnv_shlibflags $(CommissionAthenaPool_dict_linkopts)
-
diff --git a/Commission/CommissionEvent/cmt/requirements b/Commission/CommissionEvent/cmt/requirements
deleted file mode 100755
index 8d155d967b5023e216121df0e9a2f3dfae7bc403..0000000000000000000000000000000000000000
--- a/Commission/CommissionEvent/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-
-package CommissionEvent
-
-author Rob McPherson <rmcphers@triumf.ca>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-use CLIDSvc CLIDSvc-* Control
-
-library CommissionEvent *.cxx
-
-apply_pattern installed_library
-
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-
-apply_pattern lcgdict dict=CommissionEvent selectionfile=selection.xml \
-headerfiles="../CommissionEvent/CommissionEventDict.h"
-
-end_private
diff --git a/Commission/CommissionRec/cmt/requirements b/Commission/CommissionRec/cmt/requirements
deleted file mode 100755
index c0d59b9c634519d43a26289bb36eb6efb68cd12f..0000000000000000000000000000000000000000
--- a/Commission/CommissionRec/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package CommissionRec
-
-author Rob McPherson <Robert.McPherson@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use CommissionUtils CommissionUtils-* Commission
-
-private
-use AtlasCLHEP AtlasCLHEP-* External
-use CommissionEvent CommissionEvent-* Commission
-use TrackRecord TrackRecord-* Simulation/G4Sim
-end_private
-
-
-library CommissionRec *.cxx -s=components *.cxx
-apply_pattern component_library
-
diff --git a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
old mode 100755
new mode 100644
index d40f63541969194c323d8574d9c6602ac6ac0e63..4e94bd74933ab168e445c24f984526ed3985d8ad
--- a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
+++ b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "CommissionRec/ComTimeRec.h"
-DECLARE_ALGORITHM_FACTORY( ComTimeRec )
-DECLARE_FACTORY_ENTRIES( CommissionRec ) {
- DECLARE_ALGORITHM( ComTimeRec )
-}
+DECLARE_COMPONENT( ComTimeRec )
+
diff --git a/Commission/CommissionRec/src/components/CommissionRec_load.cxx b/Commission/CommissionRec/src/components/CommissionRec_load.cxx
deleted file mode 100755
index fdd38cd8473d49c4da538f39d48a485342b16946..0000000000000000000000000000000000000000
--- a/Commission/CommissionRec/src/components/CommissionRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CommissionRec)
diff --git a/Commission/CommissionUtils/cmt/requirements b/Commission/CommissionUtils/cmt/requirements
deleted file mode 100644
index bb02e9a4a00245da634d6ed18c38a469661a133e..0000000000000000000000000000000000000000
--- a/Commission/CommissionUtils/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package CommissionUtils
-
-author Rob McPherson <Robert.McPherson@cern.ch>
-author Hong Ma <hma@bnl.gov>
-
-private
-
-use CommissionEvent CommissionEvent-* Commission
-use LArSimEvent LArSimEvent-* LArCalorimeter
-use TrackRecord TrackRecord-* Simulation/G4Sim
-use AtlasCLHEP AtlasCLHEP-* External
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-
-
-# library CommissionUtils *.cxx
-# apply_pattern component_library
-
-apply_pattern dual_use_library files=*.cxx
-apply_pattern declare_joboptions files="*.py"
diff --git a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
index 5d9f6c906c2c42afa58970ae8fecd6adbe47bc03..bb8f50fb2e2781d75a63b5772bf404efa019c188 100644
--- a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
+++ b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
@@ -1,9 +1,5 @@
#include "CommissionUtils/CosmicTriggerTimeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY( CosmicTriggerTimeTool )
+DECLARE_COMPONENT( CosmicTriggerTimeTool )
-DECLARE_FACTORY_ENTRIES( CommissionUtils ) {
- DECLARE_TOOL( CosmicTriggerTimeTool )
-}
diff --git a/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx b/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx
deleted file mode 100644
index 52de3df7519b4a607d3bc9bf71b94a6e7a700438..0000000000000000000000000000000000000000
--- a/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(CommissionUtils)
-
diff --git a/DataQuality/DCSCalculator2/cmt/requirements b/DataQuality/DCSCalculator2/cmt/requirements
deleted file mode 100644
index 503a547c1c80d146bcc551352221dd9098a030c0..0000000000000000000000000000000000000000
--- a/DataQuality/DCSCalculator2/cmt/requirements
+++ /dev/null
@@ -1,9 +0,0 @@
-package DCSCalculator2
-
-author Peter Waller <peter.waller@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_python_modules files="*.py subdetectors"
-apply_pattern declare_scripts files="*.py"
-
diff --git a/DataQuality/DQDefects/cmt/requirements b/DataQuality/DQDefects/cmt/requirements
deleted file mode 100644
index 53785e71464d17ca24187a68135984ff992cd3be..0000000000000000000000000000000000000000
--- a/DataQuality/DQDefects/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package DQDefects
-
-author Peter Waller <peter.waller@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use AtlasOracle AtlasOracle-* External
-
-apply_tag NEEDS_PYCOOL
-apply_tag NEEDS_COOL_FACTORY
-
-#apply_pattern installed_library
-
-apply_pattern declare_python_modules files="*.py tests data"
-apply_pattern declare_scripts files="*.py *.sh"
diff --git a/DataQuality/DQUtils/cmt/requirements b/DataQuality/DQUtils/cmt/requirements
deleted file mode 100644
index 7ef8a154d5284b95264e6fcb7205efb9c5737e03..0000000000000000000000000000000000000000
--- a/DataQuality/DQUtils/cmt/requirements
+++ /dev/null
@@ -1,47 +0,0 @@
-package DQUtils
-
-author Peter Waller <peter.waller@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use AtlasBoost AtlasBoost-* External
-use AtlasCOOL AtlasCOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-use AtlasPython AtlasPython-* External
-use AtlasROOT AtlasROOT-* External -no_auto_imports
-
-use pytools * LCG_Interfaces -no_auto_imports
-use pygraphics * LCG_Interfaces -no_auto_imports
-use pyanalysis * LCG_Interfaces -no_auto_imports
-
-use CoraCool CoraCool-* Database
-end_private
-
-use AtlasOracle AtlasOracle-* External
-use AtlasReflex AtlasReflex-* External
-
-apply_tag NEEDS_PYCOOL
-apply_tag NEEDS_COOL_FACTORY
-
-include_dirs "$(COOL_base)/src"
-
-apply_pattern installed_library
-
-library DQUtils quick_retrieve.cxx pythonic_coracool.cxx
-apply_pattern linker_library library=DQUtils
-apply_pattern ld_library_path
-
-apply_pattern lcgdict dict=DQUtils \
- selectionfile=../dict/dictionary.xml \
- headerfiles=../dict/dictionary.h
-
-macro DQUtilsDict_use_linkopts $(use_linkopts)
-macro_append DQUtilsDict_dependencies " DQUtils"
-
-apply_pattern declare_python_modules files="*.py ext sugar"
-apply_pattern declare_scripts files="count_filled_lbs.py dqu_grldiff.py dqu_lumi.py dqu_grl_extract_period.py dqu_dump_periods.py"
-
-# Disable the usage of --as-needed in the linking of the package's libraries:
-apply_pattern cmake_add_command \
- command='string(REPLACE "-Wl,--as-needed" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")'
diff --git a/DataQuality/DataQualityConfigurations/cmt/requirements b/DataQuality/DataQualityConfigurations/cmt/requirements
deleted file mode 100755
index 870b625ebb9afee908c54b6ef7f739c54a6ce381..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityConfigurations/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package DataQualityConfigurations
-
-author Peter Onyisi <ponyisi@cern.ch>
-
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-
-
-##############################################################################
-# python scripts and modules
-##############################################################################
-
-## Python scripts are in the 'scripts' directory; only some are installed
-apply_pattern declare_scripts files='-s=../scripts \
- MergeConfigs.py UploadDQAMITag.py merge_all_han_configs.sh merge_some_han_configs.sh \
- han-config-indent.sh han-config-check.sh han-config-parse.awk'
-
-## Python modules are in the 'python' directory
-apply_pattern declare_python_modules files='*.py'
diff --git a/DataQuality/DataQualityInterfaces/cmt/requirements b/DataQuality/DataQualityInterfaces/cmt/requirements
deleted file mode 100644
index ffc21d93d436c7516c8ec4ce68567e28985b6ba2..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityInterfaces/cmt/requirements
+++ /dev/null
@@ -1,96 +0,0 @@
-package DataQualityInterfaces
-author Peter Onyisi <ponyisi@cern.ch>
-
-private
-
-apply_tag ROOTGraphicsLibs
-
-end_private
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-use AtlasBoost AtlasBoost-* External
-use DQM_Core DQM_Core-* External
-
-# Specify the required ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Cint Hist RIO Tree)"
-
-# Specify the required dqm-common components (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(dqm-common)"
-
-macro_append ers_linkopts " $(tdaqc_linkopts) -lers "
-
-macro_append Boost_linkopts " $(Boost_linkopts_system) $(Boost_linkopts_regex) $(Boost_linkopts_thread) "
-
-##############################################################################
-# library: DataQualityInterfaces
-##############################################################################
-
-library DataQualityInterfaces $(lib_opts) "\
- ../src/HanAlgorithmConfig.cxx\
- ../src/HanApp.cxx\
- ../src/HanConfig.cxx\
- ../src/HanConfigAlgLimit.cxx\
- ../src/HanConfigAlgPar.cxx\
- ../src/HanConfigParMap.cxx\
- ../src/HanConfigAssessor.cxx\
- ../src/HanConfigCompAlg.cxx\
- ../src/HanConfigGroup.cxx\
- ../src/HanConfigMetadata.cxx\
- ../src/HanOutput.cxx\
- ../src/MiniConfig.cxx\
- ../src/MiniConfigTreeNode.cxx\
- ../src/CompositeAlgorithm.cxx\
- ../src/HanInputRootFile.cxx\
- ../src/HanUtils.cxx\
- ../src/ConditionsSingleton.cxx
-
-apply_pattern installed_library
-
-apply_pattern have_root_headers root_headers="MiniConfig.h MiniConfigTreeNode.h HanApp.h \
- HanConfig.h HanConfigAlgLimit.h HanConfigAlgPar.h HanConfigParMap.h HanConfigAssessor.h \
- HanConfigCompAlg.h HanConfigGroup.h HanConfigMetadata.h ConditionsSingleton.h LinkDef.h" \
- headers_lib=DataQualityInterfaces extra_includes=" $(use_includes) "
-
-
-#################
-# Persistency lib
-#################
-
-# disabled UFN
-#library dqm_persistency $(lib_opts) \
-# ../src/dqm_persistency_impl.cxx
-
-#apply_pattern named_installed_library library=dqm_persistency
-
-#apply_pattern have_root_headers root_headers="PAlgorithm.h PMetadata.h PParameter.h PRegion.h \
-# PResult.h PFunctions.h LinkDefdqmp.h" headers_lib=dqm_persistency \
-# extra_includes=" -p $(use_includes) "
-
-
-#############################################################################
-# application: han
-#############################################################################
-
-application han -no_prototypes "../src/han.cxx"
-
-macro han_dependencies "DataQualityInterfaces"
-
-#############################################################################
-# application: han-config-gen
-#############################################################################
-
-application han-config-gen -no_prototypes "../src/han_config_gen.cxx"
-
-macro han-config-gen_dependencies "DataQualityInterfaces"
-
-#############################################################################
-# application: han-config-print
-#############################################################################
-
-application han-config-print -no_prototypes "../src/han_config_print.cxx"
-
-macro han-config-print_dependencies "DataQualityInterfaces"
-
diff --git a/DataQuality/DataQualityTools/cmt/requirements b/DataQuality/DataQualityTools/cmt/requirements
deleted file mode 100644
index af4c73a5c1bc85b330b7e4e88061d833a0afbcc5..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityTools/cmt/requirements
+++ /dev/null
@@ -1,150 +0,0 @@
-package DataQualityTools
-
-author Rob McPherson <Robert.McPherson@cern.ch>
-author Luca Fiorini <Luca.Fiorini@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use LWHists LWHists-* Tools
-
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use AthenaMonitoring AthenaMonitoring-* Control
-use AtlasROOT AtlasROOT-* External
-
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-##########use Identifier Identifier-* DetectorDescription
-
-#topinputs
-##########use TopInputsSelection TopInputsSelection-* Reconstruction/Top
-#use TopInputs TopInputs-* Reconstruction/Top
-
-use ZdcIdentifier ZdcIdentifier-* ForwardDetectors/ZDC
-
-#Track dependencies
-use TrkExInterfaces TrkExInterfaces-* Tracking/TrkExtrapolation
-use RecoToolInterfaces RecoToolInterfaces-* Reconstruction/RecoTools
-#use TrackToCalo TrackToCalo-* Reconstruction/RecoTools
-
-#For Muon-ID trk comparison
-#use muonEvent muonEvent-* Reconstruction/MuonIdentification
-
-use MagFieldInterfaces MagFieldInterfaces-* MagneticField
-
-#use egammaEvent egammaEvent-* Reconstruction/egamma
-#use egammaEvent egammaEvent-* Reconstruction
-
-#use IsolationTool IsolationTool-* Reconstruction/RecoTools
-
-
-#######use TrigDecision TrigDecision-* Trigger/TrigEvent
-use TrigDecisionTool TrigDecisionTool-* Trigger/TrigAnalysis
-use TrigMuonEvent TrigMuonEvent-* Trigger/TrigEvent
-use TrigCaloEvent TrigCaloEvent-* Trigger/TrigEvent
-#use TrigInDetEvent TrigInDetEvent-* Trigger/TrigEvent
-use TrigParticle TrigParticle-* Trigger/TrigEvent
-use AtlasAnalysisRunTime AtlasAnalysisRunTime-*
-
-#use TrkVxEdmCnv TrkVxEdmCnv-* Tracking/TrkVertexFitter
-
-apply_pattern declare_joboptions files="*.py"
-
-apply_pattern declare_runtime files="-s=../share *.dat"
-library DataQualityTools *.cxx -s=components *.cxx
-apply_pattern component_library
-apply_pattern declare_python_modules files="*.py"
-
-macro_append cppflags "" \
-
-
-
-private
-#use AthenaKernel AthenaKernel-* Control
-use xAODCaloEvent xAODCaloEvent-* Event/xAOD
-
-#use AnalysisTriggerEvent AnalysisTriggerEvent-* PhysicsAnalysis/AnalysisTrigger
-#use AtlasCLHEP AtlasCLHEP-* External
-
-# CTP dependency
-use TrigT1Result TrigT1Result-* Trigger/TrigT1
-
-#Inner Detector dependencies
-use InDetRawData InDetRawData-* InnerDetector/InDetRawEvent
-#use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-#use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-
-#Calorimeter dependencies
-#use CaloEvent CaloEvent-* Calorimeter
-use CaloGeoHelpers CaloGeoHelpers-* Calorimeter
-##########use CaloUtils CaloUtils-* Calorimeter
-#use CaloIdentifier CaloIdentifier-* Calorimeter
-#use EventInfo EventInfo-* Event
-#use EventContainers EventContainers-* Event
-
-use ZdcEvent ZdcEvent-* ForwardDetectors/ZDC
-
-#LAr dependencies
-use LArRawEvent LArRawEvent-* LArCalorimeter
-##########use LArIdentifier LArIdentifier-* LArCalorimeter
-##########use LArTools LArTools-* LArCalorimeter
-
-#TileCal dependencies
-#use TileIdentifier TileIdentifier-* TileCalorimeter
-#use TileConditions TileConditions-* TileCalorimeter
-#use TileRecUtils TileRecUtils-* TileCalorimeter
-use TileEvent TileEvent-* TileCalorimeter
-#use TileDetDescr TileDetDescr-* TileCalorimeter
-#use CommissionEvent CommissionEvent-* Commission
-
-#Muons dependencies
-use MuonRDO MuonRDO-* MuonSpectrometer
-
-#use TrkTrack TrkTrack-* Tracking/TrkEvent
-use TrkParameters TrkParameters-* Tracking/TrkEvent
-
-#### for Kshort rate monitoring
-#use TrkVertexAnalysisUtils TrkVertexAnalysisUtils-* Tracking/TrkVertexFitter
-
-#For background monitoring
-use TagEvent TagEvent-* PhysicsAnalysis/EventTag
-use LArRecEvent LArRecEvent-* LArCalorimeter
-use LUCID_RawEvent LUCID_RawEvent-* ForwardDetectors/LUCID
-
-#use MissingETEvent MissingETEvent-* Reconstruction
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent
-#use VxVertex VxVertex-* Tracking/TrkEvent
-
-#use JetUtils JetUtils-* Reconstruction/Jet
-#use TrkSegment TrkSegment-* Tracking/TrkEvent
-#use MuonSegment MuonSegment-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-use MuonRecHelperTools MuonRecHelperTools-* MuonSpectrometer/MuonReconstruction/MuonRecTools
-use MuonCalibITools MuonCalibITools-* MuonSpectrometer/MuonCalib
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-use RecBackgroundEvent RecBackgroundEvent-* Reconstruction/RecBackground
-
-use xAODMuon xAODMuon-* Event/xAOD
-use xAODJet xAODJet-* Event/xAOD
-use xAODTracking xAODTracking-* Event/xAOD
-#use xAODBase xAODBase-* Event/xAOD
-#use xAODEgamma xAODEgamma-* Event/xAOD
-#use xAODTau xAODTau-* Event/xAOD
-use xAODMissingET xAODMissingET-* Event/xAOD
-#use xAODEventInfo xAODEventInfo-* Event/xAOD
-#use xAODBTagging xAODBTagging-* Event/xAOD
-
-use MuonSelectorTools MuonSelectorTools-* PhysicsAnalysis/MuonID
-use IsolationSelection IsolationSelection-* PhysicsAnalysis/AnalysisCommon
-
-#use TrkVxEdmCnv TrkVxEdmCnv-* Tracking/TrkVertexFitter
-
-
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-
-#use GaudiSvc v* -no_auto_imports
-#macro_append use_linkopts " -lGaudiSvc"
-#macro_append use_includes " -I$(GAUDISVCROOT)/src"
-
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
index 08c8caf585d560d21bac1a487fd31b6045dd4ce0..99e080ef3e2868bc5fc92b4251afe681f589b131 100644
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
+++ b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
@@ -11,40 +11,22 @@
#include "DataQualityTools/DQTDataFlowMonTool.h"
//#include "DataQualityTools/DQTTopLeptonJetsFinderTool.h"
//#include "DataQualityTools/DQTGlobalTopDilFinderTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DataQualityTools/DQTGlobalWZFinderTool.h"
#include "DataQualityTools/DQTLumiMonTool.h"
-DECLARE_TOOL_FACTORY(DataQualityFatherMonTool)
-//DECLARE_TOOL_FACTORY(DQTMuTrkEff)
-DECLARE_TOOL_FACTORY(DQTDetSynchMonTool)
-DECLARE_TOOL_FACTORY(DQTMuonIDTrackTool)
-//DECLARE_TOOL_FACTORY(DQTElectronQualityTool)
-//DECLARE_TOOL_FACTORY(DQTGlobalWFinderTool)
-//DECLARE_TOOL_FACTORY(DQTNonCollBkg_ZDC)
-DECLARE_TOOL_FACTORY(DQTBackgroundMon)
-//DECLARE_TOOL_FACTORY(DQTRateMonTool)
-//DECLARE_TOOL_FACTORY(DQTCaloClusterTool)
-DECLARE_TOOL_FACTORY(DQTDataFlowMonTool)
-//DECLARE_TOOL_FACTORY(DQTTopLeptonJetsFinderTool)
-//DECLARE_TOOL_FACTORY(DQTGlobalTopDilFinderTool)
-DECLARE_TOOL_FACTORY(DQTGlobalWZFinderTool)
-DECLARE_TOOL_FACTORY(DQTLumiMonTool)
+DECLARE_COMPONENT( DataQualityFatherMonTool )
+//DECLARE_COMPONENT( DQTMuTrkEff )
+DECLARE_COMPONENT( DQTDetSynchMonTool )
+DECLARE_COMPONENT( DQTMuonIDTrackTool )
+//DECLARE_COMPONENT( DQTElectronQualityTool )
+//DECLARE_COMPONENT( DQTGlobalWFinderTool )
+//DECLARE_COMPONENT( DQTNonCollBkg_ZDC )
+DECLARE_COMPONENT( DQTBackgroundMon )
+//DECLARE_COMPONENT( DQTRateMonTool )
+//DECLARE_COMPONENT( DQTCaloClusterTool )
+DECLARE_COMPONENT( DQTDataFlowMonTool )
+//DECLARE_COMPONENT( DQTTopLeptonJetsFinderTool )
+//DECLARE_COMPONENT( DQTGlobalTopDilFinderTool )
+DECLARE_COMPONENT( DQTGlobalWZFinderTool )
+DECLARE_COMPONENT( DQTLumiMonTool )
-DECLARE_FACTORY_ENTRIES(DataQualityTools) {
- DECLARE_ALGTOOL(DataQualityFatherMonTool);
-// DECLARE_ALGTOOL(DQTMuTrkEff);
- DECLARE_ALGTOOL(DQTDetSynchMonTool);
-// DECLARE_ALGTOOL(DQTCaloClusterTool);
- DECLARE_ALGTOOL(DQTMuonIDTrackTool);
-// DECLARE_ALGTOOL(DQTElectronQualityTool);
-// DECLARE_ALGTOOL(DQTGlobalWFinderTool);
-// DECLARE_ALGTOOL(DQTRateMonTool);
- // DECLARE_ALGTOOL(DQTNonCollBkg_ZDC);
- DECLARE_ALGTOOL(DQTBackgroundMon);
- DECLARE_ALGTOOL(DQTDataFlowMonTool);
-// DECLARE_ALGTOOL(DQTGlobalTopDilFinderTool);
-// DECLARE_ALGTOOL(DQTTopLeptonJetsFinderTool);
- DECLARE_ALGTOOL(DQTGlobalWZFinderTool);
- DECLARE_ALGTOOL(DQTLumiMonTool);
-}
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx
deleted file mode 100644
index 5cc618237985b313d917a05b54872092a2a91980..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DataQualityTools)
diff --git a/DataQuality/DataQualityUtils/cmt/requirements b/DataQuality/DataQualityUtils/cmt/requirements
deleted file mode 100644
index 1e8510ea97b9288c4fbd30577ab9755ea1af5117..0000000000000000000000000000000000000000
--- a/DataQuality/DataQualityUtils/cmt/requirements
+++ /dev/null
@@ -1,156 +0,0 @@
-package DataQualityUtils
-
-author Rob McPherson <Robert.McPherson@cern.ch>
-author Michael G. Wilson <Michael.G.Wilson@cern.ch>
-author Peter Onyisi <ponyisi@cern.ch>
-
-
-private
-
-apply_tag ROOTGraphicsLibs
-apply_tag NEEDS_COOL_FACTORY
-apply_tag ROOTRooFitLibs
-apply_tag ROOTMathLibs
-
-#use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-#use CoraCool CoraCool-* Database
-use DataQualityInterfaces * DataQuality
-#removing due to checkreq.py warnings
-#use DataQualityConfigurations * DataQuality
-#moved to public area due to checkreq.py warnings
-#use AtlasBoost AtlasBoost-* External
-
-macro_append Boost_linkopts " $(Boost_linkopts_regex) "
-#sami -uncomment to enable debug symbols
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-# sami end enable debug build
-
-
-end_private
-
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-#use AtlasPython AtlasPython-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasCOOL AtlasCOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-use AtlasBoost AtlasBoost-* External
-
-# Specify the required ROOT component for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Graf Gpad MathCore RooFit RooFitCore Minuit)"
-
-##############################################################################
-# library: DataQualityUtils
-##############################################################################
-
-library DataQualityUtils $(lib_opts) "\
- ../src/HanOutputFile.cxx\
- ../src/MonitoringFile.cxx\
- ../src/MonitoringFile_CSCPostProcess.cxx\
- ../src/MonitoringFile_RPCPostProcess.cxx\
- ../src/MonitoringFile_MDTPostProcess.cxx\
- ../src/MonitoringFile_TGCPostProcess.cxx\
- ../src/MonitoringFile_MDTvsTGCPostProcess.cxx\
- ../src/MonitoringFile_PPFileWrapper.cxx\
- ../src/MonitoringFile_IDAlignPostProcess.cxx\
- ../src/MonitoringFile_IDPerfPostProcess.cxx\
- ../src/MonitoringFile_DiMuPostProcess.cxx\
- ../src/MonitoringFile_IDEnhancedPrimaryVertex.cxx\
- ../src/MonitoringFile_MoveVertexMonitoring.cxx\
- ../src/MonitoringFile_HLTMuonPostProcess.cxx\
- ../src/MonitoringFile_HLTEgammaPostProcess.cxx\
- ../src/MonitoringFile_HLTTauPostProcess.cxx\
- ../src/MonitoringFile_HLTMETPostProcess.cxx\
- ../src/MonitoringFile_HLTCaloPostProcess.cxx\
- ../src/MonitoringFile_HLTJetPostProcess.cxx\
- ../src/MonitoringFile_HLTMinBiasMonPostProcess.cxx\
- ../src/MonitoringFile_PixelPostProcess.cxx\
- ../src/MonitoringFile_SCTPostProcess.cxx\
- ../src/MonitoringFile_MuonTrackPostProcess.cxx\
- ../src/MonitoringFile_MergeAlgs.cxx\
- ../src/StatusFlagCOOL.cxx\
- ../src/StatusFlagCOOLBase.cxx\
- ../src/StatusFlagCommentCOOL.cxx\
- ../src/HistogramDataCOOL.cxx\
- ../src/CoolRpc.cxx\
- ../src/CoolMdt.cxx\
- ../src/CoolTgc.cxx\
- ../src/MdtDeadNoisyUtils.cxx\
- ../src/MonitoringFile_CSCChamberEfficiency.cxx\
- ../src/MonitoringFile_CSCClusterFit.cxx\
- ../src/MonitoringFile_TgcHistogramDivision.cxx\
- ../src/MonitoringFile_HLTMuonHistogramDivision.cxx\
- ../src/MonitoringFile_HLTEgammaEfficiency.cxx\
- ../src/MonitoringFile_HLTMETAveragePhivsEtaMaps.cxx\
- ../src/MonitoringFile_HLTMETDQFlagSummary.cxx\
- ../src/MonitoringFile_HLTJetCalcEfficiencyAndRate.cxx\
- ../src/MonitoringFile_HLTCaloAveragePtPhiEtaMaps.cxx\
- ../src/MonitoringFile_BJetTaggingPostProcess.cxx\
- ../src/MonitoringFile_BJetTaggingAdjustRanges.cxx\
- ../src/MonitoringFile_BJetTaggingNormalise.cxx\
- ../src/MonitoringFile_L1CaloPostProcess.cxx
-
-apply_pattern installed_library
-
-apply_pattern have_root_headers root_headers="HanOutputFile.h MonitoringFile.h StatusFlagCOOL.h \
- StatusFlagCOOLBase.h StatusFlagCommentCOOL.h HistogramDataCOOL.h CoolRpc.h \
- CoolMdt.h CoolTgc.h MdtDeadNoisyUtils.h RootLinkDef.h" \
- extra_includes='-p ${use_includes}' headers_lib=DataQualityUtils
-
-
-#############################################################################
-# application: han-results-print
-#############################################################################
-
-application han-results-print -no_prototypes "../src/han_results_print.cxx"
-
-macro han-results-print_dependencies "DataQualityUtils"
-alias han-results-print han-results-print.exe
-
-#uncomment to build c++ postprocessing test application
-#application PostProcessTest -no_prototypes "../share/PostProcessTest.cxx"
-#macro PostProcessTest_dependencies "DataQualityUtils"
-#application MergeFilesTest -no_prototypes "../share/MergeFilesTest.cxx"
-#macro MergeFilesTest_dependencies "DataQualityUtils"
-#application GetHanResultsTest -no_prototypes "../share/HanResultsTest.cxx"
-#macro GetHanResultsTest_dependencies "DataQualityUtils"
-
-
-##############################################################################
-# python modules and scripts
-##############################################################################
-
-## Python scripts are in the 'scripts' directory; only some are installed
-apply_pattern declare_scripts files='-s=../scripts CreateDB.py CreateDB_Histo.py \
- DQHistogramMerge.py DQHistogramPrintStatistics.py \
- DQWebDisplay.py hancool_histo.py hancool.py handi.py historyDisplay.py \
- DQFileMove.py CreateMDTConfig_algos.sh CreateMDTConfig_chambers.sh \
- CreateMDTConfig_config.sh CreateMDTConfig_files.sh CreateMDTConfig_readme.sh \
- DQM_Tier0Wrapper_trf.py DQHistogramMergeRegExp.py dq_make_web_display.py \
- ScanHistFile.py physval_make_web_display.py\
- '
-
-alias CreateDB_Histo CreateDB_Histo.py
-alias DQHistogramMerge DQHistogramMerge.py
-alias DQHistogramPrintStatistics DQHistogramPrintStatistics.py
-alias DQWebDisplay DQWebDisplay.py
-alias hancool_histo hancool_histo.py
-alias hancool hancool.py
-alias handi handi.py
-alias historyDisplay historyDisplay.py
-alias CreateMDTConfig_algos CreateMDTConfig_algos.sh
-alias CreateMDTConfig_chambers CreateMDTConfig_chambers.sh
-alias CreateMDTConfig_config CreateMDTConfig_config.sh
-alias CreateMDTConfig_files CreateMDTConfig_files.sh
-alias CreateMDTConfig_readme CreateMDTConfig_readme.sh
-
-## These plugins are for the QuerryDB.py script; uncomment if you install it (above)
-#apply_pattern generic_declare_for_link kind=python_plugins \
-# files='-s=../python/plugins default.py' \
-# prefix=share/bin/plugins
-
-## Python modules are in the 'python' directory
-apply_pattern declare_python_modules files='*.py'
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
index 1f47e66d5bc718f83eec49cdff93d4ee462a8d3e..388feacfcbcdef7fd19ffcf3d3cfd7c9ebae7f41 100644
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
+++ b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
@@ -1,21 +1,12 @@
#include "GoodRunsLists/GoodRunsListSelectorTool.h"
#include "GoodRunsLists/TriggerRegistryTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "GoodRunsLists/GoodRunsListSelectionTool.h"
-DECLARE_TOOL_FACTORY( GoodRunsListSelectorTool )
-DECLARE_TOOL_FACTORY( GoodRunsListSelectionTool )
-DECLARE_TOOL_FACTORY( TriggerRegistryTool )
+DECLARE_COMPONENT( GoodRunsListSelectorTool )
+DECLARE_COMPONENT( GoodRunsListSelectionTool )
+DECLARE_COMPONENT( TriggerRegistryTool )
#include "../GRLSelectorAlg.h"
-DECLARE_ALGORITHM_FACTORY( GRLSelectorAlg )
-
-DECLARE_FACTORY_ENTRIES( GoodRunsLists ) {
- DECLARE_ALGORITHM( GRLSelectorAlg );
- //DECLARE_ALGTOOL( GoodRunsListSelectorTool )
- DECLARE_TOOL( GoodRunsListSelectorTool )
- DECLARE_TOOL( GoodRunsListSelectionTool )
- DECLARE_ALGTOOL( TriggerRegistryTool )
-}
+DECLARE_COMPONENT( GRLSelectorAlg )
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx
deleted file mode 100644
index 262e455eaef998c8f18a6f26e02bc7612fab45d6..0000000000000000000000000000000000000000
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GoodRunsLists)
-
diff --git a/DataQuality/GoodRunsListsUser/cmt/requirements b/DataQuality/GoodRunsListsUser/cmt/requirements
deleted file mode 100644
index 3b77bb25b398539a301728964c793b1572f5d468..0000000000000000000000000000000000000000
--- a/DataQuality/GoodRunsListsUser/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package GoodRunsListsUser
-
-author Max Baak <mbaak@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use EventInfo EventInfo-* Event
-use GoodRunsLists GoodRunsLists-* DataQuality
-use LumiBlockComps LumiBlockComps-* LumiBlock
-use StoreGate StoreGate-* Control
-
-use TrigDecisionEvent TrigDecisionEvent-* Trigger/TrigEvent # rel 15
-use TrigDecisionTool TrigDecisionTool-* Trigger/TrigAnalysis # rel 15
-
-## macros
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-
-library GoodRunsListsUser "../src/*.cxx ../src/components/*.cxx"
-apply_pattern component_library
-
-## requirements file, scripts, jobOptions and python modules
-apply_pattern declare_joboptions files="*.py"
-
-private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-
diff --git a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
index 4eae3c17e5b6bd2c7a15538fe950c23a19af5b8a..a6920e11c96688722a66df8064a8ed62db138318 100644
--- a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
+++ b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
@@ -2,17 +2,9 @@
#include "GoodRunsListsUser/TriggerSelectorAlg.h"
#include "GoodRunsListsUser/GoodRunsListSelectorAlg.h"
#include "GoodRunsListsUser/GRLTriggerSelectorAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( DummyDumperAlg )
-DECLARE_ALGORITHM_FACTORY( TriggerSelectorAlg )
-DECLARE_ALGORITHM_FACTORY( GoodRunsListSelectorAlg )
-DECLARE_ALGORITHM_FACTORY( GRLTriggerSelectorAlg )
-
-DECLARE_FACTORY_ENTRIES( GoodRunsListsUser ) {
- DECLARE_ALGORITHM( DummyDumperAlg )
- DECLARE_ALGORITHM( TriggerSelectorAlg )
- DECLARE_ALGORITHM( GoodRunsListSelectorAlg )
- DECLARE_ALGORITHM( GRLTriggerSelectorAlg )
-}
+DECLARE_COMPONENT( DummyDumperAlg )
+DECLARE_COMPONENT( TriggerSelectorAlg )
+DECLARE_COMPONENT( GoodRunsListSelectorAlg )
+DECLARE_COMPONENT( GRLTriggerSelectorAlg )
diff --git a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx
deleted file mode 100644
index 9b9d393fcfae209be299e45b3901f1771efc3499..0000000000000000000000000000000000000000
--- a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GoodRunsListsUser)
-
diff --git a/DataQuality/dqm_algorithms/cmt/Makefile b/DataQuality/dqm_algorithms/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/DataQuality/dqm_algorithms/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/DataQuality/dqm_algorithms/cmt/requirements b/DataQuality/dqm_algorithms/cmt/requirements
deleted file mode 100644
index 8d721075aae9a0c10764696df95595fe21b17436..0000000000000000000000000000000000000000
--- a/DataQuality/dqm_algorithms/cmt/requirements
+++ /dev/null
@@ -1,74 +0,0 @@
-package dqm_algorithms
-author Peter Onyisi <ponyisi@utexas.edu>
-
-##############################################################################
-public
-##############################################################################
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-# DRQ: It's important that the AtlasBoost dependency comes before the DQM_Core one since the
-# latter overrides the Boost version in a way that's incompatible with the ATLAS offline
-use AtlasBoost AtlasBoost-* External
-use DQM_Core DQM_Core-* External
-
-# Specify the required Boost and ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(Boost COMPONENTS program_options)"
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS MathCore Hist)"
-
-# online options (only when building against AtlasHLT)
-macro online_use "" AtlasHLT_scripts "HLTtdaq HLTtdaq-* HLT/HLTExternal"
-use $(online_use)
-
-##############################################################################
-private
-##############################################################################
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-macro_append ers_linkopts "$(tdaqc_linkopts) -lers "
-# online options (only when building against AtlasHLT)
-macro_append AtlasCxxPolicy_pp_cppflags "" AtlasHLT_scripts "-DONLINE"
-
-##############################################################################
-# libraries
-##############################################################################
-
-library dqm_algorithms "../src/*.cxx \
- ../tools/AlgorithmHelper.cxx \
- ../tools/SimpleAlgorithmConfig.cxx"
-apply_pattern installed_library
-
-library dqm_tools "../tools/DumpConfig.cxx"
-macro_append dqm_tools_dependencies " dqm_algorithms"
-apply_pattern named_installed_library library=dqm_tools
-
-library dqm_summaries "../summary/*.cxx"
-macro_append dqm_summaries_dependencies " dqm_tools"
-apply_pattern named_installed_library library=dqm_summaries
-
-#############################################################################
-# dictionaries
-#############################################################################
-
-# Uncomment the following lines if you want to use the workbench
-
-apply_pattern lcgdict dict=dqm_algorithms selectionfile=../dqm_algorithms/selection.xml \
- headerfiles=../dqm_algorithms/dqm_algorithmsDict.h
-
-apply_pattern lcgdict dict=dqm_tools selectionfile=../dqm_algorithms/tools/selection.xml \
- headerfiles=../dqm_algorithms/tools/dqm_toolsDict.h
-
-#############################################################################
-# applications
-#############################################################################
-
-application dqm_print_algorithms "../test/print_algorithms.cpp"
-macro_append dqm_print_algorithmslinkopts "$(Boost_linkopts) $(Boost_linkopts_program_options)"
-alias dqm_print_algorithms dqm_print_algorithms.exe
-macro_append dqm_print_algorithms_dependencies " dqm_summaries"
-
-application dqm_print_summarymakers "../test/print_summarymakers.cpp"
-macro_append dqm_print_summarymakerslinkopts "$(Boost_linkopts) $(Boost_linkopts_program_options)"
-alias dqm_print_summarymakers dqm_print_summarymakers.exe
-macro_append dqm_print_summarymakers_dependencies " dqm_summaries"
diff --git a/Database/APR/FileCatalog/cmt/requirements b/Database/APR/FileCatalog/cmt/requirements
deleted file mode 100644
index 5bcd27a25dc0123405b06f07569d063aab2ff07c..0000000000000000000000000000000000000000
--- a/Database/APR/FileCatalog/cmt/requirements
+++ /dev/null
@@ -1,55 +0,0 @@
-package FileCatalog
-
-# imported to ATLAS by:
-author Marcin Nowak
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCORAL AtlasCORAL-* External
-use POOLCore POOLCore-* Database/APR
-use AthenaBaseComps AthenaBaseComps-* Control
-
-#======= LIBRARY
-library FileCatalog *.cpp
-apply_pattern installed_library
-
-
-private
-#======= TESTS
-use GaudiInterface GaudiInterface-* External
-use TestTools TestTools-* AtlasTest
-
-apply_pattern install_runtime
-apply_pattern UnitTest_run unit_test=FCEntry
-# implWrapper requires mysql runtime
-#apply_pattern UnitTest_run unit_test=implWrapper
-apply_pattern UnitTest_run unit_test=QueryParser
-apply_pattern UnitTest_run unit_test=URIParser
-
-
-#======= UTILITIES
-apply_pattern pool_utility name=FCaddMetaData
-apply_pattern pool_utility name=FCaddReplica
-apply_pattern pool_utility name=FCcreateMetaDataSpec
-apply_pattern pool_utility name=FCdeleteEntry
-apply_pattern pool_utility name=FCdeleteLFN
-apply_pattern pool_utility name=FCdeleteMetaData
-apply_pattern pool_utility name=FCdeletePFN
-apply_pattern pool_utility name=FCdescribeMetaData
-apply_pattern pool_utility name=FCdropMetaData
-apply_pattern pool_utility name=FClistGUID
-apply_pattern pool_utility name=FClistLFN
-apply_pattern pool_utility name=FClistMetaData
-apply_pattern pool_utility name=FClistPFN
-apply_pattern pool_utility name=FCpublish
-apply_pattern pool_utility name=FCregisterLFN
-apply_pattern pool_utility name=FCregisterPFN
-apply_pattern pool_utility name=FCrenamePFN
-apply_pattern pool_utility name=FCupdateMetaDataSpec
-
-
-
-
-
-
-
-
diff --git a/Database/APR/ImplicitCollection/cmt/requirements b/Database/APR/ImplicitCollection/cmt/requirements
deleted file mode 100644
index f252ddc7fda81c190bb570b2d873581ad961e64d..0000000000000000000000000000000000000000
--- a/Database/APR/ImplicitCollection/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package ImplicitCollection
-
-# imported to ATLAS by:
-author Marcin Nowak
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasCORAL AtlasCORAL-* External
-use AthenaKernel AthenaKernel-* Control
-use PersistentDataModel PersistentDataModel-* Database
-use CollectionBase CollectionBase-* Database/APR
-
-use POOLCore POOLCore-* Database/APR
-use PersistencySvc PersistencySvc-* Database/APR
-use StorageSvc StorageSvc-* Database/APR
-
-#======= PLUGIN LIBRARY
-apply_pattern pool_plugin_library
-
diff --git a/Database/APR/POOLCore/cmt/requirements b/Database/APR/POOLCore/cmt/requirements
deleted file mode 100644
index 64d5e2ab11f923a25cd500376a8948a0980824df..0000000000000000000000000000000000000000
--- a/Database/APR/POOLCore/cmt/requirements
+++ /dev/null
@@ -1,35 +0,0 @@
-package POOLCore
-
-# imported to ATLAS by:
-author Marcin Nowak
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCORAL AtlasCORAL-* External
-use AtlasBoost AtlasBoost-* External
-
-#======= LIBRARY
-library POOLCore *.cpp
-apply_pattern installed_library
-
-#======= PATTERNS
-pattern pool_plugin_library \
- macro_append <package>_dependencies " install_includes" ;\
- library <package> *.cpp ; \
- macro <package>_shlibflags "$(componentshr_linkopts) $(use_linkopts) " ; \
- apply_pattern generate_componentslist library=<package> ; \
- apply_pattern optdebug_library name=<package>
-
-
-pattern pool_utility \
- macro_append <name>_dependencies <package> ; \
- application <name> ../utilities/<name>.cpp application_suffix=""
-
-
-private
-#======= TESTS
-use TestTools TestTools-* AtlasTest -no_auto_imports
-
-apply_pattern install_runtime
-apply_pattern UnitTest_run unit_test=CommandOptions
-
-end_private
diff --git a/Database/APR/PersistencySvc/cmt/requirements b/Database/APR/PersistencySvc/cmt/requirements
deleted file mode 100644
index 71bc198f608458b35584f3ea92768c2f668879f3..0000000000000000000000000000000000000000
--- a/Database/APR/PersistencySvc/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package PersistencySvc
-
-# imported to ATLAS by:
-author Marcin Nowak
-
-use AtlasPolicy AtlasPolicy-*
-use POOLCore POOLCore-* Database/APR
-use StorageSvc StorageSvc-* Database/APR
-use DataModelRoot DataModelRoot-* Control
-
-#======= LIBRARY
-library PersistencySvc *.cpp
-apply_pattern installed_library
-
-#======= UTILITIES
-apply_pattern pool_utility name=pool_extractFileIdentifier
-apply_pattern pool_utility name=pool_insertFileToCatalog
-
-private
-use FileCatalog FileCatalog-* Database/APR
-use AtlasCORAL AtlasCORAL-* External
-use AthenaKernel AthenaKernel-* Control
-use PersistentDataModel PersistentDataModel-* Database
-
diff --git a/Database/APR/RelationalCollection/cmt/requirements b/Database/APR/RelationalCollection/cmt/requirements
deleted file mode 100644
index 2f5dd06991eb5df1584317db2f5167968672f53e..0000000000000000000000000000000000000000
--- a/Database/APR/RelationalCollection/cmt/requirements
+++ /dev/null
@@ -1,34 +0,0 @@
-package RelationalCollection
-
-# imported from LCG/POOL to ATLAS by:
-author Marcin Nowak
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasCORAL AtlasCORAL-* External
-use POOLCore POOLCore-* Database/APR
-use CollectionBase CollectionBase-* Database/APR
-use PersistentDataModel PersistentDataModel-* Database
-
-apply_pattern pool_plugin_library
-
-
-#========= TESTS
-use TestPolicy TestPolicy-*
-
-pattern RelationalCollection_test_run \
- use TestTools TestTools-* AtlasTest ; \
- application <name>_test -suffix=_<name> "../tests/<name>/*.cpp" application_suffix="" ; \
- document athenarun_launcher <name>_utest -group=$(whichGroup) \
- athenarun_exe="'../${CMTCONFIG}/<name>_test'" \
- athenarun_pre="'. ../cmt/setup.sh ; rm -f pool*.root *xml'" \
- athenarun_opt="" \
- athenarun_out="' > <name>_test.log 2>&1'" \
- athenarun_post="'post.sh <name>_test $(q)<extrapatterns>$(q)'"
-
-
-# The unit tests
-apply_pattern RelationalCollection_test_run name=WriteRead
-apply_pattern RelationalCollection_test_run name=WriteUpdate
diff --git a/Database/APR/StorageSvc/cmt/requirements b/Database/APR/StorageSvc/cmt/requirements
deleted file mode 100644
index 2fa2bc8cea7b16f69c6ab1f17fbab6ad70aa0359..0000000000000000000000000000000000000000
--- a/Database/APR/StorageSvc/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-package StorageSvc
-
-# imported to ATLAS by:
-author Marcin Nowak
-
-use uuid * LCG_Interfaces
-use AtlasPolicy AtlasPolicy-*
-use AtlasReflex AtlasReflex-* External -no_auto_import
-use AtlasCORAL AtlasCORAL-* External
-use CxxUtils CxxUtils-* Control
-use PersistentDataModel PersistentDataModel-* Database
-use DataModelRoot DataModelRoot-* Control
-
-#======= LIBRARY
-library StorageSvc *.cpp
-apply_pattern installed_library
-
-#======= DICTIONARY
-apply_pattern lcgdict dict=StorageSvc selectionfile=../StorageSvc/dict.xml \
- headerfiles=../StorageSvc/dict.h
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-use AthContainers AthContainers-* Control
-
-# C++ options just for StorageSvc compilation, private so it does not propagate!
-macro_append StorageSvc_cppflags ' '\
- target-gcc42 ''\
- target-gcc ' -std=c++0x -Wno-deprecated '\
- target-icc ' -Wno-deprecated '
-
-#======= TESTS
-use TestTools TestTools-* AtlasTest
-apply_tag ROOTThreadLibs
-
-apply_pattern install_runtime
-apply_pattern UnitTest_run unit_test=StorageSvc_mtShape extrapatterns=".*"
-apply_pattern UnitTest_run unit_test=StorageSvc_DbBlob
diff --git a/Database/APR/Tests/cmt/requirements b/Database/APR/Tests/cmt/requirements
deleted file mode 100644
index cb98fffc3aa13cedf67220045dcc653b73fc4d8c..0000000000000000000000000000000000000000
--- a/Database/APR/Tests/cmt/requirements
+++ /dev/null
@@ -1,126 +0,0 @@
-#=============================================================
-# The System and Integration Tests of POOL
-#=============================================================
-package Tests
-
-# imported to ATLAS by:
-author Marcin Nowak
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_import
-use AtlasROOT AtlasROOT-* External -no_auto_import
-use PersistentDataModel PersistentDataModel-* Database
-use FileCatalog FileCatalog-* Database/APR
-use PersistencySvc PersistencySvc-* Database/APR
-use StorageSvc StorageSvc-* Database/APR
-
-
-include_dirs $(Tests_root)
-include_dirs $(Tests_root)/TestDictionary
-
-#=============================================================
-# General Patterns
-#=============================================================
-
-pattern APRTest_run \
- use TestTools TestTools-* AtlasTest ; \
- use CppUnit * LCG_Interfaces ; \
- application <name>_test -suffix=_<name> "../<name>/*.cpp" ; \
- document athenarun_launcher <name>_utest -group=$(whichGroup) \
- athenarun_exe="'../${CMTCONFIG}/<name>_test.exe'" \
- athenarun_pre="'. ../cmt/setup.sh ; rm -f pool*.root *xml'" \
- athenarun_opt="" \
- athenarun_out="' > <name>_test.log 2>&1'" \
- athenarun_post="'../test/post.sh <name>_test $(q)<extrapatterns>$(q)'"
-
-# do not merge test dictionary rootmaps with the global rootmap
-apply_tag no_rootmap
-
-# The pattern for generating a dictionary AND running a test case
-pattern APRTest_withDict \
- apply_pattern lcgdict dict=test_<name> headerfiles=<headerfiles> \
- selectionfile=../<name>/classes.xml ; \
- macro_append reflex_dicttest_<name>_options " -I$(Tests_root)/<name> " ; \
- macro_append test_<name>Dict_pp_cppflags " -I$(Tests_root)/<name> " ;\
- apply_pattern APRTest_run name=<name>
-
-
-#=============================================================
-# The common Test dictionary
-#=============================================================
-
-apply_pattern lcgdict dict=test_TestDictionary \
- selectionfile=../TestDictionary/classes.xml \
- headerfiles=../TestDictionary/dict_all.h
-
-#=============================================================
-# The Tests
-#=============================================================
-
-# The StorageSvc functional tests
-
-apply_pattern APRTest_run name=StorageSvc_BasicFunctionality
-
-apply_pattern APRTest_run name=StorageSvc_MultipleIterators
-
-apply_pattern APRTest_run name=StorageSvc_ParallelReadWrite
-
-apply_pattern APRTest_withDict name=StorageSvc_TransientMembers \
- headerfiles=../StorageSvc_TransientMembers/TestClassWithTransients.h
-
-
-
-# The FileCatalog functional tests
-
-#apply_pattern APRTest_run name=FileCatalog_Functionality
-
-
-# The PersistencySvc functional tests
-
-apply_pattern APRTest_run name=PersistencySvc_Functionality
-
-apply_pattern APRTest_run name=PersistencySvc_FileCatalogOperations
-
-apply_pattern APRTest_run name=PersistencySvc_FileOpenWithoutCatalog
-
-apply_pattern APRTest_run name=PersistencySvc_Parameters
-
-apply_pattern APRTest_withDict name=PersistencySvc_NoClassID \
- headerfiles=../PersistencySvc_NoClassID/MyTestClass.h
-
-
-
-# The Collection functional tests
-
-#apply_pattern collection_test name=ExplicitCollection_Functionality
-#macro_append test_ExplicitCollection_Functionalitylinkopts " $(ROOT_linkopts) "
-#apply_pattern dictionary_library_for_test_refs name=ExplicitCollection_Functionality headerfiles=../ExplicitCollection_Functionality/src/ExampleClass.h
-
-#apply_pattern collection_test name=ImplicitCollection_Functionality
-
-#apply_pattern collection_test name=ImplicitCollection_EmbeddedRefs
-#apply_pattern dictionary_library_for_test_refs name=ImplicitCollection_EmbeddedRefs headerfiles=../ImplicitCollection_EmbeddedRefs/src/MyTestClasses.h
-
-#apply_pattern collection_test name=ImplicitCollection_MixedContainer
-#apply_pattern dictionary_library_for_test_refs name=ImplicitCollection_MixedContainer headerfiles=../ImplicitCollection_MixedContainer/src/MyTestClasses.h
-
-#apply_pattern collection_test name=ImplicitCollection_Untyped
-#apply_pattern dictionary_library_for_test_refs name=ImplicitCollection_Untyped headerfiles=../ImplicitCollection_Untyped/src/MyTestClasses.h
-
-#apply_pattern collection_test name=Collection_Write
-
-
-# Make tests run sequentially
-macro_append StorageSvc_MultipleIterators_utest_dependencies " StorageSvc_BasicFunctionality_utest "
-macro_append StorageSvc_ParallelReadWrite_utest_dependencies " StorageSvc_MultipleIterators_utest "
-macro_append StorageSvc_TransientMembers_utest_dependencies " StorageSvc_ParallelReadWrite_utest "
-
-macro_append PersistencySvc_Functionality_utest_dependencies " StorageSvc_TransientMembers_utest "
-macro_append PersistencySvc_FileCatalogOperations_utest_dependencies " PersistencySvc_Functionality_utest "
-macro_append PersistencySvc_FileOpenWithoutCatalog_utest_dependencies " PersistencySvc_FileCatalogOperations_utest "
-macro_append PersistencySvc_Parameters_utest_dependencies " PersistencySvc_FileOpenWithoutCatalog_utest "
-macro_append PersistencySvc_NoClassID_utest_dependencies " PersistencySvc_Parameters_utest "
-
-##macro_append FileCatalog_Functionality_utest_dependencies " PersistencySvc_NoClassID_utest "
diff --git a/Database/APR/XMLCatalog/cmt/requirements b/Database/APR/XMLCatalog/cmt/requirements
deleted file mode 100644
index cd9d4ec34b6608e71894de82efdabe8a78570215..0000000000000000000000000000000000000000
--- a/Database/APR/XMLCatalog/cmt/requirements
+++ /dev/null
@@ -1,31 +0,0 @@
-package XMLCatalog
-
-# imported to ATLAS by:
-author Marcin Nowak
-
-use GaudiInterface GaudiInterface-* External
-use AtlasPolicy AtlasPolicy-*
-
-use FileCatalog FileCatalog-* Database/APR
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-use AtlasCORAL AtlasCORAL-* External
-use AtlasXercesC AtlasXercesC-* External
-use AtlasCppUnit AtlasCppUnit-* External
-use PersistentDataModel PersistentDataModel-* Database
-
-#======= PLUGIN LIBRARY
-apply_pattern pool_plugin_library
-
-#======= TESTS
-use TestPolicy TestPolicy-*
-
-pattern APR_test \
- use TestTools TestTools-* AtlasTest ; \
- apply_pattern CppUnit name=<name> files=../test/<name>_test.cxx
-
-apply_pattern install_runtime
-apply_pattern APR_test name=XMLFunctionality
-apply_pattern APR_test name=XMLmetaTest
-
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/cmt/requirements b/Database/AthenaPOOL/AthenaPoolCnvSvc/cmt/requirements
deleted file mode 100644
index 391369efe1dc4791a24c13f4d10a191ad983b4e2..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/cmt/requirements
+++ /dev/null
@@ -1,60 +0,0 @@
-package AthenaPoolCnvSvc
-
-author Peter Van Gemmeren <gemmeren@bnl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPOOL AtlasPOOL-* External
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-use AtlasBoost AtlasBoost-* External
-use AthContainers AthContainers-* Control
-use AthLinks AthLinks-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use CLIDSvc CLIDSvc-* Control
-use CxxUtils CxxUtils-* Control
-use DataModelRoot DataModelRoot-* Control
-use SGTools SGTools-* Control
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-use PersistentDataModel PersistentDataModel-* Database
-use TPTools TPTools-* Database
-
-macro AthenaPoolCnvSvc_shlibflags " $(AtlasPOOL_Service) "
-apply_pattern dual_use_library files=*.cxx
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-
-# Set the POOL_AUTH_PATH to the default location of the authentication file (authentication.xml)
-# POOL will look for the credentials from the first match to the last.
-# To override the credentials one must PREPEND the location in the env variable
-set POOL_AUTH_PATH "${AthenaPoolCnvSvc_root}/share"
-
-private
-use AthContainersInterfaces AthContainersInterfaces-* Control
-use AthContainersRoot AthContainersRoot-* Control
-use RootUtils RootUtils-* Control
-use StoreGate StoreGate-* Control
-
-private
-apply_tag ROOTSTLDictLibs
-
-
-private
-
-# Dictionary entries used by the unit tests.
-# Use no_rootmap so that they're not visible to other packages.
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_tag no_rootmap
-apply_pattern lcgdict dict=AthenaPoolCnvSvcTest selectionfile=selection_test.xml\
- headerfiles="../test/AthenaPoolCnvSvcTestDict.h"
-
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=exceptions
-apply_pattern UnitTest_run unit_test=TPCnvElt
-apply_pattern UnitTest_run unit_test=TPCnvList
-apply_pattern UnitTest_run unit_test=T_AthenaPoolViewVectorCnv
-apply_pattern UnitTest_run unit_test=T_AthenaPoolxAODCnv
-apply_pattern UnitTest_run unit_test=T_AthenaPoolAuxContainerCnv
-apply_pattern UnitTest_run unit_test=T_AthenaPoolTPCnvCnv
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
index 903e1834b92f4e3a021b93970b5c9db0b1e17d53..c746b4d7950531cf072136fb97becbf111553a06 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.h
@@ -157,7 +157,6 @@ public:
/// Implementation of IIncidentListener: Handle for EndEvent incidence
void handle(const Incident& incident);
-protected: // constructor and destructor
/// Standard Service Constructor
AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLocator);
/// Destructor
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
index f5f46df77847dce5f5bd20de9137c4265f6a2439..0a5c71facf9a91878970cbb3f7546c3e07a5738e 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
@@ -1,27 +1,12 @@
-/** @file AthenaPoolCnvSvc_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolCnvSvc_entries.cxx,v 1.14 2006-10-20 14:18:13 hawkings Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaPoolCnvSvc.h"
#include "../AthenaRootSerializeSvc.h"
#include "../AthenaAttributeListCnv.h"
#include "../CondAttrListCollCnv.h"
#include "../CondAttrListVecCnv.h"
-DECLARE_SERVICE_FACTORY(AthenaPoolCnvSvc)
-DECLARE_SERVICE_FACTORY(AthenaRootSerializeSvc)
-DECLARE_CONVERTER_FACTORY(AthenaAttributeListCnv)
-DECLARE_CONVERTER_FACTORY(CondAttrListCollCnv)
-DECLARE_CONVERTER_FACTORY(CondAttrListVecCnv)
+DECLARE_COMPONENT( AthenaPoolCnvSvc )
+DECLARE_COMPONENT( AthenaRootSerializeSvc )
+DECLARE_CONVERTER_FACTORY( AthenaAttributeListCnv )
+DECLARE_CONVERTER_FACTORY( CondAttrListCollCnv )
+DECLARE_CONVERTER_FACTORY( CondAttrListVecCnv )
-DECLARE_FACTORY_ENTRIES(AthenaPoolCnvSvc) {
- DECLARE_SERVICE(AthenaPoolCnvSvc);
- DECLARE_SERVICE(AthenaRootSerializeSvc);
- DECLARE_CONVERTER(AthenaAttributeListCnv);
- DECLARE_CONVERTER(CondAttrListCollCnv);
- DECLARE_CONVERTER(CondAttrListVecCnv);
-}
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx
deleted file mode 100644
index 13f284587bc6e3f481983d441138927e75ff2a4e..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolCnvSvc_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolCnvSvc_load.cxx,v 1.5 2005-01-10 18:11:16 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolCnvSvc)
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/cmt/requirements b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/cmt/requirements
deleted file mode 100755
index dc5e7545e8f79d616e9a34de8919066457584399..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/cmt/requirements
+++ /dev/null
@@ -1,216 +0,0 @@
-package AthenaPoolExampleAlgorithms
-
-author Peter Van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use GaudiInterface GaudiInterface-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use StoreGate StoreGate-* Control
-use ByteStreamData ByteStreamData-* Event
-use EventInfo EventInfo-* Event
-use EventBookkeeperMetaData EventBookkeeperMetaData-* Event
-use AthenaPoolExampleData AthenaPoolExampleData-* Database/AthenaPOOL/AthenaPoolExample
-use AthenaPoolKernel AthenaPoolKernel-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use DBDataModel DBDataModel-* Database/AthenaPOOL
-
-apply_pattern component_library
-library AthenaPoolExampleAlgorithms *.cxx components/*.cxx
-
-apply_pattern declare_joboptions files="-s=../share *.py"
-
-private
-
-# Setup automatic testing which runs with gmake check
-# Test infrastructure
-use TestPolicy TestPolicy-*
-use MinimalRunTime MinimalRunTime-* Control -no_auto_imports
-
-# We define here a macro which can be used to run the tests only on
-# optimized mode.
-macro test_pattern_opt_only "athenarun_test" \
- debug ""
-
-# Tests were updated for cmake
-# Write out some simple data objects (hits):
-# AthenaPoolExample_Write
-apply_pattern athenarun_test name="AthenaPoolExample_Write" pre_script="../test/pre_check.sh AthenaPoolExample_Write " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_WriteJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_Write "
-
-# AthenaPoolExample_Append
-apply_pattern athenarun_test name="AthenaPoolExample_Append" pre_script="../test/pre_check.sh AthenaPoolExample_Append " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_AppendJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_Append "
-
-# Write/read out some simple data objects (hits -> tracks):
-# AthenaPoolExample_ReWrite
-apply_pattern athenarun_test name="AthenaPoolExample_ReWrite" pre_script="../test/pre_check.sh AthenaPoolExample_ReWrite " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_RWJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReWrite "
-
-# Read some simple data objects (hits, tracks), using global BackNavigation:
-# AthenaPoolExample_Read
-apply_pattern athenarun_test name="AthenaPoolExample_Read" pre_script="../test/pre_check.sh AthenaPoolExample_Read " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_Read "
-
-# Read via TAG collections:
-# AthenaPoolExample_ReadTag
-apply_pattern athenarun_test name="AthenaPoolExample_ReadTag" pre_script="../test/pre_check.sh AthenaPoolExample_ReadTag " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadTagJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadTag "
-
-# Read with scoped BackNavigation (finding parent hits in SPF3.root from SPF1.root):
-# AthenaPoolExample_ReadBN
-apply_pattern athenarun_test name="AthenaPoolExample_ReadBN" pre_script="../test/pre_check.sh AthenaPoolExample_ReadBN " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadBNJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadBN AthenaPoolExample_Read "
-
-# Read without BackNavigation (not finding parent hits in SPF3.root from SPF1.root):
-# AthenaPoolExample_ReadNoBN
-apply_pattern athenarun_test name="AthenaPoolExample_ReadNoBN" pre_script="../test/pre_check.sh AthenaPoolExample_ReadNoBN " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadNoBNJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadNoBN "
-
-
-# Create a direct pers -> pers copy of SPF1.root:
-# AthenaPoolExample_Copy
-apply_pattern athenarun_test name="AthenaPoolExample_Copy" pre_script="../test/pre_check.sh AthenaPoolExample_Copy " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_CopyJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_Copy "
-
-# Write/read out some simple data objects (replicated hits -> tracks), extending provenance:
-# AthenaPoolExample_ReWriteAgain
-apply_pattern athenarun_test name="AthenaPoolExample_ReWriteAgain" pre_script="../test/pre_check.sh AthenaPoolExample_ReWriteAgain " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReWriteAgainJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReWriteAgain AthenaPoolExample_ReWrite "
-
-# Write/read out some simple data objects (tracks -> tracks), extending provenance:
-# AthenaPoolExample_ReWriteNext
-apply_pattern athenarun_test name="AthenaPoolExample_ReWriteNext" pre_script="../test/pre_check.sh AthenaPoolExample_ReWriteNext " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReWriteNextJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReWriteNext "
-
-# Filter out some simple data objects (tracks -> tracks):
-# AthenaPoolExample_Filter
-apply_pattern athenarun_test name="AthenaPoolExample_Filter" pre_script="../test/pre_check.sh AthenaPoolExample_Filter " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_FilterJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_Filter "
-
-# Read Filter out some simple data objects (tracks -> tracks):
-# AthenaPoolExample_RFilter
-apply_pattern athenarun_test name="AthenaPoolExample_RFilter" pre_script="../test/pre_check.sh AthenaPoolExample_RFilter " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_RFilterJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_RFilter "
-
-# AthenaPoolExample_ReadAgain
-apply_pattern athenarun_test name="AthenaPoolExample_ReadAgain" pre_script="../test/pre_check.sh AthenaPoolExample_ReadAgain " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadAgainJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadAgain "
-
-# Write/read out some simple data objects (hits -> tracks), without extending provenance:
-# AthenaPoolExample_ReWriteSkip
-apply_pattern athenarun_test name="AthenaPoolExample_ReWriteSkip" pre_script="../test/pre_check.sh AthenaPoolExample_ReWriteSkip " options="./AthenaPoolExample_ReWriteSkip.py" post_script="../test/post_check.sh AthenaPoolExample_ReWriteSkip AthenaPoolExample_ReWrite "
-
-# AthenaPoolExample_ReadSkip
-apply_pattern athenarun_test name="AthenaPoolExample_ReadSkip" pre_script="../test/pre_check.sh AthenaPoolExample_ReadSkip " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadSkip "
-
-# Write out two sets of some simple data objects (hits, tracks):
-# AthenaPoolExample_Concat
-apply_pattern athenarun_test name="AthenaPoolExample_Concat" pre_script="../test/pre_check.sh AthenaPoolExample_Concat " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ConcatJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_Concat "
-
-# AthenaPoolExample_ReadConcat
-apply_pattern athenarun_test name="AthenaPoolExample_ReadConcat" pre_script="../test/pre_check.sh AthenaPoolExample_ReadConcat " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadConcat "
-
-# ByteStream propagation tests
-# AthenaPoolExample_RWBs
-apply_pattern athenarun_test name="AthenaPoolExample_RWBs" pre_script="../test/pre_check.sh AthenaPoolExample_RWBs " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_RWBsJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_RWBs "
-
-# AthenaPoolExample_ReadBs
-apply_pattern athenarun_test name="AthenaPoolExample_ReadBs" pre_script="../test/pre_check.sh AthenaPoolExample_ReadBs " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadBsJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadBs "
-
-# AthenaPoolExample_ReadBsTag
-#apply_pattern athenarun_test name="AthenaPoolExample_ReadBsTag" pre_script="../test/pre_check.sh AthenaPoolExample_ReadBsTag " options="./AthenaPoolExample_ReadBsTag.py" post_script="../test/post_check.sh AthenaPoolExample_ReadBsTag "
-
-# Compressed ByteStream propagation tests
-# AthenaPoolExample_RWcBs
-apply_pattern athenarun_test name="AthenaPoolExample_RWcBs" pre_script="../test/pre_check.sh AthenaPoolExample_RWcBs " options="./AthenaPoolExample_RWcBs.py" post_script="../test/post_check.sh AthenaPoolExample_RWcBs "
-
-# AthenaPoolExample_ReadcBs
-apply_pattern athenarun_test name="AthenaPoolExample_ReadcBs" pre_script="../test/pre_check.sh AthenaPoolExample_ReadcBs " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadBsJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadcBs AthenaPoolExample_ReadBs "
-
-# AthenaPoolExample_ReadcBsTag
-#apply_pattern athenarun_test name="AthenaPoolExample_ReadcBsTag" pre_script="../test/pre_check.sh AthenaPoolExample_ReadBscTag " options="./AthenaPoolExample_ReadBsTagJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadcBsTag AthenaPoolExample_ReadBsTag "
-
-# AthenaPoolExample_WCond
-apply_pattern athenarun_test name="AthenaPoolExample_WCond" pre_script="../test/pre_check.sh AthenaPoolExample_WCond " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_WCondJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_WCond "
-
-# AthenaPoolExample_ACond
-apply_pattern athenarun_test name="AthenaPoolExample_ACond" pre_script="../test/pre_check.sh AthenaPoolExample_ACond " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ACondJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ACond "
-
-# AthenaPoolExample_RCond
-apply_pattern athenarun_test name="AthenaPoolExample_RCond" pre_script="../test/pre_check.sh AthenaPoolExample_RCond " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_RCondJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_RCond "
-
-# Test zipping POOL files
-# AthenaPoolExample_Read_BNzip
-#apply_pattern athenarun_test name="AthenaPoolExample_ReadBNzip" pre_script="../test/pre_check.sh AthenaPoolExample_ReadBNzip " options="./AthenaPoolExample_ReadBNzip.py" post_script="../test/post_check.sh AthenaPoolExample_ReadBNzip "
-
-# AthenaPoolExample_Read_BNzipAgain
-#apply_pattern athenarun_test name="AthenaPoolExample_ReadBNzipAgain" pre_script="../test/pre_check.sh AthenaPoolExample_ReadBNzipAgain " options="./AthenaPoolExample_ReadBNzipAgain.py" post_script="../test/post_check.sh AthenaPoolExample_ReadBNzipAgain AthenaPoolExample_ReadBNzip "
-
-# AthenaPoolExample_WMeta
-apply_pattern athenarun_test name="AthenaPoolExample_WMeta" pre_script="../test/pre_check.sh AthenaPoolExample_WMeta " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_WMetaJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_WMeta "
-
-# AthenaPoolExample_AMeta
-apply_pattern athenarun_test name="AthenaPoolExample_AMeta" pre_script="../test/pre_check.sh AthenaPoolExample_AMeta " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_AMetaJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_AMeta "
-
-# AthenaPoolExample_RMeta
-apply_pattern athenarun_test name="AthenaPoolExample_RMeta" pre_script="../test/pre_check.sh AthenaPoolExample_RMeta " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_RMetaJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_RMeta "
-
-# Test fast POOL merge
-# AthenaPoolExample_WriteFirst
-apply_pattern athenarun_test name="AthenaPoolExample_WriteFast" pre_script="../test/pre_check.sh AthenaPoolExample_WriteFast " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_WriteFastJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_WriteFast AthenaPoolExample_Write "
-
-# AthenaPoolExample_WriteSecond
-apply_pattern athenarun_test name="AthenaPoolExample_AppendFast" pre_script="../test/pre_check.sh AthenaPoolExample_AppendFast " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_AppendFastJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_AppendFast "
-
-# AthenaPoolExample_ReWrite
-apply_pattern athenarun_test name="AthenaPoolExample_ReWriteFast" pre_script="../test/pre_check.sh AthenaPoolExample_ReWrite " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_RWJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReWriteFast AthenaPoolExample_ReWrite "
-
-# AthenaPoolExample_Read
-apply_pattern athenarun_test name="AthenaPoolExample_ReadFast" pre_script="../test/pre_check.sh AthenaPoolExample_Read " options="AthenaPoolExampleAlgorithms/AthenaPoolExample_ReadJobOptions.py" post_script="../test/post_check.sh AthenaPoolExample_ReadFast AthenaPoolExample_Read "
-
-# AthenaPoolExample_ReWriteTag
-#apply_pattern athenarun_test name="AthenaPoolExample_ReWriteTagFast" pre_script="../test/pre_check.sh AthenaPoolExample_ReWriteTagFast " options="./AthenaPoolExample_ReWriteTagFast.py" post_script="../test/post_check.sh AthenaPoolExample_ReWriteTagFast "
-
-# AthenaPoolExample_ReadTag
-#apply_pattern athenarun_test name="AthenaPoolExample_ReadTagFast" pre_script="../test/pre_check.sh AthenaPoolExample_ReadTagFast " options="./AthenaPoolExample_ReadTagFast.py" post_script="../test/post_check.sh AthenaPoolExample_ReadTagFast "
-
-
-# Make tests run sequentially
-macro_append AthenaPoolExample_Append_test_dependencies " AthenaPoolExample_Write_test "
-macro_append AthenaPoolExample_ReWrite_test_dependencies " AthenaPoolExample_Append_test "
-macro_append AthenaPoolExample_Read_test_dependencies " AthenaPoolExample_ReWrite_test "
-macro_append AthenaPoolExample_ReadTag_test_dependencies " AthenaPoolExample_ReWrite_test "
-macro_append AthenaPoolExample_ReadBN_test_dependencies " AthenaPoolExample_ReWrite_test "
-macro_append AthenaPoolExample_ReadNoBN_test_dependencies " AthenaPoolExample_Read_test AthenaPoolExample_ReadTag_test AthenaPoolExample_ReadBN_test "
-
-# Delayed in cmake
-macro_append AthenaPoolExample_Copy_test_dependencies " AthenaPoolExample_Write_test "
-macro_append AthenaPoolExample_ReWriteAgain_test_dependencies " AthenaPoolExample_ReadNoBN_test AthenaPoolExample_Copy_test "
-macro_append AthenaPoolExample_ReWriteNext_test_dependencies " AthenaPoolExample_ReWriteAgain_test "
-macro_append AthenaPoolExample_Filter_test_dependencies " AthenaPoolExample_ReWriteNext_test "
-macro_append AthenaPoolExample_RFilter_test_dependencies " AthenaPoolExample_Filter_test "
-macro_append AthenaPoolExample_ReadAgain_test_dependencies " AthenaPoolExample_RFilter_test "
-
-macro_append AthenaPoolExample_ReWriteSkip_test_dependencies " AthenaPoolExample_ReadAgain_test "
-macro_append AthenaPoolExample_ReWriteSkip_test_dependencies " AthenaPoolExample_RFilter_test "
-
-macro_append AthenaPoolExample_ReadSkip_test_dependencies " AthenaPoolExample_ReWriteSkip_test "
-
-macro_append AthenaPoolExample_Concat_test_dependencies " AthenaPoolExample_ReadSkip_test "
-macro_append AthenaPoolExample_ReadConcat_test_dependencies " AthenaPoolExample_Concat_test "
-
-macro_append AthenaPoolExample_RWBs_test_dependencies " AthenaPoolExample_ReadConcat_test "
-macro_append AthenaPoolExample_ReadBs_test_dependencies " AthenaPoolExample_RWBs_test "
-#macro_append AthenaPoolExample_ReadBsTag_test_dependencies " AthenaPoolExample_ReadBs_test "
-macro_append AthenaPoolExample_RWcBs_test_dependencies " AthenaPoolExample_ReadBs_test AthenaPoolExample_ReadBs_test "
-macro_append AthenaPoolExample_ReadcBs_test_dependencies " AthenaPoolExample_RWcBs_test "
-#macro_append AthenaPoolExample_ReadcBsTag_test_dependencies " AthenaPoolExample_RWcBs_test "
-
-macro_append AthenaPoolExample_WCond_test_dependencies " AthenaPoolExample_ReadcBs_test "
-macro_append AthenaPoolExample_ACond_test_dependencies " AthenaPoolExample_WCond_test "
-macro_append AthenaPoolExample_RCond_test_dependencies " AthenaPoolExample_ACond_test "
-
-#macro_append AthenaPoolExample_ReadBNzip_test_dependencies " AthenaPoolExample_ReadcBs_test AthenaPoolExample_ReadcBsTag_test AthenaPoolExample_RCond_test "
-#macro_append AthenaPoolExample_ReadBNzip_test_dependencies " AthenaPoolExample_ReadcBs_test AthenaPoolExample_RCond_test "
-
-macro_append AthenaPoolExample_WMeta_test_dependencies " AthenaPoolExample_RCond_test "
-macro_append AthenaPoolExample_AMeta_test_dependencies " AthenaPoolExample_WMeta_test "
-macro_append AthenaPoolExample_RMeta_test_dependencies " AthenaPoolExample_AMeta_test "
-
-macro_append AthenaPoolExample_WriteFast_test_dependencies " AthenaPoolExample_AMeta_test "
-macro_append AthenaPoolExample_AppendFast_test_dependencies " AthenaPoolExample_WriteFast_test "
-macro_append AthenaPoolExample_ReWriteFast_test_dependencies " AthenaPoolExample_AppendFast_test "
-#macro_append AthenaPoolExample_ReWriteTagFast_test_dependencies " AthenaPoolExample_ReWriteFast_test "
-macro_append AthenaPoolExample_ReadFast_test_dependencies " AthenaPoolExample_ReWriteFast_test "
-#macro_append AthenaPoolExample_ReadTagFast_test_dependencies " AthenaPoolExample_ReWriteTagFast_test "
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
old mode 100755
new mode 100644
index 44643cd207b0404aad94134ed2140fef0b3ee52a..9d130b4e487e5d04833a20d62e8515a2b68f8878
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
@@ -1,9 +1,3 @@
-/** @file AthenaPoolExampleAlgorithms_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: AthenaPoolExampleAlgorithms_entries.cxx,v 1.16 2008-12-10 21:28:12 gemmeren Exp $
- **/
-
#include "../WriteData.h"
#include "../ReWriteData.h"
#include "../ReadData.h"
@@ -14,28 +8,15 @@
#include "../WriteTag.h"
#include "../QueryTag.h"
#include "../PassNoneFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReWriteData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadData)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadBs)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteCond)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadCond)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteTag)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, PassNoneFilter)
-DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, ReadMeta)
-DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, QueryTag)
+DECLARE_COMPONENT( AthPoolEx::WriteData )
+DECLARE_COMPONENT( AthPoolEx::ReWriteData )
+DECLARE_COMPONENT( AthPoolEx::ReadData )
+DECLARE_COMPONENT( AthPoolEx::ReadBs )
+DECLARE_COMPONENT( AthPoolEx::WriteCond )
+DECLARE_COMPONENT( AthPoolEx::ReadCond )
+DECLARE_COMPONENT( AthPoolEx::WriteTag )
+DECLARE_COMPONENT( AthPoolEx::PassNoneFilter )
+DECLARE_COMPONENT( AthPoolEx::ReadMeta )
+DECLARE_COMPONENT( AthPoolEx::QueryTag )
-DECLARE_FACTORY_ENTRIES(AthenaPoolExampleAlgorithms) {
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReWriteData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadBs);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteCond);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadCond);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteTag);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, PassNoneFilter);
- DECLARE_NAMESPACE_ALGTOOL(AthPoolEx, ReadMeta);
- DECLARE_NAMESPACE_ALGTOOL(AthPoolEx, QueryTag);
-}
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx
deleted file mode 100755
index bfbc5258f8974760f63b3df7952792795ad2b4bd..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolExampleAlgorithms_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolExampleAlgorithms_load.cxx,v 1.3 2005-01-10 22:50:31 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolExampleAlgorithms)
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/cmt/requirements b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/cmt/requirements
deleted file mode 100755
index d6210569e33327a84584ac0dce36ab4b0beecf09..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleConverter/cmt/requirements
+++ /dev/null
@@ -1,33 +0,0 @@
-package AthenaPoolExampleConverter
-
-author Peter Van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasReflex AtlasReflex-* External
-use DataModelAthenaPool DataModelAthenaPool-* Control
-use AthenaPoolServices AthenaPoolServices-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AthenaPoolExampleData AthenaPoolExampleData-* Database/AthenaPOOL/AthenaPoolExample
-
-private
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-end_private
-
-macro_append AthenaPoolExampleConverterPoolCnvGen_dependencies " AthenaPoolExampleConverterDict "
-
-library AthenaPoolExampleConverter *.cxx
-apply_pattern linked_library
-
-apply_pattern lcgdict dict=AthenaPoolExampleConverter selectionfile=selection.xml \
- headerfiles="../AthenaPoolExampleConverter/AthenaPoolExampleConverterDict.h"
-
-# One should provide the list of header files for the pattern "poolcnv".
-# These can be taken from a number of packages following the syntax of:
-#
-# "-s=${<package>_root}/<package> <hdr1> <hdr2>"
-#
-# which can be repeated.
-apply_pattern poolcnv files="-s=${AthenaPoolExampleData_root}/AthenaPoolExampleData ExampleHitContainer.h ExampleTrackContainer.h"
-
-apply_pattern declare_joboptions files="-s=../share *.py"
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/cmt/requirements b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/cmt/requirements
deleted file mode 100755
index ff256c5188d188931a569af61ebf796e26063c0b..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleData/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package AthenaPoolExampleData
-
-author Peter Van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-use GaudiInterface GaudiInterface-* External
-use CLIDSvc CLIDSvc-* Control
-use AthLinks AthLinks-* Control
-use AthContainers AthContainers-* Control
-use Navigation Navigation-* Control
-
-library AthenaPoolExampleData *.cxx
-apply_pattern installed_library
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=AthenaPoolExampleData selectionfile=selection.xml navigables="ExampleHitContainer" headerfiles="-s=${AthenaPoolExampleData_root}/AthenaPoolExampleData AthenaPoolExampleDataDict.h"
diff --git a/Database/AthenaPOOL/AthenaPoolKernel/cmt/requirements b/Database/AthenaPOOL/AthenaPoolKernel/cmt/requirements
deleted file mode 100644
index ca047fc01f24c34a8a43b516ba0911a431f3a6ed..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolKernel/cmt/requirements
+++ /dev/null
@@ -1,6 +0,0 @@
-package AthenaPoolKernel
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
diff --git a/Database/AthenaPOOL/AthenaPoolServices/cmt/requirements b/Database/AthenaPOOL/AthenaPoolServices/cmt/requirements
deleted file mode 100755
index fd124bdb885367ea5e039098259bb3d01e9b0712..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolServices/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package AthenaPoolServices
-
-author Marcin Nowak <Marcin.Nowak@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use AtlasPOOL AtlasPOOL-* External
-use DataModelRoot DataModelRoot-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasROOT AtlasROOT-* External
-
-apply_pattern declare_joboptions files="*.py"
-
-apply_pattern named_component_library library=AthenaRootStreamerSvc
-library AthenaRootStreamerSvc AthenaRootConverterHandle.cxx \
- AthenaRootStreamer.cxx \
- AthenaRootStreamerSvc.cxx \
- components/*.cxx
-
diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
old mode 100755
new mode 100644
index 960ec5fba4314e1f0410e38645d04ef5763ee971..97f97f3b4bc6c7c60823f04300775e57e1678ded
--- a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
@@ -1,17 +1,4 @@
-/** @file AthenaPoolServices_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Marcin Nowak
- * $Id:
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaRootStreamerSvc.h"
-DECLARE_SERVICE_FACTORY(AthenaRootStreamerSvc)
-
-DECLARE_FACTORY_ENTRIES(AthenaRootStreamerSvc) {
- DECLARE_SERVICE(AthenaRootStreamerSvc)
-}
-
+DECLARE_COMPONENT( AthenaRootStreamerSvc )
diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx
deleted file mode 100755
index e93b68220f94995103e6ea7dc49ca21cb1c413d6..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolServices_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Marcin Nowak
- * $Id:
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaRootStreamerSvc)
diff --git a/Database/AthenaPOOL/AthenaPoolTools/cmt/requirements b/Database/AthenaPOOL/AthenaPoolTools/cmt/requirements
deleted file mode 100755
index 01f9b322f84147f7b55294d343a1a796edad618a..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolTools/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package AthenaPoolTools
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-author Jack Cranshaw <cranshaw@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern component_library
-library AthenaPoolTools EventCount.cxx RequireUniqueEvent.cxx components/*.cxx
-
-apply_pattern install_runtime
-apply_pattern declare_joboptions files="-s=../share *.py"
-
-apply_pattern declare_runtime files="PoolMove"
-
-private
-use StoreGate StoreGate-* Control
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use PersistentDataModel PersistentDataModel-* Database
-use EventInfo EventInfo-* Event
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-use GaudiInterface GaudiInterface-* External
-use TestPolicy TestPolicy-*
-
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
old mode 100755
new mode 100644
index 7f36b76a6ef1234d8808946aa2dcfe4cc928a420..7d52ed1c536829f2f9cbf295381343a47ae8e391
--- a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
@@ -1,19 +1,8 @@
-/**
- * @file AthenaPoolTools_entries.cxx
- * @brief Required by Gaudi class factory
- */
-
#include "../EventCount.h"
#include "../MetadataTest.h"
#include "../RequireUniqueEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(EventCount)
-DECLARE_ALGORITHM_FACTORY(MetadataTest)
-DECLARE_ALGORITHM_FACTORY(RequireUniqueEvent)
+DECLARE_COMPONENT( EventCount )
+DECLARE_COMPONENT( MetadataTest )
+DECLARE_COMPONENT( RequireUniqueEvent )
-DECLARE_FACTORY_ENTRIES(AthenaPoolTools) {
- DECLARE_ALGORITHM(EventCount)
- DECLARE_ALGORITHM(MetadataTest)
- DECLARE_ALGORITHM(RequireUniqueEvent)
-}
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx
deleted file mode 100755
index b892f59a2e873d89cc11ce9abf813543f0ec7204..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file AthenaPoolTools_load.cxx
- * @brief Required by Gaudi class factory
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolTools)
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
index d22892e11de0930f6cd0a1a00065418cdd6f16c1..8003f67b45469ab62f5b60e42c2d04d343f86dea 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
@@ -1,14 +1,2 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_entries.cxx
- * @brief Declares component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries.cxx,v 1.3 2005-01-12 20:46:47 kkarr Exp $
- */
-
#include "${package}Cnv_entries.h"
-DECLARE_FACTORY_ENTRIES(${package}PoolCnv) {
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx
deleted file mode 100644
index 5a1106217b5a410ad12d417ba9937ae612fa2bb4..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_load.cxx
- * @brief Loads component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_load.cxx,v 1.3 2005-01-12 20:47:08 kkarr Exp $
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(${package}PoolCnv)
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/requirements b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/requirements
deleted file mode 100644
index 21717b8540ccc3a327b1937d55a88ee469b9ae57..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/requirements
+++ /dev/null
@@ -1,122 +0,0 @@
-package AthenaPoolUtilities
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-author Christian Arnault <arnault@lal.in2p3.fr>
-author Kyle Cranmer <cranmer@cern.ch>
-author Kristo Karr <Kristo.Karr@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCORAL AtlasCORAL-* External
-use AthenaKernel AthenaKernel-* Control
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-use PersistentDataModel PersistentDataModel-* Database
-use DBDataModel DBDataModel-* Database/AthenaPOOL
-
-apply_tag NEEDS_CORAL_BASE
-
-#-----------------------------------------------------------------------------
-#
-# Pattern for creating pool converters
-#
-# apply_pattern poolcnv [typesWithNamespace="..."] [multChanTypes="..."] files="..." \
-# [extraFilesToCompile="..."]
-#
-# where:
-#
-# typesWithNamespace optional list of types, used to specify the namespace.
-# For example: "NS1::MyType1 NS1::MyType2 NS2::MyType3"
-# Needed for those files where the file name is the
-# types w/o namespace.
-#
-# multChanTypes optional list of types which are CondMultChanCollections
-#
-# files gives the list of header files with the declarations
-# of the data objects, i.e. the ones with the CLASS_DEF
-# macro
-#
-# extraFilesToCompile gives an optional list of extra files to compile into
-# the converter library, e.g.
-# extraFilesToCompile="-s=../src/myExtraDir *.cxx"
-#
-# CONVENTION: there must be ONLY ONE class defined in each header file.
-#
-# > With this pattern,
-#
-# + directory ../pool/src
-# + a library lib<package>PoolCnv.so
-#
-# will be created for the package
-#
-# > Two constituents <package>PoolCnvGen and <package>PoolCnv are generated
-# by this pattern
-#
-# > Two macros can also be used to specify additional options for the poolcnv
-# generator:
-#
-# $(poolcnv_options) global options
-# $(<package>_poolcnv_options) options specific to this package
-#
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-#
-# Definitions for the poolcnv generator
-make_fragment poolcnv.mk -header=poolcnv_header.mk -trailer=poolcnv_trailer.mk -dependencies
-
-make_fragment ExampleClassCnv.cxx
-make_fragment ExampleClassCnv.h
-make_fragment ExampleMultChanClassCnv.h
-make_fragment ExamplePackageCnv_load.cxx
-make_fragment ExamplePackageCnv_entries.cxx
-make_fragment ExamplePackageCnv_entries.h
-make_fragment ExamplePackageCnv_entries_element.cxx
-make_fragment ExampleItemList_joboptions.py
-make_fragment ExampleItemList_joboptionsHdr.py
-
-pattern poolcnv \
- private ; \
- use AthenaPoolCnvSvc AthenaPoolCnvSvc-00-* Database/AthenaPOOL ; \
- use GaudiInterface GaudiInterface-* External ; \
- document poolcnv.mk <package>PoolCnvGen <files> ; \
- macro_append cppflags "" separate-debug&target-opt&target-linux " -g " ; \
- library <package>PoolCnv -suffix=_poolcnv "*.cxx -s=../pool *.cxx <extraFilesToCompile> " ; \
- macro_append types_with_namespace_ " <typesWithNamespace> " ; \
- macro cnv_pfx "<cnv_pfx>" ; \
- macro_append mult_chan_types_ " <multChanTypes> " ; \
- macro poolcnv_include_extras " ../src" ; \
- include_dirs " $(poolcnv_include_extras) " ; \
- macro_append <package>PoolCnv_dependencies " <package>PoolCnvGen " ; \
- macro <package>PoolCnv_shlibflags "$(componentshr_linkopts) -L$(bin) $(use_linkopts) " ; \
- macro dummy_for_library "<library>" ; \
- macro_append <package>_named_libraries " <package>PoolCnv " ; \
- apply_pattern generate_componentslist library=<package>PoolCnv group=<group> ; \
-# macro_append <package>_joboptions ' -s=../pool *.py ' ; \
- macro_append install_pool_joboptions_dependencies " <package>PoolCnvGen" ; \
- document data_installer install_pool_joboptions prefix=jobOptions "-s=../pool *.py" ; \
- apply_pattern optdebug_library name=<package>PoolCnv ; \
- end_private
-
-private
-use AtlasReflex AtlasReflex-* External
-use TestPolicy TestPolicy-*
-
-private
-apply_pattern install_runtime method=-symlink
-
-apply_pattern declare_joboptions files="*.py"
-
-# The following use is to get the lcgdict pattern.
-# This is "hidden" behind "private" and "no_auto_imports" to keep
-# clients of IOVDbTestConditions from seeing excess dependencies
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See EventInfoDict
-apply_pattern lcgdict dict=AthenaPoolUtilitiesCoral selectionfile=selectionCoral.xml headerfiles="../AthenaPoolUtilities/AthenaPoolUtilitiesCoralDict.h"
-apply_pattern lcgdict dict=AthenaPoolUtilities selectionfile=selection.xml headerfiles="../AthenaPoolUtilities/AthenaPoolUtilitiesDict.h"
-
-# Declare this package as a cmake metalibrary so that the libraries and header files from
-# package it depends on are available to its clients. Transparent to CMT
-apply_pattern cmake_add_command command=metalibrary
diff --git a/Database/AthenaPOOL/AtlasCollectionTools/cmt/requirements b/Database/AthenaPOOL/AtlasCollectionTools/cmt/requirements
deleted file mode 100755
index d20067c71c21b4b6fc1519062393f66f7b4c0700..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AtlasCollectionTools/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-package AtlasCollectionTools
-
-author Jack Cranshaw <Jack.Cranshaw@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-#use AtlasHdf5 AtlasHdf5-* External
-#use CollectionUtilities CollectionUtilities-* Database/APR
-
-apply_pattern installed_library
-library AtlasCollectionTools LumiMetaHandler.cxx GlobalUniqueKey.cxx GlobalSum.cxx
-#library AtlasCollectionTools
-
-#application CollSplitByRun CollSplitByRun.cxx
-#macro_append CollSplitByRun_dependencies " AtlasCollectionTools"
-application AthCollAppend CollAppend.cxx
-macro_append AthCollAppend_dependencies " AtlasCollectionTools"
-#application GRLtest GRLtest.cxx
-
-macro_append AtlasCollectionTools_cppflags " `xml2-config --cflags`"
-
-apply_pattern declare_scripts files="../python/listDatasets.py"
-
-private
-use TestPolicy TestPolicy-*
-use AtlasPOOL AtlasPOOL-* External
-use GoodRunsLists GoodRunsLists-* DataQuality
-#use AtlasXercesC AtlasXercesC-* External
-
-
-use DetCommonPolicy *
-
-#===========================================================================
-# Install scripts for EventLookupClient
-#============================================================================
-apply_pattern detcommon_link_files kind=scripts name=python_scripts files="\
- -s=../python runEventLookup.py runGuidsCount.py tagExtract.py tagDSList.py" prefix=share/bin
-
-apply_pattern detcommon_link_files kind=python_modules name=python_mods files="\
- -s=../python countGuidsClient.py eventLookupClient.py" prefix=python/TAGPoolServices
diff --git a/Database/AthenaPOOL/DBDataModel/cmt/requirements b/Database/AthenaPOOL/DBDataModel/cmt/requirements
deleted file mode 100755
index 39611cc6a2191dc0c458e815b690d5bcc17662be..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/DBDataModel/cmt/requirements
+++ /dev/null
@@ -1,16 +0,0 @@
-package DBDataModel
-
-author Peter Van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-
-library DBDataModel *.cxx
-apply_pattern installed_library
-
-private
-use AtlasPOOL AtlasPOOL-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=DBDataModel selectionfile=selection.xml headerfiles="-s=${DBDataModel_root}/DBDataModel DBDataModelDict.h"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/cmt/requirements b/Database/AthenaPOOL/EventSelectorAthenaPool/cmt/requirements
deleted file mode 100755
index f9d2a54fd4da4f3f67cbb80bdb902fbb00f28db5..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package EventSelectorAthenaPool
-
-private
-use AtlasPolicy AtlasPolicy-*
-use AtlasPOOL AtlasPOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use StoreGate StoreGate-* Control
-use PersistentDataModel PersistentDataModel-* Database
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use DBDataModel DBDataModel-* Database/AthenaPOOL
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-
-apply_pattern component_library
-library EventSelectorAthenaPool AthenaPoolAddressProviderSvc.cxx \
- CondProxyProvider.cxx \
- EventSelectorAthenaPool.cxx \
- PoolCollectionConverter.cxx \
- registerKeys.cxx \
- components/*.cxx
-apply_pattern declare_joboptions files="-s=../share *.py"
-apply_pattern declare_python_modules files="*.py"
-
-private
-# Add a harmless fix for a limitation with v1r18p20050501 include_dirs
-macro poolcnv_include_extras "../"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
old mode 100755
new mode 100644
index d9990bf9cef34ec9aad960d7a235b54eccdd6304..dba98905d35855f975bb297ba8a70d4d6777505e
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
@@ -1,20 +1,8 @@
-/** @file EventSelectorAthenaPool_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: EventSelectorAthenaPool_entries.cxx,v 1.6 2007-07-25 07:14:28 schaffer Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AthenaPoolAddressProviderSvc.h"
#include "../EventSelectorAthenaPool.h"
#include "../CondProxyProvider.h"
-DECLARE_SERVICE_FACTORY(AthenaPoolAddressProviderSvc)
-DECLARE_SERVICE_FACTORY(EventSelectorAthenaPool)
-DECLARE_SERVICE_FACTORY(CondProxyProvider)
+DECLARE_COMPONENT( AthenaPoolAddressProviderSvc )
+DECLARE_COMPONENT( EventSelectorAthenaPool )
+DECLARE_COMPONENT( CondProxyProvider )
-DECLARE_FACTORY_ENTRIES(EventSelectorAthenaPool) {
- DECLARE_SERVICE(AthenaPoolAddressProviderSvc)
- DECLARE_SERVICE(EventSelectorAthenaPool)
- DECLARE_SERVICE(CondProxyProvider)
-}
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx
deleted file mode 100755
index eb4da766cd2fe25385fb1ec03b308d8febdde7da..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file EventSelectorAthenaPool_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: EventSelectorAthenaPool_load.cxx,v 1.3 2005-01-11 20:59:08 malond Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventSelectorAthenaPool)
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/cmt/requirements b/Database/AthenaPOOL/OutputStreamAthenaPool/cmt/requirements
deleted file mode 100644
index fcda12677390376d1a681153beef2cdf5faaca1a..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package OutputStreamAthenaPool
-
-author Peter van Gemmeren <gemmeren@anl.gov>
-
-private
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use SGTools SGTools-* Control
-use StoreGate StoreGate-* Control
-use EventInfo xAODEventInfo-* Event/xAOD
-use EventInfo EventInfo-* Event
-use PersistentDataModel PersistentDataModel-* Database
-use AthenaPoolKernel AthenaPoolKernel-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-
-apply_pattern component_library
-library OutputStreamAthenaPool AthenaPoolOutputStreamTool.cxx \
- MakeEventStreamInfo.cxx \
- CopyEventStreamInfo.cxx \
- MakeInputDataHeader.cxx \
- EventInfoAttListTool.cxx \
- EventInfoTagBuilder.cxx \
- components/*.cxx
-apply_pattern declare_joboptions files="-s=../share *.py"
-apply_pattern declare_python_modules files="*.py"
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
index abac224e77fd3ee10420bb2b7a2ba05eb2781b12..b56a3778a5049a0ec6b47a255599978f0570d9f4 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
@@ -1,9 +1,3 @@
-/** @file OutputStreamAthenaPool_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AthenaPoolOutputStreamTool.h"
#include "../MakeInputDataHeader.h"
#include "../MakeEventStreamInfo.h"
@@ -11,18 +5,10 @@
#include "../EventInfoAttListTool.h"
#include "../EventInfoTagBuilder.h"
-DECLARE_TOOL_FACTORY(AthenaPoolOutputStreamTool)
-DECLARE_TOOL_FACTORY(MakeEventStreamInfo)
-DECLARE_TOOL_FACTORY(CopyEventStreamInfo)
-DECLARE_TOOL_FACTORY(EventInfoAttListTool)
-DECLARE_ALGORITHM_FACTORY(MakeInputDataHeader)
-DECLARE_ALGORITHM_FACTORY(EventInfoTagBuilder)
+DECLARE_COMPONENT( AthenaPoolOutputStreamTool )
+DECLARE_COMPONENT( MakeEventStreamInfo )
+DECLARE_COMPONENT( CopyEventStreamInfo )
+DECLARE_COMPONENT( EventInfoAttListTool )
+DECLARE_COMPONENT( MakeInputDataHeader )
+DECLARE_COMPONENT( EventInfoTagBuilder )
-DECLARE_FACTORY_ENTRIES(OutputStreamAthenaPool) {
- DECLARE_TOOL(AthenaPoolOutputStreamTool)
- DECLARE_TOOL(MakeEventStreamInfo)
- DECLARE_TOOL(CopyEventStreamInfo)
- DECLARE_TOOL(EventInfoAttListTool)
- DECLARE_ALGORITHM(MakeInputDataHeader)
- DECLARE_ALGORITHM(EventInfoTagBuilder)
-}
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx
deleted file mode 100644
index c4741910c1bf89d2820722687722be0382bc3472..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file OutputStreamAthenaPool_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: OutputStreamAthenaPool_load.cxx,v 1.1.1.1 2006-08-16 20:59:21 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(OutputStreamAthenaPool)
diff --git a/Database/AthenaPOOL/PoolSvc/cmt/requirements b/Database/AthenaPOOL/PoolSvc/cmt/requirements
deleted file mode 100644
index 8b408a3c3386e06f597fc81f9c97e9aad5d173d6..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/PoolSvc/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package PoolSvc
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPOOL AtlasPOOL-* External
-use GaudiInterface GaudiInterface-* External
-use DataModelRoot DataModelRoot-* Control
-
-private
-use AtlasCORAL AtlasCORAL-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use PersistentDataModel PersistentDataModel-* Database
-use DBReplicaSvc DBReplicaSvc-* Database/ConnectionManagement
-use PathResolver PathResolver-* Tools
-
-public
-library PoolSvc *.cxx -s=components *.cxx
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="-s=../share *.py"
diff --git a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
index 7cce67755e69ae495189a135950072ce283f6b10..9181173b4dc0e5433365cc249d6ba7cd8f8e4bd8 100644
--- a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
+++ b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
@@ -173,7 +173,6 @@ public: // Non-static members
/// Setup Frontier cache for given logical or physical connection name
StatusCode setFrontierCache(const std::string& conn) const;
-protected: // constructor and destructor
/// Standard Service Constructor
PoolSvc(const std::string& name, ISvcLocator* pSvcLocator);
/// Destructor
diff --git a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
index afccf7708fe50e3c213bdf95675ee3be1985de72..c5b50301aa18e009636923896e03d361ed1b17b4 100644
--- a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
+++ b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
@@ -1,13 +1,4 @@
-/** @file PoolSvc_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: PoolSvc_entries.cxx,v 1.8 2007-02-27 16:38:54 gemmeren Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../PoolSvc.h"
-DECLARE_SERVICE_FACTORY(PoolSvc)
-DECLARE_FACTORY_ENTRIES(PoolSvc) {
- DECLARE_SERVICE(PoolSvc);
-}
+DECLARE_COMPONENT( PoolSvc )
+
diff --git a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx
deleted file mode 100644
index 92ae8b29adb744bbcdaaf9158c26724d18468d64..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file PoolSvc_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: PoolSvc_load.cxx,v 1.6 2007-02-27 16:38:54 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PoolSvc)
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h b/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h
index 0e00afe7eecefff7240e0b98191d1291730cd1bc..c4a1de6d755180d729d03a4a76d35628e6e12646 100755
--- a/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h
+++ b/Database/AthenaPOOL/RDBAccessSvc/src/RDBAccessSvc.h
@@ -120,8 +120,6 @@ class RDBAccessSvc final : public AthService, virtual public IRDBAccessSvc
StatusCode finalize() override;
StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
- protected:
-
friend class SvcFactory<RDBAccessSvc>;
/// Standard Service Constructor
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
old mode 100755
new mode 100644
index f89f4ce48e16d4c24d040afdbf115ac201173acb..e93fa3bb87428b08a2ef711afba86171409444d1
--- a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
+++ b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
@@ -1,22 +1,6 @@
-/**
- * @file RDBAccessSvc_entries.cxx
- *
- * @brief Required by Gaudi class factory
- *
- * @author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
- *
- * $Id: RDBAccessSvc_entries.cxx,v 1.4 2005-07-22 15:56:45 obreshko Exp $
- */
-
#include "../RDBAccessSvc.h"
#include "../SourceCompAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-DECLARE_SERVICE_FACTORY(RDBAccessSvc)
-DECLARE_ALGORITHM_FACTORY(SourceCompAlg)
-DECLARE_FACTORY_ENTRIES(RDBAccessSvc) {
- DECLARE_SERVICE ( RDBAccessSvc );
- DECLARE_ALGORITHM ( SourceCompAlg );
-}
+DECLARE_COMPONENT( RDBAccessSvc )
+DECLARE_COMPONENT( SourceCompAlg )
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx
deleted file mode 100755
index 8ddc8264f051a5b75c57adc933a5d8528fd29ece..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file RDBAccessSvc_load.cxx
- *
- * @brief Required by Gaudi class factory
- *
- * @author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
- *
- * $Id: RDBAccessSvc_load.cxx,v 1.2 2005-01-14 10:41:42 tsulaia Exp $
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RDBAccessSvc)
diff --git a/Database/AthenaPOOL/RootFileTools/cmt/requirements b/Database/AthenaPOOL/RootFileTools/cmt/requirements
deleted file mode 100644
index 05567afa5ac0494d71be6ea697bf7264872a99ee..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/RootFileTools/cmt/requirements
+++ /dev/null
@@ -1,57 +0,0 @@
-package RootFileTools
-author Ilija Vukotic, Gerhard Brandt
-
-use AtlasPolicy AtlasPolicy-*
-
-public
-use GaudiInterface GaudiInterface-* External
-
-private
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasROOT AtlasROOT-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use PersistentDataModel PersistentDataModel-* Database
-
-# Add cmake compatibility (doesn't do anything on CMT side of things)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS RIO)"
-
-branches python
-
-#alias createDictionary createDictionary.py
-alias orderFile orderFile.py
-alias optimizeBasketsSizes optimizeBS.py
-# alias optimizeFile optimizeFile.py # to be provided if needed
-alias showTrees showTrees.py
-alias mergeD3PD mergeD3PD.exe
-
-apply_pattern declare_scripts files="orderFile.py optimizeBS.py showTrees.py"
-#createDictionary.py optimizeFile.py
-
-# Replace the component_library by a dual_use_library since the lcgdict dictionary
-# generation only works for linked libraries in the cmake-world
-apply_pattern dual_use_library files="cobs.cxx RootFileTransformationsTool.cxx HistoPile.cxx"
-
-application mergePOOL merge.cxx
-macro_append mergePOOL_dependencies RootFileToolsLib
-
-application mergeD3PD mergeD3PD.cxx
-macro_append mergeD3PD_dependencies RootFileToolsLib
-application checkCache checkCache.cxx
-macro_append checkCache_dependencies RootFileToolsLib
-
-# application releaseFileCache releaseFileCache.cxx
-action releaseFileCache "$(cpp_name) $(src)releaseFileCache.cxx -o $(bin)releaseFileCache.exe;mkdir -p $(CMTINSTALLAREA)/$(tag)/bin; cd $(CMTINSTALLAREA)/$(tag)/bin;rm -f releaseFileCache.exe; ln -s ../../../Database/AthenaPOOL/RootFileTools/$(tag)/releaseFileCache.exe releaseFileCache.exe "
-macro_append releaseFileCache_dependencies RootFileToolsLib
-
-#application dumpRootFile dumpRootFile.cxx
-
-# apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-apply_pattern lcgdict dict=RootFileTools selectionfile=selection.xml headerfiles="../RootFileTools/RootFileToolsDict.h"
-
-
-private
-macro_append all_dependencies " releaseFileCache"
-end_private
diff --git a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
index e35332e8af0e8427c67671fa85b3aac320eb3d09..efa19ea658873420417bb56ca19895f73e74102d 100644
--- a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
+++ b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
@@ -1,8 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../RootFileTransformationsTool.h"
-DECLARE_FACTORY_ENTRIES(RootFileTransformations) {
- DECLARE_TOOL(RootFileTransformationsTool)
-}
-DECLARE_TOOL_FACTORY(RootFileTransformationsTool)
+DECLARE_COMPONENT( RootFileTransformationsTool )
+
diff --git a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx
deleted file mode 100644
index 128cccc39bb43db86a7f9f96fcae6a6593defcc8..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RootFileTransformationsTool)
diff --git a/Database/AthenaPOOL/StlAthenaPoolCnv/cmt/requirements b/Database/AthenaPOOL/StlAthenaPoolCnv/cmt/requirements
deleted file mode 100644
index af0e732c8284f2a6bf1e00a899f7a86584db59d0..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/StlAthenaPoolCnv/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package StlAthenaPoolCnv
-
-author Sebastien Binet <binet@cern.ch>
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use SGTools SGTools-* Control
-end_private
-
-
-library StlAthenaPoolCnv *.cxx
-apply_pattern component_library
-
-#apply_pattern declare_joboptions files="*.py"
-#apply_pattern declare_python_modules files="*.py"
-
-
-
-private
-end_private
-
-
diff --git a/Database/AthenaRoot/AthenaRootComps/cmt/requirements b/Database/AthenaRoot/AthenaRootComps/cmt/requirements
deleted file mode 100644
index dc167128dac7a26ab1fcf39257891bc1113f5051..0000000000000000000000000000000000000000
--- a/Database/AthenaRoot/AthenaRootComps/cmt/requirements
+++ /dev/null
@@ -1,60 +0,0 @@
-package AthenaRootComps
-
-author Sebastien Binet <binet@cern.ch>
-author Peter van Gemmeren <gemmeren@anl.gov>
-author Will Buttinger <Will@cern.ch>
-
-
-## For Athena policies: it has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-use SGTools SGTools-* Control
-
-private
-
-use TestPolicy TestPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AtlasPOOL AtlasPOOL-* External
-
-use AthenaKernel AthenaKernel-* Control
-use DataModelRoot DataModelRoot-* Control
-use RootUtils RootUtils-* Control
-use StoreGate StoreGate-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaPython AthenaPython-* Control -no_auto_imports
-
-use PersistentDataModel PersistentDataModel-* Database
-
-use EventInfo EventInfo-* Event
-
-use AthenaRootKernel AthenaRootKernel-* Database/AthenaRoot
-
-use xAODRootAccess xAODRootAccess-* Control
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-##
-
-# Add cmake compatibility (doesn't do anything on CMT side of things)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS RIO)"
-
-branches src src/components doc python share
-
-## default is to make a component library
-library AthenaRootComps *.cxx components/*.cxx
-
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py tests/*.py"
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="$(AthenaRootComps_root)/test/*.sh $(AthenaRootComps_root)/test/ref.*"
-
-#macro test_patter_opt_only "athenarun_test" \
-# debug ""
-
-apply_pattern athenarun_test name="AthenaRootCompsEventless" pre_script="../test/pre_check.sh AthenaRootCompsEventless" options="AthenaRootComps/test_athena_ntuple_eventless.py" post_script="../test/post_check.sh AthenaRootCompsEventless"
-
-# for TGraph...
-macro_append ROOT_linkopts " -lGraf"
-
-end_private
-
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h
index ae3db16e4cbb89e2539c30fada221337e840a2be..3aacc2df9eee000116a904980323a3d9df5559e7 100755
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleOutputStream.h
@@ -102,14 +102,14 @@ protected:
/// vector of AlgTools that that are executed by this stream
ToolHandleArray<IAthenaOutputTool> m_helperTools;
-protected:
+public:
+ typedef std::vector<std::pair<std::string, std::string> > TypeKeyPairs;
+
/// Standard algorithm Constructor
RootNtupleOutputStream(const std::string& name, ISvcLocator* pSvcLocator);
/// Standard Destructor
virtual ~RootNtupleOutputStream();
-public:
- typedef std::vector<std::pair<std::string, std::string> > TypeKeyPairs;
/// \name implement IAlgorithm
//@{
virtual StatusCode initialize();
diff --git a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
index 088d2609450c30919cd856ccd91be230105227bf..4ea9a62bb230acdd45059784c180d57595365195 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../NtupleCnvSvc.h"
//#include "../LeafCnv.h"
#include "../RootOutputStreamTool.h"
@@ -21,46 +20,24 @@
#include "../xAODCnv.h"
#include "../xAODEventSelector.h"
-DECLARE_NAMESPACE_SERVICE_FACTORY(Athena, NtupleCnvSvc)
-//DECLARE_NAMESPACE_CONVERTER_FACTORY (Athena, LeafCnv)
+DECLARE_COMPONENT( Athena::NtupleCnvSvc )
+//DECLARE_CONVERTER_FACTORY( Athena::LeafCnv )
-//DECLARE_NAMESPACE_CONVERTER_FACTORY (Athena, RootCnv)
-DECLARE_NAMESPACE_SERVICE_FACTORY( Athena, RootCnvSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY( Athena, RootSvc )
-DECLARE_NAMESPACE_TOOL_FACTORY( Athena, RootOutputStreamTool )
+//DECLARE_CONVERTER_FACTORY( Athena::RootCnv )
+DECLARE_COMPONENT( Athena::RootCnvSvc )
+DECLARE_COMPONENT( Athena::RootSvc )
+DECLARE_COMPONENT( Athena::RootOutputStreamTool )
-DECLARE_NAMESPACE_SERVICE_FACTORY( Athena, xAODCnvSvc )
+DECLARE_COMPONENT( Athena::xAODCnvSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY(Athena, RootNtupleEventSelector)
-DECLARE_NAMESPACE_SERVICE_FACTORY(Athena, xAODEventSelector)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY(Athena, RootNtupleOutputStream)
-DECLARE_NAMESPACE_TOOL_FACTORY( Athena, RootNtupleOutputMetadataTool )
+DECLARE_COMPONENT( Athena::RootNtupleEventSelector )
+DECLARE_COMPONENT( Athena::xAODEventSelector )
+DECLARE_COMPONENT( Athena::RootNtupleOutputStream )
+DECLARE_COMPONENT( Athena::RootNtupleOutputMetadataTool )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Athena, RootAsciiDumperAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Athena, RootAsciiDumperAlgHandle )
+DECLARE_COMPONENT( Athena::RootAsciiDumperAlg )
+DECLARE_COMPONENT( Athena::RootAsciiDumperAlgHandle )
-DECLARE_SERVICE_FACTORY( IoSvc )
+DECLARE_COMPONENT( IoSvc )
-DECLARE_FACTORY_ENTRIES( AthenaRootComps ) {
- DECLARE_NAMESPACE_SERVICE(Athena, NtupleCnvSvc)
- DECLARE_NAMESPACE_CONVERTER(Athena, LeafCnv)
- DECLARE_NAMESPACE_CONVERTER(Athena, xAODCnv)
-
- DECLARE_NAMESPACE_CONVERTER(Athena, RootCnv)
- DECLARE_NAMESPACE_SERVICE( Athena, RootCnvSvc )
- DECLARE_NAMESPACE_CONVERTER(Athena, RootCnv)
- DECLARE_NAMESPACE_SERVICE( Athena, xAODCnvSvc )
- DECLARE_NAMESPACE_TOOL(Athena, RootOutputStreamTool)
-
- DECLARE_NAMESPACE_SERVICE(Athena, RootNtupleEventSelector)
- DECLARE_NAMESPACE_SERVICE(Athena, xAODEventSelector)
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootNtupleOutputStream)
- DECLARE_NAMESPACE_TOOL(Athena, RootNtupleOutputMetadataTool)
-
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootAsciiDumperAlg)
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootAsciiDumperAlgHandle)
-
-
- DECLARE_SERVICE( IoSvc )
-}
diff --git a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx
deleted file mode 100644
index 4410a0acf9cc754054d883a342c70b4fdd3c6359..0000000000000000000000000000000000000000
--- a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaRootComps )
diff --git a/Database/AthenaRoot/AthenaRootKernel/cmt/requirements b/Database/AthenaRoot/AthenaRootKernel/cmt/requirements
deleted file mode 100644
index 6d30bbaa5ff3a80dd177978e0c2e35f76463e145..0000000000000000000000000000000000000000
--- a/Database/AthenaRoot/AthenaRootKernel/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package AthenaRootKernel
-
-author Sebastien Binet <binet@cern.ch>
-author Peter van Gemmeren <gemmeren@anl.gov>
-
-## For Athena policies: it has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-
-use GaudiInterface GaudiInterface-* External
-use DataModelRoot DataModelRoot-* Control
-
-##
-
-branches src doc python
-
-library AthenaRootKernel *.cxx
-
-apply_pattern installed_library
diff --git a/Database/AthenaRoot/RootAuxDynIO/cmt/requirements b/Database/AthenaRoot/RootAuxDynIO/cmt/requirements
deleted file mode 100644
index 8edc7e42c2b1a43853b19410e8b58d60c3a300bb..0000000000000000000000000000000000000000
--- a/Database/AthenaRoot/RootAuxDynIO/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package RootAuxDynIO
-
-author Marcin Nowak
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-
-private
-use AthContainersInterfaces AthContainersInterfaces-* Control
-use AthContainers AthContainers-* Control
-use AthContainersRoot AthContainersRoot-* Control
-use RootUtils RootUtils-* Control
-
-public
-apply_pattern installed_library
-library RootAuxDynIO *.cxx
-
-
diff --git a/Database/AtlasSTLAddReflex/cmt/requirements b/Database/AtlasSTLAddReflex/cmt/requirements
deleted file mode 100755
index 8731d2d38f571b582f861bffd874e906710a58de..0000000000000000000000000000000000000000
--- a/Database/AtlasSTLAddReflex/cmt/requirements
+++ /dev/null
@@ -1,12 +0,0 @@
-package AtlasSTLAddReflex
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use AtlasReflex AtlasReflex-* External
-use AtlasBoost AtlasBoost-* External
-
-apply_pattern lcgdict dict=AtlasSTLAddReflex headerfiles="../AtlasSTLAddReflex/AtlasSTLAddReflexDict.h" selectionfile=selection.xml
diff --git a/Database/AtlasSealCLHEP/cmt/requirements b/Database/AtlasSealCLHEP/cmt/requirements
deleted file mode 100755
index 3a550af9a59b038b7e9b628d523e877d1facd2ed..0000000000000000000000000000000000000000
--- a/Database/AtlasSealCLHEP/cmt/requirements
+++ /dev/null
@@ -1,43 +0,0 @@
-package AtlasSealCLHEP
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-use CxxUtils CxxUtils-* Control
-use AthenaPoolServices AthenaPoolServices-* Database/AthenaPOOL
-
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-
-apply_pattern installed_library
-library AtlasSealCLHEP OldCLHEPStreamers.cxx
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See MissingETDict
-# A selection file must be created by hand. This file lists the
-# classes to be added to the dictionary, and which fields are
-# transient. It should be put in ../<package> dir and is conventionally called
-# selection.xml.
-
-macro_append lcgdict_options ' -I.. '
-macro_append AtlasSealCLHEPDict_shlibflags " -lAtlasSealCLHEP "
-apply_pattern lcgdict dict=AtlasSealCLHEP selectionfile=selection.xml headerfiles="../AtlasSealCLHEP/AtlasSealCLHEPDict.h"
-
-
-#apply_tag no_extra_dict_deps
-#macro QUICK "1"
-
-# Now build a special (hand-written) library to build a dictionary for HepTransform3D
-#apply_pattern lcgdictfix libname=AtlasSealCLHEP dictfiles="AtlasSealCLHEPDict_dict_fixes.cxx"
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-
-private
-
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=OldCLHEPStreamers
diff --git a/Database/CondDBObjects/cmt/requirements b/Database/CondDBObjects/cmt/requirements
deleted file mode 100755
index 33a9cca7662f36411e20491120b5454c1250517b..0000000000000000000000000000000000000000
--- a/Database/CondDBObjects/cmt/requirements
+++ /dev/null
@@ -1,11 +0,0 @@
-package CondDBObjects
-
-author Nuno Barros <Nuno.Barros@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use GaudiInterface GaudiInterface-* External
-
-library CondDBObjects *.cxx
-apply_pattern installed_library
-
diff --git a/Database/ConnectionManagement/AtlasAuthentication/cmt/requirements b/Database/ConnectionManagement/AtlasAuthentication/cmt/requirements
deleted file mode 100644
index bf7aee1ca490553e7e0ff59008afde9839e96c7f..0000000000000000000000000000000000000000
--- a/Database/ConnectionManagement/AtlasAuthentication/cmt/requirements
+++ /dev/null
@@ -1,32 +0,0 @@
-package AtlasAuthentication
-
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-# Package to maintain authentication file for both read and write.
-
-use AtlasPolicy AtlasPolicy-*
-# use AtlasCORAL AtlasCORAL-00-* External
-# use AtlasExternalArea AtlasExternalArea-* External
-
-macro AtlasAuthentication_native_version "v18"
-macro AtlasAuthentication_home "${ATLAS_EXTERNAL}/AtlasAuth/$(AtlasAuthentication_native_version)"
-macro AtlasAuthentication_export_paths " $(AtlasAuthentication_home) "
-
-# Define path for access to authentication file
-path_remove CORAL_AUTH_PATH "AtlasAuthentication"
-path_append CORAL_AUTH_PATH "$(AtlasAuthentication_cmtpath)/$(cmt_installarea_prefix)/XML/AtlasAuthentication"
-
-path_remove CORAL_DBLOOKUP_PATH "AtlasAuthentication"
-path_append CORAL_DBLOOKUP_PATH "$(AtlasAuthentication_cmtpath)/$(cmt_installarea_prefix)/XML/AtlasAuthentication"
-
-# Install the master authentication file in InstallArea/AtlasAuthentication
-apply_pattern declare_xmls
-
-# Install the dbreplcia file
-apply_pattern declare_runtime files="-s=../data dbreplica.config"
-
-# install the SQLite setup script for CERN users
-apply_pattern declare_scripts files="setupLocalDBReplica_CERN.sh"
-
-apply_pattern generic_declare_for_link files=$(AtlasAuthentication_home)/authentication.xml prefix=XML/$(package)
diff --git a/Database/ConnectionManagement/DBReplicaSvc/cmt/requirements b/Database/ConnectionManagement/DBReplicaSvc/cmt/requirements
deleted file mode 100755
index debf9c367499f0d6e821e97e07fb1e49989140e0..0000000000000000000000000000000000000000
--- a/Database/ConnectionManagement/DBReplicaSvc/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package DBReplicaSvc
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AtlasCORAL AtlasCORAL-* External
-
-private
-
-use PathResolver PathResolver-* Tools
-use AthenaBaseComps AthenaBaseComps* Control
-
-library DBReplicaSvc DBReplicaSvc.cxx \
- components/*.cxx
-
-apply_pattern component_library
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
old mode 100755
new mode 100644
index f95eeb0b2c0cbb417b1164925f6b77266590ece4..0aabda962d630ba7db3b931231d3f68b0bfbfd3a
--- a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
+++ b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DBReplicaSvc.h"
-DECLARE_SERVICE_FACTORY( DBReplicaSvc )
+DECLARE_COMPONENT( DBReplicaSvc )
-DECLARE_FACTORY_ENTRIES( DBReplicaSvc ) {
- DECLARE_SERVICE( DBReplicaSvc )
-}
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx
deleted file mode 100755
index 9eb365d9a612ba3b9654664f5b4d8d6b5e201270..0000000000000000000000000000000000000000
--- a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DBReplicaSvc )
diff --git a/Database/CoolConvUtilities/cmt/requirements b/Database/CoolConvUtilities/cmt/requirements
deleted file mode 100755
index 0faef13b244ec59f0a80a1b4c8ec706ad801892b..0000000000000000000000000000000000000000
--- a/Database/CoolConvUtilities/cmt/requirements
+++ /dev/null
@@ -1,28 +0,0 @@
-package CoolConvUtilities
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use AtlasPOOL AtlasPOOL-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasCOOL AtlasCOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-use CoraCool CoraCool-* Database
-# use AtlasConditionsRunTime AtlasConditionsRunTime-*
-
-# Specify the required ROOT components (cmake-specific)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Hist Tree RIO)"
-
-apply_tag NEEDS_COOL_FACTORY
-
-# declarations for AtlCoolConsole and AtlCoolTool helper module
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="AtlCoolConsole.py coolIOVToTimeStamp.py coolTimeStampLocalToIOV.py coolTimeStampUTCToIOV.py RunList.py AtlCoolCheckFiles.py AtlCoolTopTag.py AtlCoolMakeReplica.py coolMagneticField.py"
-apply_pattern declare_joboptions files=" coolDumpFolderTags.py "
-
-application AtlCoolCopy AtlCoolCopy.cxx ReplicaSorter.cxx CoolTagInfo.cxx
-# application DCSTxtToCool DCSTxtToCool.cxx DataPointInfo.cxx
-# application LisToCool LisToCool.cxx
diff --git a/Database/CoolLumiUtilities/cmt/requirements b/Database/CoolLumiUtilities/cmt/requirements
deleted file mode 100644
index 218eab3823ba0c50f14b9acfa1824a35b96d4d9e..0000000000000000000000000000000000000000
--- a/Database/CoolLumiUtilities/cmt/requirements
+++ /dev/null
@@ -1,50 +0,0 @@
-package CoolLumiUtilities
-
-author Eric Torrence <Eric.Torrence@cern.ch>
-manager Eric Torrence <Eric.Torrence@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCORAL AtlasCORAL-* External
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use StoreGate StoreGate-* Control
-use AtlasCOOL AtlasCOOL-* External
-
-# Change to dual_use library since the lcgdict pattern doesn't work with a component library
-# for cmake because one can't link against a component. This pollutes the libraries to be
-# linked against for any clients in CMT, but is otherwise harmless because the as-needed linkopt
-# eliminates any bloat.
-apply_pattern dual_use_library files=*.cxx
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="*.py *.C"
-
-pattern declare_html \
- apply_pattern generic_declare_for_link kind=html files='-s=../html <files>' prefix=XML/<package> name=<name>
-
-apply_pattern declare_html files="*.html *.dtd"
-
-# The following use is stolen from EventInfo
-# This is "hidden" behind "private" and "no_auto_imports" to keep
-# clients of CoolLumiUtilities from seeing excess dependencies
-
-private
-
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See EventInfoDict
-# A selection file must be created by hand. This file lists the
-# classes to be added to the dictionary, and which fields are
-# transient. It should be put in ../<package> dir and is conventionally called
-# selection.xml.
-
-use AtlasROOT AtlasROOT-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=CoolLumiUtilities \
- selectionfile=selection.xml \
- headerfiles="../CoolLumiUtilities/CoolLumiUtilitiesDict.h"
-
-
diff --git a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
index 43bfb2e129964c13eefa04b3f0c6435e12448e26..b8fa2afef781fc144a0d8eb856bf77205039f2a3 100644
--- a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
+++ b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
@@ -1,17 +1,10 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CoolLumiUtilities/FillParamsTool.h"
#include "CoolLumiUtilities/BunchGroupTool.h"
#include "CoolLumiUtilities/BunchLumisTool.h"
#include "CoolLumiUtilities/OnlineLumiCalibrationTool.h"
-DECLARE_TOOL_FACTORY( FillParamsTool )
-DECLARE_TOOL_FACTORY( BunchGroupTool )
-DECLARE_TOOL_FACTORY( BunchLumisTool )
-DECLARE_TOOL_FACTORY( OnlineLumiCalibrationTool )
+DECLARE_COMPONENT( FillParamsTool )
+DECLARE_COMPONENT( BunchGroupTool )
+DECLARE_COMPONENT( BunchLumisTool )
+DECLARE_COMPONENT( OnlineLumiCalibrationTool )
-DECLARE_FACTORY_ENTRIES( CoolLumiUtilities ) {
- DECLARE_ALGTOOL( FillParamsTool )
- DECLARE_ALGTOOL( BunchGroupTool )
- DECLARE_ALGTOOL( BunchLumisTool )
- DECLARE_ALGTOOL( OnlineLumiCalibrationTool )
-}
diff --git a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx
deleted file mode 100644
index e0a2173aedf847c8cd4e28ec61a103fae6be1ad5..0000000000000000000000000000000000000000
--- a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CoolLumiUtilities)
diff --git a/Database/CoolRunQuery/cmt/requirements b/Database/CoolRunQuery/cmt/requirements
deleted file mode 100644
index b7007522dc5ea454ff90569d61a8b6e2f3f6195e..0000000000000000000000000000000000000000
--- a/Database/CoolRunQuery/cmt/requirements
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: requirements,v 1.2 2008-11-19 18:56:51 stelzer Exp $
-
-package CoolRunQuery
-
-author Andreas.Hoecker@cern.ch Joerg.Stelzer@cern.ch
-manager Andreas.Hoecker@cern.ch Joerg.Stelzer@cern.ch
-
-use AtlasPolicy *
-
-
-pattern declare_arq_python_modules \
- apply_pattern generic_declare_for_link kind=python_modules_<dir> files='-s=../python <files>' prefix=python/<package>/<dir> name=arqpy<dir> ; \
- private ; \
- macro_append <package>_python_init_dependencies " install_arqpy<dir>python_modules " ; \
- end_private
-
-
-
-apply_pattern declare_arq_python_modules files="*.py" dir=""
-apply_pattern declare_arq_python_modules files="html/*.py" dir="html"
-apply_pattern declare_arq_python_modules files="selector/*.py" dir="selector"
-apply_pattern declare_arq_python_modules files="utils/*.py" dir="utils"
-apply_pattern declare_arq_python_modules files="output/*.py" dir="output"
-
-apply_pattern declare_scripts files="*.py *.C"
-
-pattern declare_xml \
- apply_pattern generic_declare_for_link kind=xml files='-s=../html <files>' prefix=XML/<package> name=<name>
-
-pattern declare_html \
- apply_pattern generic_declare_for_link kind=html files='-s=../html <files>' prefix=html/<package> name=<name>
-
-apply_pattern declare_xml files="*.html *.dtd"
-
-apply_pattern declare_html files="*.html *.dtd *.css"
diff --git a/Database/CoraCool/cmt/requirements b/Database/CoraCool/cmt/requirements
deleted file mode 100755
index 642762249424ca4e6e432c7fa9d04a3018ceddb0..0000000000000000000000000000000000000000
--- a/Database/CoraCool/cmt/requirements
+++ /dev/null
@@ -1,28 +0,0 @@
-package CoraCool
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use DetCommonPolicy DetCommonPolicy-*
-
-use CORAL v* LCG_Interfaces
-use COOL v* LCG_Interfaces
-use Boost v* LCG_Interfaces
-
-
-library CoraCool \
- CoraCoolDatabaseSvcFactory.cxx \
- CoraCoolDatabaseSvc.cxx \
- CoraCoolDatabase.cxx \
- CoraCoolSequence.cxx \
- CoraCoolFolder.cxx \
- CoraCoolObject.cxx \
- CoraCoolObjectIter.cxx
-
-apply_pattern detcommon_shared_library_settings
-apply_pattern detcommon_ignores
-apply_pattern detcommon_header_installer
-
-apply_tag NEEDS_COOL_FACTORY
-apply_tag NEEDS_CORAL_RELATIONAL_ACCESS
-
-# apply_pattern installed_library
diff --git a/Database/CoralDB/cmt/requirements b/Database/CoralDB/cmt/requirements
deleted file mode 100644
index 4ec68f68f75a4c1c92d3a16cb119531e7e8cd4c2..0000000000000000000000000000000000000000
--- a/Database/CoralDB/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package CoralDB
-
-author Juerg Beringer <JBeringer@lbl.gov>
-
-use DetCommonPolicy DetCommonPolicy-*
-
-use CORAL v* LCG_Interfaces
-use COOL v* LCG_Interfaces
-use Boost v* LCG_Interfaces
-
-library CoralDB -no_prototypes Alias.cxx CompoundTag.cxx Connection.cxx Encodable.cxx CoralDB.cxx
-macro_append CoralDB_linkopts " -llcg_CoralBase -llcg_RelationalAccess "
-
-apply_pattern detcommon_shared_library_settings
-apply_pattern detcommon_ignores
-apply_pattern detcommon_header_installer
-
-private
-
-application ccdb ccdb.cxx
-macro_append ccdb_dependencies "CoralDB"
-
-application ccdb-migrate ccdb-migrate.cxx
-macro_append ccdb-migrate_dependencies "CoralDB"
-macro_prepend ccdb-migratelinkopts " $(Boost_linkopts_program_options)"
diff --git a/Database/EventIndex/EventIndexProducer/cmt/requirements b/Database/EventIndex/EventIndexProducer/cmt/requirements
deleted file mode 100644
index b02ef308fe8658742788bf02ff7f946b870bf8bc..0000000000000000000000000000000000000000
--- a/Database/EventIndex/EventIndexProducer/cmt/requirements
+++ /dev/null
@@ -1,12 +0,0 @@
-package EventIndexProducer
-
-author Javier.Sanchez@ific.uv.es
-
-use AtlasPolicy AtlasPolicy-*
-use PyJobTransformsCore PyJobTransformsCore-* Tools
-use PyJobTransforms PyJobTransforms-* Tools
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_job_transforms tfs='*.py' jo='*.py'
-
-
diff --git a/Database/FileStager/cmt/requirements b/Database/FileStager/cmt/requirements
deleted file mode 100644
index 3203b1d95805d129d58df77e1ce5f47a359346f9..0000000000000000000000000000000000000000
--- a/Database/FileStager/cmt/requirements
+++ /dev/null
@@ -1,49 +0,0 @@
-package FileStager
-
-author Max Baak <mbaak@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-
-## macros
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-
-# Specify the required ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Hist Tree RIO)"
-
-## build libraries
-apply_pattern dual_use_library files="../Root/*.cxx ../src/*.cxx ../src/components/*.cxx"
-apply_pattern have_root_headers \
- root_headers="TStagerInfo.h TStageFileInfo.h TStageManager.h TCopyChain.h TCopyFile.h ../Root/LinkDef.h" \
- headers_lib=FileStagerLib
-
-### Create a named installed library
-#library FileStagerLib "../Root/*.cxx"
-#apply_pattern named_installed_library library=FileStagerLib
-#macro FileStagerLib_dependencies "filestager_root_dictionary"
-#action filestager_root_dictionary "( make -f Makefile.Standalone stagercint )"
-#
-### Create a component library
-#library FileStager *.cxx components/*.cxx
-##library FileStager "../src/*.cxx ../components/*.cxx"
-#macro_append FileStager_dependencies " FileStagerLib"
-#apply_pattern component_library
-
-## applications
-macro_append StageMonitor_dependencies " FileStagerLib "
-application StageMonitor "../bin/StageMonitor.cxx"
-
-apply_pattern declare_scripts files="../scripts/define_* ../scripts/interpret_* ../scripts/wrapper_*"
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-## c++ flags
-#macro cppflags " -g -Wall -W -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-variable -I$(ROOTSYS)/include -I../Root -IRoot"
-#macro cpplinkflags " -L${ROOTSYS}/lib -lRIO -lNet -lCore -lCint -lTree -lHist -lMatrix -lPhysics -ldl "
-
diff --git a/Database/FileStager/src/components/FileStager_entries.cxx b/Database/FileStager/src/components/FileStager_entries.cxx
index d273f237c4416c55bf61ebb54627a40e78c533e4..52801bf0dc2381a9f504c68ada6c08a7cd39f3f1 100644
--- a/Database/FileStager/src/components/FileStager_entries.cxx
+++ b/Database/FileStager/src/components/FileStager_entries.cxx
@@ -1,10 +1,5 @@
#include "FileStager/FileStagerAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( FileStagerAlg )
-
-DECLARE_FACTORY_ENTRIES(FileStager) {
- DECLARE_ALGORITHM( FileStagerAlg )
-}
+DECLARE_COMPONENT( FileStagerAlg )
diff --git a/Database/FileStager/src/components/FileStager_load.cxx b/Database/FileStager/src/components/FileStager_load.cxx
deleted file mode 100644
index 3cb8371756f18c2a1f70b98e064a8a532b572e33..0000000000000000000000000000000000000000
--- a/Database/FileStager/src/components/FileStager_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(FileStager)
-
diff --git a/Database/IOVDbAthenaPool/cmt/requirements b/Database/IOVDbAthenaPool/cmt/requirements
deleted file mode 100755
index 5c4aee6cd1d4df1bd349db43f7d62c4bb31a6d93..0000000000000000000000000000000000000000
--- a/Database/IOVDbAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,16 +0,0 @@
-package IOVDbAthenaPool
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-author Antoine Perus <perus@lal.in2p3.fr>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-apply_pattern poolcnv files="-s=${IOVDbDataModel_root}/IOVDbDataModel IOVMetaDataContainer.h"
-
-private
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use IOVDbTPCnv IOVDbTPCnv-* Database
-use IOVDbDataModel IOVDbDataModel-* Database
-
-
diff --git a/Database/IOVDbDataModel/cmt/requirements b/Database/IOVDbDataModel/cmt/requirements
deleted file mode 100755
index c26a216d1ea9c3cbbe96aa1c35aea80312257f6d..0000000000000000000000000000000000000000
--- a/Database/IOVDbDataModel/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package IOVDbDataModel
-
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-author Antoine Perus <perus@lal.in2p3.fr>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use CLIDSvc CLIDSvc-* Control
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AthenaKernel AthenaKernel-* Control
-
-
-# Normal lib for the data classes
-library IOVDbDataModel *.cxx
-apply_pattern installed_library
-
-# The following use is to get the lcgdict pattern.
-# This is "hidden" behind "private" and "no_auto_imports" to keep
-# clients of IOVDbTestConditions from seeing excess dependencies
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-# for proper iterators' bindings
-use RootUtils RootUtils-* Control
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See EventInfoDict
-#apply_tag no_extra_dict_deps
-apply_pattern lcgdict dict=IOVDbDataModel selectionfile=selection.xml headerfiles="../IOVDbDataModel/IOVDbDataModelDict.h"
diff --git a/Database/IOVDbMetaDataTools/cmt/requirements b/Database/IOVDbMetaDataTools/cmt/requirements
deleted file mode 100755
index 4ca05848a3e7a739a8efaaf4d91fb042cfea56d8..0000000000000000000000000000000000000000
--- a/Database/IOVDbMetaDataTools/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package IOVDbMetaDataTools
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-apply_pattern declare_python_modules files="*.py"
-
-private
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use StoreGate StoreGate-* Control
-use AthenaPoolKernel AthenaPoolKernel-* Database/AthenaPOOL
-use IOVDbDataModel IOVDbDataModel-* Database
-
-library IOVDbMetaDataTools \
- IOVDbMetaDataTool.cxx \
- components/*.cxx
-
-apply_pattern component_library
-
diff --git a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
old mode 100755
new mode 100644
index 3ac2a7778dab8701cea5f9ba9146f01f5956da09..2a6e02f9ea68119e410c7d355fdf2c145e19a7dc
--- a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
+++ b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
@@ -1,19 +1,4 @@
-/**
- * @file IOVDbMetaDataTool_entries.cxx
- *
- * @brief Declaration of entry points for Gaudi tool
- *
- * @author Antoine Pérus <perus@lal.in2p3.fr>
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Header: /build/atlas/cvs/atlas/offline/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx,v 1.1 2007-06-18 09:52:00 schaffer Exp $
- */
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../IOVDbMetaDataTool.h"
-DECLARE_TOOL_FACTORY( IOVDbMetaDataTool )
+DECLARE_COMPONENT( IOVDbMetaDataTool )
-DECLARE_FACTORY_ENTRIES(IOVDbMetaDataTool) {
- DECLARE_TOOL( IOVDbMetaDataTool )
-}
diff --git a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx
deleted file mode 100755
index 6bc0e49409bbc4d953235ee6299ac0d752168e04..0000000000000000000000000000000000000000
--- a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file IOVDbTool_load.cxx
- *
- * @brief Declaration of factory for Gaudi tool
- *
- * @author Antoine Pérus <perus@lal.in2p3.fr>
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Header: /build/atlas/cvs/atlas/offline/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx,v 1.1 2007-06-18 09:52:00 schaffer Exp $
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbMetaDataTool)
diff --git a/Database/IOVDbPTCnv/cmt/requirements b/Database/IOVDbPTCnv/cmt/requirements
deleted file mode 100644
index 8483cecd40d33773676506e23b1a1177282ddf55..0000000000000000000000000000000000000000
--- a/Database/IOVDbPTCnv/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package IOVDbPTCnv
-
-
-author Alexandre Vaniachine <vaniachine@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCORAL AtlasCORAL-* External
-use IOVDbDataModel IOVDbDataModel-* Database
-use IOVDbTPCnv IOVDbTPCnv-* Database
-
-library IOVDbPTCnv *.cxx
-apply_pattern installed_library
-#apply_pattern tpcnv_library
-
-private
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AtlasReflex AtlasReflex-* External
-
-apply_pattern lcgdict dict=IOVDbPTCnv selectionfile=selection.xml headerfiles="../IOVDbPTCnv/IOVDbPTCnvDict.h"
-
-end_private
diff --git a/Database/IOVDbSvc/cmt/requirements b/Database/IOVDbSvc/cmt/requirements
deleted file mode 100644
index c17e16bd172803c90836947c61115ca81cd9f60d..0000000000000000000000000000000000000000
--- a/Database/IOVDbSvc/cmt/requirements
+++ /dev/null
@@ -1,78 +0,0 @@
-package IOVDbSvc
-
-author Antoine Perus <perus@lal.in2p3.fr>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCOOL AtlasCOOL-* External
-use GaudiInterface GaudiInterface-* External
-
-private
-
-use CxxUtils CxxUtils-* Control
-use StoreGate StoreGate-* Control
-use SGTools SGTools-* Control
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use EventInfo EventInfo-* Event
-use EventInfoMgt EventInfoMgt-* Event
-
-use AtlasPOOL AtlasPOOL-* External
-use AtlasROOT AtlasROOT-* External
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-use IOVDbDataModel IOVDbDataModel-* Database
-use IOVDbMetaDataTools IOVDbMetaDataTools-* Database
-
-use AtlasCORAL AtlasCORAL-* External
-
-use CoraCool CoraCool-* Database
-
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-
-# Must link against the cool factory
-apply_tag NEEDS_COOL_FACTORY
-
-macro POOL_Services_libset ""
-macro POOL_FileMgt_libset ""
-macro POOL_Collections_libset ""
-macro_remove SEAL_linkopts "-llcg_Reflection"
-macro_remove SEAL_linkopts "-llcg_ReflectionBuilder"
-
-library IOVDbSvc *.cxx components/*.cxx
-apply_pattern component_library
-
-# Install job options, and python scripts
-apply_pattern declare_joboptions files=" *.py "
-apply_pattern declare_python_modules files=" *.py "
-
-macro DOXYGEN_EXAMPLE_PATH "../doc ../cmt ../share"
-macro DOXYGEN_EXAMPLE_PATTERNS "*.cxx *.html requirements *.py"
-
-
-# Install the seal opts for verbose/debug/error
-#apply_pattern generic_declare_for_link kind=runtime files='-s=../share seal.opts.*' prefix=share
-
-# Only uncomment at MOST one of the the following Seal configs
-# Seal config: Debug:
-#cmtpath_pattern \
-# set SEAL_CONFIGURATION_FILE "<path>/$(cmt_installarea_prefix)/share/seal.opts"
-
-# Seal config: Verbose:
-#cmtpath_pattern \
-# set SEAL_CONFIGURATION_FILE "<path>/$(cmt_installarea_prefix)/share/seal.opts.verbose"
-# Seal config: Error:
-#cmtpath_pattern \
-# set SEAL_CONFIGURATION_FILE "<path>/$(cmt_installarea_prefix)/share/seal.opts.error"
-
-# the following creates a link to the AFS poolcond directory in the
-# IOVDbSvc share directory, but only at CERN ('CERN' tag set)
-# at other sites, we rely on the DBRelease to put a link to the poolcond
-# catalogue files in the DATAPATH
-macro poolcondfile "" \
- CERN "/afs/cern.ch/atlas/conditions/poolcond/catalogue/poolcond"
-
-apply_pattern generic_declare_for_link kind=runtime \
- files='$(poolcondfile)' prefix=share
-
diff --git a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
index 22ac418d75c34b10675d65b681229942573b719f..fa61d7792e64f7cd6600e5fc5693cfa5538b5d39 100644
--- a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
+++ b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
@@ -1,7 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../IOVDbSvc.h"
-DECLARE_SERVICE_FACTORY(IOVDbSvc)
-DECLARE_FACTORY_ENTRIES(IOVDbSvc) {
- DECLARE_SERVICE( IOVDbSvc );
-}
+DECLARE_COMPONENT( IOVDbSvc )
+
diff --git a/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx b/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx
deleted file mode 100644
index 68d93359bdda12e481b834aaa185af8f893a5dde..0000000000000000000000000000000000000000
--- a/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbSvc)
diff --git a/Database/IOVDbTPCnv/cmt/requirements b/Database/IOVDbTPCnv/cmt/requirements
deleted file mode 100755
index 8a4c796a1ab850684c1828ef93acba6daac61743..0000000000000000000000000000000000000000
--- a/Database/IOVDbTPCnv/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package IOVDbTPCnv
-
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-author Antoine Perus <perus@lal.in2p3.fr>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCORAL AtlasCORAL-* External
-use IOVDbDataModel IOVDbDataModel-* Database
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-
-library IOVDbTPCnv *.cxx
-apply_pattern tpcnv_library
-
-private
-use AthenaKernel AthenaKernel-* Control
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use AtlasReflex AtlasReflex-* External
-
-apply_pattern lcgdict dict=IOVDbTPCnv selectionfile=selection.xml headerfiles="../IOVDbTPCnv/IOVDbTPCnvDict.h"
-apply_pattern lcgdict dict=OLD_IOVDbTPCnv selectionfile=OLD_selection.xml headerfiles="../IOVDbTPCnv/IOVDbTPCnvDict.h"
-
-end_private
-
diff --git a/Database/PersistentDataModel/cmt/requirements b/Database/PersistentDataModel/cmt/requirements
deleted file mode 100755
index f583600c011f360b2da6f1730ac6c8434b36a3db..0000000000000000000000000000000000000000
--- a/Database/PersistentDataModel/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package PersistentDataModel
-
-author Peter Van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCORAL AtlasCORAL-* External
-use GaudiInterface GaudiInterface-* External
-use CLIDSvc CLIDSvc-* Control
-use SGTools SGTools-* Control
-
-library PersistentDataModel *.cxx
-apply_pattern installed_library
-
-private
-use uuid v* LCG_Interfaces
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use AthenaKernel AthenaKernel-* Control
-
-apply_pattern lcgdict dict=PersistentDataModel selectionfile=selection.xml headerfiles="-s=${PersistentDataModel_root}/PersistentDataModel PersistentDataModelDict.h"
diff --git a/Database/PersistentDataModelAthenaPool/cmt/requirements b/Database/PersistentDataModelAthenaPool/cmt/requirements
deleted file mode 100755
index 6207d482d66f4f47f75f5058dda256f5292151d0..0000000000000000000000000000000000000000
--- a/Database/PersistentDataModelAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,14 +0,0 @@
-package PersistentDataModelAthenaPool
-
-author Peter Van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use AtlasCORAL AtlasCORAL-* External
-use PersistentDataModel PersistentDataModel-* Database
-use PersistentDataModelTPCnv PersistentDataModelTPCnv-* Database
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-apply_pattern poolcnv files="-s=${PersistentDataModel_root}/PersistentDataModel DataHeader.h"
diff --git a/Database/PersistentDataModelTPCnv/cmt/requirements b/Database/PersistentDataModelTPCnv/cmt/requirements
deleted file mode 100755
index 42b9cb5e702b873230709cce9725a846293be7c7..0000000000000000000000000000000000000000
--- a/Database/PersistentDataModelTPCnv/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package PersistentDataModelTPCnv
-
-author Peter van Gemmeren <gemmeren@anl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-
-use PersistentDataModel PersistentDataModel-* Database
-
-library PersistentDataModelTPCnv *.cxx
-apply_pattern installed_library
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use uuid * LCG_Interfaces
-
-use CxxUtils CxxUtils-* Control
-
-apply_pattern lcgdict dict=PersistentDataModelTPCnv selectionfile=selection.xml headerfiles="-s=${PersistentDataModelTPCnv_root}/PersistentDataModelTPCnv PersistentDataModelTPCnvDict.h"
diff --git a/Database/RegistrationServices/cmt/requirements b/Database/RegistrationServices/cmt/requirements
deleted file mode 100755
index f6998267a06f6799893480f4e7a4886fde880ea7..0000000000000000000000000000000000000000
--- a/Database/RegistrationServices/cmt/requirements
+++ /dev/null
@@ -1,45 +0,0 @@
-package RegistrationServices
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-
-#apply_tag POOL_HAS_COLLECTIONS
-#use AtlasHdf5 AtlasHdf5-* External
-use AtlasPOOL AtlasPOOL-* External
-use AtlasCOOL AtlasCOOL-* External
-use AtlasCORAL AtlasCORAL-* External
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use SGTools SGTools-* Control
-use StoreGate StoreGate-* Control
-
-use IOVDbSvc IOVDbSvc-* Database
-use PersistentDataModel PersistentDataModel-* Database
-use AthenaPoolKernel AthenaPoolKernel-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use DBDataModel DBDataModel-* Database/AthenaPOOL
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-
-# Remove excess libs
-macro POOL_FileMgt_libset ""
-macro_remove SEAL_linkopts "-llcg_Reflection"
-macro_remove SEAL_linkopts "-llcg_ReflectionBuilder"
-
-
-apply_pattern component_library
-library RegistrationServices RegistrationStream.cxx \
- RegistrationStreamDefMeta.cxx \
- RegistrationStreamLCGTool.cxx \
- RegistrationStreamTagTool.cxx \
- InputCollectionMetadataCopy.cxx \
- IOVRegistrationSvc.cxx \
- OutputConditionsAlg.cxx \
- components/*.cxx
-
-apply_pattern declare_joboptions files="-s=../share *.py"
-apply_pattern declare_python_modules files="*.py"
diff --git a/Database/RegistrationServices/src/RegistrationStream.h b/Database/RegistrationServices/src/RegistrationStream.h
index 08afdd41189fc9a903832580e360b1692eccd724..8934f2d0f7aa141360444fcf5bcc12ffecfa4e21 100755
--- a/Database/RegistrationServices/src/RegistrationStream.h
+++ b/Database/RegistrationServices/src/RegistrationStream.h
@@ -75,14 +75,14 @@ public:
/// Callback method to reinitialize the internal state of the component for I/O purposes (e.g. upon @c fork(2))
virtual StatusCode io_reinit();
-private:
-
/// Standard RegistrationStream Constructor
RegistrationStream(const std::string& name, ISvcLocator* pSvcLocator);
/// Standard Destructor
virtual ~RegistrationStream();
+private:
+
/// PRIVATE METHODS
/// Handler for ItemNames Property
void itemListHandler( Property& );
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
old mode 100755
new mode 100644
index 170dc5f485c9d3cb9e26e28abe12a61608e8344a..3829f35e32e40392cf93da304dc8fc39747ffd16
--- a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
+++ b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
@@ -1,17 +1,4 @@
-/**
- * @file RegistrationServices_entries.cxx
- *
- * @brief Declaration of component entry points
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * @author Kristo Karr <kkarr@hep.anl.gov>
- *
- * $Id: RegistrationServices_entries.cxx,v 1.16 2009-04-28 19:04:07 cranshaw Exp $
- *
- */
-
#include <stdint.h>
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../OutputConditionsAlg.h"
#include "../InputCollectionMetadataCopy.h"
#include "../RegistrationStream.h"
@@ -19,17 +6,10 @@
#include "../RegistrationStreamLCGTool.h"
#include "../RegistrationStreamTagTool.h"
-DECLARE_ALGORITHM_FACTORY(RegistrationStream)
-DECLARE_ALGORITHM_FACTORY(RegistrationStreamDefMeta)
-DECLARE_ALGORITHM_FACTORY(OutputConditionsAlg)
-DECLARE_TOOL_FACTORY(InputCollectionMetadataCopy)
-DECLARE_TOOL_FACTORY(RegistrationStreamLCGTool)
-DECLARE_TOOL_FACTORY(RegistrationStreamTagTool)
+DECLARE_COMPONENT( RegistrationStream )
+DECLARE_COMPONENT( RegistrationStreamDefMeta )
+DECLARE_COMPONENT( OutputConditionsAlg )
+DECLARE_COMPONENT( InputCollectionMetadataCopy )
+DECLARE_COMPONENT( RegistrationStreamLCGTool )
+DECLARE_COMPONENT( RegistrationStreamTagTool )
-DECLARE_FACTORY_ENTRIES(RegistrationServices) {
- DECLARE_ALGORITHM(RegistrationStream)
- DECLARE_ALGORITHM(RegistrationStreamDefMeta)
- DECLARE_ALGORITHM(OutputConditionsAlg)
- DECLARE_TOOL(RegistrationStreamLCGTool)
- DECLARE_TOOL(RegistrationStreamTagTool)
-}
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_load.cxx b/Database/RegistrationServices/src/components/RegistrationServices_load.cxx
deleted file mode 100755
index 940adb9bc24397195b77373ab6502e32bd53ed0f..0000000000000000000000000000000000000000
--- a/Database/RegistrationServices/src/components/RegistrationServices_load.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file RegistrationServices_load.cxx
- *
- * @brief Declaration of component factory
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * @author Kristo Karr <kkarr@hep.anl.gov>
- *
- * $Id: RegistrationServices_load.cxx,v 1.2 2005-01-07 10:44:07 schaffer Exp $
- *
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RegistrationServices )
-
-
diff --git a/Database/TPTools/cmt/requirements b/Database/TPTools/cmt/requirements
deleted file mode 100644
index b500c2eda18cda81c96aac57b61d373232c2ee9e..0000000000000000000000000000000000000000
--- a/Database/TPTools/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package TPTools
-
-author Marcin.Nowak@cern.ch
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use GaudiInterface GaudiInterface-* External
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-library TPTools *.cxx
-apply_pattern installed_library
-
-#apply_pattern declare_joboptions files="*.py"
-#apply_pattern declare_python_modules files="*.py"
-
-#macro_append TPToolsPoolCnvGen_dependencies " TPToolsDict "
-
-private
-use PersistentDataModel PersistentDataModel-* Database
-use AtlasReflex AtlasReflex-* External
-
-private
-apply_pattern lcgdict dict=TPTools \
- selectionfile=selection.xml \
- headerfiles="../TPTools/TPToolsDict.h"
-end_private
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h b/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h
index 17f052420c5f39573dd2db1ff53d19157d7c1d2a..14a5016bc3badd001f52bda4762ea276d8ca3258 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/AGDD2GeoSvc/AGDD2GeoSvc.h
@@ -38,8 +38,6 @@ public:
void addHandler(XMLHandler* v) { m_handlerVector.push_back(v);}
-protected:
-
friend class SvcFactory<AGDDtoGeoSvc>;
// Standard Constructor
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/cmt/requirements b/DetectorDescription/AGDD/AGDD2GeoSvc/cmt/requirements
deleted file mode 100644
index 0935f901b3624c7c28f711486a1bb08154c95f36..0000000000000000000000000000000000000000
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package AGDD2GeoSvc
-
-author ADA <Andrea.DellAcqua@cern.ch>
-manager ADA <Andrea.DellAcqua@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-library AGDD2GeoSvc *.cxx components/*.cxx
-apply_pattern component_library
-
-public
-use AGDDKernel AGDDKernel-* DetectorDescription/AGDD
-use AGDDControl AGDDControl-* DetectorDescription/AGDD
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-use EventInfo EventInfo-* Event
-use EventInfoMgt EventInfoMgt-* Event
-use AGDDHandlers AGDDHandlers-* DetectorDescription/AGDD
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
index def27b6fb481f273c69af08a65f68cb68dda5502..f0cc6d13ec00856bb0db6cd5e6b4aac6baafb0b2 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
@@ -1,12 +1,6 @@
#include "AGDD2GeoSvc/AGDD2GeoSvc.h"
#include "AGDD2GeoSvc/DefaultAGDDTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_SERVICE_FACTORY(AGDDtoGeoSvc)
-DECLARE_TOOL_FACTORY(DefaultAGDDTool)
-
-DECLARE_FACTORY_ENTRIES(AGDDtoGeoSvc) {
- DECLARE_SERVICE ( AGDDtoGeoSvc )
- DECLARE_ALGTOOL ( DefaultAGDDTool )
-}
+DECLARE_COMPONENT( AGDDtoGeoSvc )
+DECLARE_COMPONENT( DefaultAGDDTool )
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx
deleted file mode 100644
index 191abb6d2773dafea8889f3b105f36f2e74f0644..0000000000000000000000000000000000000000
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AGDDtoGeoSvc)
-
diff --git a/DetectorDescription/AGDD/AGDDControl/cmt/requirements b/DetectorDescription/AGDD/AGDDControl/cmt/requirements
deleted file mode 100644
index 709aec7a6b7aa09637400905fa849b65465b3e52..0000000000000000000000000000000000000000
--- a/DetectorDescription/AGDD/AGDDControl/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package AGDDControl
-
-author ADA <Andrea.DellAcqua@cern.ch>
-manager ADA <Andrea.DellAcqua@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-
-library AGDDControl *.cxx components/*.cxx
-apply_pattern installed_library
-
-public
-use AGDDKernel AGDDKernel* DetectorDescription/AGDD
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasXercesC AtlasXercesC-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-use PathResolver PathResolver-* Tools
-use AGDDModel AGDDModel* DetectorDescription/AGDD
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-use StoreGate StoreGate-* Control
-use GaudiInterface GaudiInterface-* External
-
diff --git a/DetectorDescription/AGDD/AGDDHandlers/cmt/requirements b/DetectorDescription/AGDD/AGDDHandlers/cmt/requirements
deleted file mode 100644
index 708c55c26e19b31c8b4f80ed2d8aeb22e12f7c42..0000000000000000000000000000000000000000
--- a/DetectorDescription/AGDD/AGDDHandlers/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package AGDDHandlers
-
-author ADA <Andrea.DellAcqua@cern.ch>
-manager ADA <Andrea.DellAcqua@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-
-library AGDDHandlers *.cxx
-apply_pattern installed_library
-
-public
-use AtlasCLHEP AtlasCLHEP-* External
-use AGDDKernel AGDDKernel-* DetectorDescription/AGDD
-use AGDDControl AGDDControl-* DetectorDescription/AGDD
-
-
-private
-use AGDDModel AGDDModel-* DetectorDescription/AGDD
diff --git a/DetectorDescription/AGDD/AGDDKernel/cmt/requirements b/DetectorDescription/AGDD/AGDDKernel/cmt/requirements
deleted file mode 100644
index a9379073aca2da4ad249f37c594c41e9739877ef..0000000000000000000000000000000000000000
--- a/DetectorDescription/AGDD/AGDDKernel/cmt/requirements
+++ /dev/null
@@ -1,16 +0,0 @@
-package AGDDKernel
-
-author ADA <Andrea.DellAcqua@cern.ch>
-manager ADA <Andrea.DellAcqua@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-
-library AGDDKernel *.cxx components/*.cxx handlers/*.cxx AGDD_model/*.cxx
-apply_pattern installed_library
-
-public
-use AtlasCLHEP AtlasCLHEP-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-
-private
diff --git a/DetectorDescription/AGDD/AGDDModel/cmt/requirements b/DetectorDescription/AGDD/AGDDModel/cmt/requirements
deleted file mode 100644
index dd0ec8eaa2509fc4ca27b272db1bd1ad66ccdb05..0000000000000000000000000000000000000000
--- a/DetectorDescription/AGDD/AGDDModel/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package AGDDModel
-
-author ADA <Andrea.DellAcqua@cern.ch>
-manager ADA <Andrea.DellAcqua@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-
-library AGDDModel *.cxx
-apply_pattern installed_library
-
-public
-use AtlasCLHEP AtlasCLHEP-* External
-use AGDDKernel AGDDKernel-* DetectorDescription/AGDD
-
-
-private
diff --git a/DetectorDescription/AtlasDetDescr/cmt/requirements b/DetectorDescription/AtlasDetDescr/cmt/requirements
deleted file mode 100755
index ce852712606ab03490a14bba421fcaee047a8427..0000000000000000000000000000000000000000
--- a/DetectorDescription/AtlasDetDescr/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package AtlasDetDescr
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasReflex AtlasReflex-* External
-use Identifier Identifier-* DetectorDescription
-use IdDict IdDict-* DetectorDescription
-use CLIDSvc CLIDSvc-* Control
-
-private
-use GaudiInterface GaudiInterface-* External
-public
-
-library AtlasDetDescr AtlasDetectorID.cxx AtlasDetectorIDHelper.cxx AtlasRegionHelper.cxx
-
-apply_pattern installed_library
-
-apply_pattern lcgdict dict=AtlasDetDescr selectionfile=selection.xml headerfiles="../AtlasDetDescr/AtlasDetDescrDict.h"
-
diff --git a/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h b/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h
index 0089037427d456a703724fab8d84c71874fdf682..6b2efdf18f3f724a0eb3572e52e1f64947908868 100755
--- a/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h
+++ b/DetectorDescription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h
@@ -71,7 +71,6 @@ public:
// virtual StatusCode updateAddress( SG::TransientAddress* tad );
-protected:
/**@name: Object implementation */
//@{
/// Standard Constructor
diff --git a/DetectorDescription/DetDescrCnvSvc/cmt/requirements b/DetectorDescription/DetDescrCnvSvc/cmt/requirements
deleted file mode 100755
index 0c70796eda8b15039b790cca25d6ad8b00b4dbc8..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCnvSvc/cmt/requirements
+++ /dev/null
@@ -1,16 +0,0 @@
-package DetDescrCnvSvc
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use StoreGate StoreGate-* Control
-end_private
-
-apply_pattern dual_use_library files=" *.cxx "
-
-# Install job options
-apply_pattern declare_joboptions files="-s=../share *.py"
-apply_pattern declare_python_modules files="*.py"
diff --git a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
old mode 100755
new mode 100644
index e234f514134eecfecb310503f0d18d309f02531e..5c89829e419518b30255f0768956d20ab80b24de
--- a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
@@ -1,12 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DetDescrCnvSvc/DetDescrCnvSvc.h"
-DECLARE_SERVICE_FACTORY( DetDescrCnvSvc )
-
-DECLARE_FACTORY_ENTRIES ( DetDescrCnvSvc ) {
- DECLARE_SERVICE ( DetDescrCnvSvc )
-}
-
+DECLARE_COMPONENT( DetDescrCnvSvc )
diff --git a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx
deleted file mode 100755
index c919d44cb438224abd0b7d6efa504f53d7137ba9..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DetDescrCnvSvc )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/cmt/requirements b/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/cmt/requirements
deleted file mode 100755
index 5718950909543d220dfca115427a81fc1e505d55..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package DetDescrCondAthenaPool
-#######################################
-# this package defines the POOL converters for the data classes in
-# DetDescrConditions - currently only AlignableTransform
-#######################################
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-private
-
-use DetDescrConditions DetDescrConditions-* DetectorDescription/DetDescrCond
-use DetDescrCondTPCnv DetDescrCondTPCnv-* DetectorDescription/DetDescrCond
-
-public
-
-apply_pattern poolcnv multChanTypes=" AlignableTransformContainer " files="-s=${DetDescrConditions_root}/DetDescrConditions AlignableTransform.h AlignableTransformContainer.h DetCondCFloat.h DetCondKeyTrans.h DetStatusMap.h"
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/cmt/requirements b/DetectorDescription/DetDescrCond/DetDescrCondExample/cmt/requirements
deleted file mode 100755
index 88597ad16ae33ac350b05a5f1a9e422e28cd1911..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/cmt/requirements
+++ /dev/null
@@ -1,34 +0,0 @@
-package DetDescrCondExample
-# examples of DetectorDescription applications of conditions database
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use Identifier Identifier-* DetectorDescription
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-private
-use AtlasROOT AtlasROOT-* External
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-use DetDescrConditions DetDescrConditions-* DetectorDescription/DetDescrCond
-use DetDescrCondTools DetDescrCondTools-* DetectorDescription/DetDescrCond
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use StoreGate StoreGate-* Control
-
-# Add definition of the ROOT components for the cmake-based build. This is totally transparent to the CMT-based build
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Hist)"
-
-library DetDescrCondExample ReadAlignTrans.cxx ReadTopTrans.cxx \
- ReadWriteCoolStrFile.cxx CoolHistExample.cxx components/*.cxx
-
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
old mode 100755
new mode 100644
index d4f3d22997c74fd71bbf080040df6973e254798a..b773e3cade471755635ec60cd10fd081b5809b8e
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
@@ -1,18 +1,10 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DetDescrCondExample/ReadAlignTrans.h"
#include "DetDescrCondExample/ReadTopTrans.h"
#include "DetDescrCondExample/ReadWriteCoolStrFile.h"
#include "DetDescrCondExample/CoolHistExample.h"
-DECLARE_ALGORITHM_FACTORY( ReadAlignTrans )
-DECLARE_ALGORITHM_FACTORY( ReadTopTrans )
-DECLARE_ALGORITHM_FACTORY( ReadWriteCoolStrFile )
-DECLARE_ALGORITHM_FACTORY( CoolHistExample )
+DECLARE_COMPONENT( ReadAlignTrans )
+DECLARE_COMPONENT( ReadTopTrans )
+DECLARE_COMPONENT( ReadWriteCoolStrFile )
+DECLARE_COMPONENT( CoolHistExample )
-DECLARE_FACTORY_ENTRIES( DetDescrCondExample )
-{
- DECLARE_ALGORITHM( ReadAlignTrans )
- DECLARE_ALGORITHM( ReadTopTrans )
- DECLARE_ALGORITHM( ReadWriteCoolStrFile )
- DECLARE_ALGORITHM( CoolHistExample )
-}
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx
deleted file mode 100755
index 962a743d35b7ec6a438374fe7109ae5cf2e72d95..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DetDescrCondExample )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/cmt/requirements b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/cmt/requirements
deleted file mode 100644
index fe5f2f0d53ce34d4f64a7e3d399894e550800bcf..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/cmt/requirements
+++ /dev/null
@@ -1,31 +0,0 @@
-package DetDescrCondTPCnv
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-author Marcin.Nowak@cern.ch
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasReflex AtlasReflex-* External
-
-use DetDescrConditions DetDescrConditions-* DetectorDescription/DetDescrCond
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use RootConversions RootConversions-* Database/AthenaPOOL
-use Identifier Identifier-* DetectorDescription
-
-private
-use AtlasCLHEP AtlasCLHEP-* External
-use GaudiInterface GaudiInterface-* External
-end_private
-
-library DetDescrCondTPCnv *.cxx
-apply_pattern tpcnv_library
-
-apply_pattern lcgdict dict=DetDescrCondTPCnv selectionfile=selection.xml headerfiles="../DetDescrCondTPCnv/DetDescrCondTPCnvDict.h"
-
-
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=DetStatusMapCnv_p1
-apply_pattern UnitTest_run unit_test=AlignableTransformCnv_p1
-apply_pattern UnitTest_run unit_test=DetCondCFloatCnv_p1
-apply_pattern UnitTest_run unit_test=DetDescrCondIdentifier_old_cnv
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/cmt/requirements b/DetectorDescription/DetDescrCond/DetDescrCondTools/cmt/requirements
deleted file mode 100755
index 0cd2728af5a5a14b84c5dfcfce4737ca6677f9dc..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/cmt/requirements
+++ /dev/null
@@ -1,35 +0,0 @@
-package DetDescrCondTools
-########
-# DetDescrCondTools - Tools to manage the AlignableTransforms
-########
-
-author Richard Hawkings <richard.hawking@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-use AtlasPOOL AtlasPOOL-* External
-use AtlasROOT AtlasROOT-* External
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use DetDescrConditions DetDescrConditions-* DetectorDescription/DetDescrCond
-use Identifier Identifier-* DetectorDescription
-public
-
-# Add definition of the ROOT components for the cmake-based build. This is totally transparent to the CMT-based build
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Hist Tree RIO)"
-
-library DetDescrCondTools AlignTransTool.cxx \
- CoolStrFileSvc.cxx \
- CoolHistSvc.cxx \
- components/*.cxx
-
-
-
-apply_pattern component_library
-
-apply_pattern declare_scripts files="coolHist_setFileIdentifier.sh coolHist_extractFileIdentifier.sh coolHist_setReference.py coolHist_insertFileToCatalog.py coolStrFileSvc_set.py"
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
old mode 100755
new mode 100644
index b1224faf5d506cffd0aad762f39ecdc9cfe794d4..2d963fd2513000ea71ca26126aaf591d52164e25
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
@@ -1,14 +1,8 @@
#include "DetDescrCondTools/AlignTransTool.h"
#include "../CoolStrFileSvc.h"
#include "../CoolHistSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY( AlignTransTool )
-DECLARE_SERVICE_FACTORY( CoolStrFileSvc )
-DECLARE_SERVICE_FACTORY( CoolHistSvc )
+DECLARE_COMPONENT( AlignTransTool )
+DECLARE_COMPONENT( CoolStrFileSvc )
+DECLARE_COMPONENT( CoolHistSvc )
-DECLARE_FACTORY_ENTRIES(DetDescrCondTools) {
- DECLARE_TOOL( AlignTransTool )
- DECLARE_SERVICE( CoolStrFileSvc )
- DECLARE_SERVICE( CoolHistSvc )
-}
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx
deleted file mode 100755
index c865c1aeaadce3b92ae2f0a4fce5db2733892302..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DetDescrCondTools)
-
diff --git a/DetectorDescription/DetDescrCond/DetDescrConditions/cmt/requirements b/DetectorDescription/DetDescrCond/DetDescrConditions/cmt/requirements
deleted file mode 100755
index e8aa7ccbc825b465a27bf2cc58b8ff31da087b69..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetDescrConditions/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-package DetDescrConditions
-##############################################################################
-# DetDescrConditions - data classes for subdetector independent alignment info
-# and other conditions data (to be added)
-##############################################################################
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use CLIDSvc CLIDSvc-* Control
-use Identifier Identifier-* DetectorDescription
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasBoost AtlasBoost-* External
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-apply_pattern installed_library
-library DetDescrConditions \
- AlignableTransform.cxx \
- DetCondFloat.cxx DetCondCFloat.cxx \
- DetCondKeyTrans.cxx DetStatus.cxx DetStatusMap.cxx
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=DetDescrConditions selectionfile=selection.xml headerfiles="../DetDescrConditions/DetDescrConditionsDict.h"
-
-# Now build a special (hand-written) library to build a dictionary for AlignTransMember
-# temporarily removed for ROOT5 migration (RJH)
-#apply_pattern lcgdictfix libname=DetDescrConditions dictfiles="DetDescrConditionsDict_dict_fixes.cxx"
-
-
-end_private
-
-
-
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/cmt/requirements b/DetectorDescription/DetDescrCond/DetectorStatus/cmt/requirements
deleted file mode 100755
index c8518735fa5b3981b412a2ec7f63517a6ad3e2c0..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetectorStatus/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package DetectorStatus
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use DetDescrConditions DetDescrConditions-* DetectorDescription/DetDescrCond
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-
-use StoreGate StoreGate-* Control
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-public
-
-# Change to a dual_use library because cmake does not export header files corresponding to
-# component libraries. This pollutes the linkopts slightly, but should otherwise be
-# backwards compatible.
-apply_pattern dual_use_library files=*.cxx
-####library DetectorStatus DetStatusSvc.cxx DetStatusAlg.cxx components/*.cxx
-####apply_pattern component_library
-
-apply_pattern declare_joboptions files="DetStatusSvc_CondDB.py DetStatusSvc_ToFileMetaData.py"
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="detStatus_set.py detStatus_query.py detStatus_upload.py detStatus_merge.py"
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
old mode 100755
new mode 100644
index eef308e1dd366ad3e4ed6b1d1f59d452d814a688..a460af7061fbe0b784b532845b32042b5fd4e5d1
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DetStatusSvc.h"
#include "DetectorStatus/DetStatusAlg.h"
-DECLARE_SERVICE_FACTORY(DetStatusSvc)
-DECLARE_ALGORITHM_FACTORY(DetStatusAlg)
+DECLARE_COMPONENT( DetStatusSvc )
+DECLARE_COMPONENT( DetStatusAlg )
-DECLARE_FACTORY_ENTRIES(DetectorStatus) {
- DECLARE_SERVICE( DetStatusSvc );
- DECLARE_ALGORITHM( DetStatusAlg );
-}
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx
deleted file mode 100755
index 4c70a1099377520571a86c6a9787b95b97411893..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DetectorStatus)
diff --git a/DetectorDescription/DetDescrDictionary/cmt/requirements b/DetectorDescription/DetDescrDictionary/cmt/requirements
deleted file mode 100755
index 3eeb918c086be9ef8297b5d43ef1c97db1e6c584..0000000000000000000000000000000000000000
--- a/DetectorDescription/DetDescrDictionary/cmt/requirements
+++ /dev/null
@@ -1,13 +0,0 @@
-package DetDescrDictionary
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use AtlasReflex AtlasReflex-* External
-use Identifier Identifier-* DetectorDescription
-use AthContainers AthContainers-* Control
-
-apply_pattern lcgdict dict=DetDescr headerfiles="../DetDescrDictionary/DetDescrDictionaryDict.h" selectionfile=selection.xml
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/cmt/requirements b/DetectorDescription/GeoModel/AtlasGeoModel/cmt/requirements
deleted file mode 100755
index f7a251336a2494692312a44e7cf0be6558694287..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/AtlasGeoModel/cmt/requirements
+++ /dev/null
@@ -1,11 +0,0 @@
-package AtlasGeoModel
-
-
-author Joe Boudreau
-
-use AtlasPolicy AtlasPolicy-*
-
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/cmt/requirements b/DetectorDescription/GeoModel/GeoAdaptors/cmt/requirements
deleted file mode 100755
index 1e731e53a51ff9a7961cb00f13a3c772a23fbe3a..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoAdaptors/cmt/requirements
+++ /dev/null
@@ -1,32 +0,0 @@
-package GeoAdaptors
-
-
-author Joe Boudreau
-
-
-use AtlasPolicy AtlasPolicy-*
-
-use AtlasCLHEP AtlasCLHEP-* External
-use CaloDetDescr CaloDetDescr-* Calorimeter
-use Identifier Identifier-* DetectorDescription
-use StoreGate StoreGate-* Control
-use InDetSimEvent InDetSimEvent-* InnerDetector
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
-use MuonSimEvent MuonSimEvent-* MuonSpectrometer
-use MuonPrepRawData MuonPrepRawData-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-
-use CaloIdentifier CaloIdentifier-* Calorimeter
-use LArSimEvent LArSimEvent-* LArCalorimeter
-use CaloSimEvent CaloSimEvent-* Calorimeter
-
-library GeoAdaptors *.cxx
-apply_pattern installed_library
-
-# Not even Jesus knows why I have to add this line:
-# JC. Don't add this line!!
-#macro_append GeoAdaptors_shlibflags -lMuonGeoModel
-#macro_append GeoAdaptors_cppflags "-g -O0"
diff --git a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
old mode 100755
new mode 100644
index 80e2e029331f5a3d90a932cb844d3d77200426ab..df75fb3afa5d9c3c9aede7b72a3f1428613830de
--- a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
@@ -1,3 +1,4 @@
#include "..//ToyDetectorTool.h"
-DECLARE_TOOL_FACTORY(ToyDetectorTool)
+DECLARE_COMPONENT( ToyDetectorTool )
+
diff --git a/DetectorDescription/GeoModel/GeoModelInterfaces/cmt/requirements b/DetectorDescription/GeoModel/GeoModelInterfaces/cmt/requirements
deleted file mode 100644
index 1282c99daf12cd4724ee9190bfec94fd90812977..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoModelInterfaces/cmt/requirements
+++ /dev/null
@@ -1,6 +0,0 @@
-package GeoModelInterfaces
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use CLIDSvc CLIDSvc-* Control
-use GaudiInterface GaudiInterface-* External
diff --git a/DetectorDescription/GeoModel/GeoModelKernel/cmt/requirements b/DetectorDescription/GeoModel/GeoModelKernel/cmt/requirements
deleted file mode 100755
index 25c124a79464e4590c31a787c9a79ed733ba0e9d..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoModelKernel/cmt/requirements
+++ /dev/null
@@ -1,13 +0,0 @@
-package GeoModelKernel
-
-author Joe Boudreau
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCxxPolicy AtlasCxxPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-
-library GeoModelKernel *.cxx
-apply_pattern installed_library
-
-
-
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h
index 897d8bb17a11c8646fe9fbc5daaa3604d96f2be7..6749afae79045d121687cd3d98175726d7343a7f 100644
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoDbTagSvc.h
@@ -20,12 +20,13 @@ class GeoDbTagSvc : public AthService, virtual public IGeoDbTagSvc
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
- protected:
friend class SvcFactory<GeoDbTagSvc>;
GeoDbTagSvc(const std::string& name, ISvcLocator* svc);
virtual ~GeoDbTagSvc();
+ protected:
+
void setAtlasVersion(const std::string& tag) { m_AtlasVersion=tag; }
void setInDetVersionOverride(const std::string& tag) { m_InDetVersionOverride=tag; }
void setPixelVersionOverride(const std::string& tag) { m_PixelVersionOverride=tag; }
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
index 66dcef7586d23ee5ca77635c0bebcdf6ba1379ad..a54fc8f44ff7890fa55d5f4b0e90ba850ae724fa 100755
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
@@ -42,8 +42,6 @@ public:
virtual StatusCode clear();
-protected:
-
friend class SvcFactory<GeoModelSvc>;
// Standard Constructor
@@ -52,6 +50,9 @@ protected:
// Standard Destructor
virtual ~GeoModelSvc();
+
+protected:
+
// StatusCode append( IGeoModelTool* pddTool,
// std::vector<IGeoModelTool*>* theTools );
// StatusCode decodeNames( StringArrayProperty& theNames,
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
old mode 100755
new mode 100644
index aba3755acb717994b32ed34b519a03badaf75bf3..eda713dbfd8ad653043574a80c2a6f3ce576ddd4
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
@@ -1,12 +1,6 @@
#include "../GeoModelSvc.h"
#include "../GeoDbTagSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_SERVICE_FACTORY(GeoModelSvc)
-DECLARE_SERVICE_FACTORY(GeoDbTagSvc)
-
-DECLARE_FACTORY_ENTRIES(GeoModelSvc) {
- DECLARE_SERVICE ( GeoModelSvc )
- DECLARE_SERVICE ( GeoDbTagSvc )
-}
+DECLARE_COMPONENT( GeoModelSvc )
+DECLARE_COMPONENT( GeoDbTagSvc )
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx
deleted file mode 100755
index 55e69c557a9e5b68261fb2bc7a83d8bf38c84e26..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeoModelSvc)
-
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/cmt/requirements b/DetectorDescription/GeoModel/GeoModelUtilities/cmt/requirements
deleted file mode 100644
index 0dc5ee817a0b46d6a9ddd94b9a48089359b52963..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoModelUtilities/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package GeoModelUtilities
-
-author Vakho Tsulaia
-
-use AtlasPolicy AtlasPolicy-*
-
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-use CLIDSvc CLIDSvc-* Control
-use RDBAccessSvc RDBAccessSvc-* Database/AthenaPOOL
-
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-
-library GeoModelUtilities *.cxx
-apply_pattern installed_library
-
-private
-use GaudiInterface GaudiInterface-* External
diff --git a/DetectorDescription/GeoModel/GeoSpecialShapes/cmt/requirements b/DetectorDescription/GeoModel/GeoSpecialShapes/cmt/requirements
deleted file mode 100755
index c6bfb396cd88d9f8729cd804b03cc77496634c03..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoModel/GeoSpecialShapes/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-package GeoSpecialShapes
-
-author Joe Boudreau
-author Andrei Soukharev <andrei.soukharev@cern.ch>
-author Dmitriy Maximov <Dmitriy.Maximov@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-
-use StoreGate StoreGate-* Control
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use SGTools SGTools-* Control
-
-# Specify the required ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Matrix)"
-
-library GeoSpecialShapes *.cxx LArWheelCalculator_Impl/*.cxx
-apply_pattern installed_library
-
-private
-use CxxUtils CxxUtils-* Control
-use AthenaKernel AthenaKernel-* Control
-use GaudiInterface GaudiInterface-* External
-use RDBAccessSvc RDBAccessSvc-* Database/AthenaPOOL
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-
-use AtlasROOT AtlasROOT-* External
-apply_tag ROOTMathLibs
-
-
-# Make dict for LArGeoChecker
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=LArGeoChecker selectionfile=selection.xml headerfiles="../GeoSpecialShapes/LArGeoCheckerDict.h"
-apply_pattern lcgdict dict=LArWheelEnums selectionfile=selectionEnums.xml headerfiles="../GeoSpecialShapes/LArWheelCalculatorEnums.h"
-
diff --git a/DetectorDescription/GeoPrimitives/cmt/Makefile.RootCore b/DetectorDescription/GeoPrimitives/cmt/Makefile.RootCore
deleted file mode 100644
index 4f484ce0ee50456db288be13b149e2e6a6d4047b..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoPrimitives/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: Makefile.RootCore 580850 2014-01-30 14:21:25Z krasznaa $
-#
-# this makefile also gets parsed by shell scripts
-# therefore it does not support full make syntax and features
-# edit with care
-
-# for full documentation check:
-# https://twiki.cern.ch/twiki/bin/viewauth/Atlas/RootCore#Package_Makefile
-
-PACKAGE = GeoPrimitives
-PACKAGE_PRELOAD =
-PACKAGE_CXXFLAGS =
-PACKAGE_OBJFLAGS =
-PACKAGE_LDFLAGS =
-PACKAGE_BINFLAGS =
-PACKAGE_LIBFLAGS =
-PACKAGE_DEP = Asg_Eigen EventPrimitives CxxUtils
-PACKAGE_TRYDEP =
-PACKAGE_CLEAN =
-PACKAGE_NOGRID =
-PACKAGE_PEDANTIC = 0
-PACKAGE_NOOPT = 0
-PACKAGE_NOCC = 1
-PACKAGE_REFLEX = 0
-
-include $(ROOTCOREDIR)/Makefile-common
diff --git a/DetectorDescription/GeoPrimitives/cmt/requirements b/DetectorDescription/GeoPrimitives/cmt/requirements
deleted file mode 100644
index bf7c711d9f5ee6da23b8a9241915a174c89de032..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeoPrimitives/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package GeoPrimitives
-# $Id: requirements 744450 2016-05-03 12:38:18Z krasznaa $
-
-author Robert Langenberg <Robert.Langenberg@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AtlasEigen AtlasEigen-* External
-use EventPrimitives EventPrimitives-* Event
-use AtlasCLHEP AtlasCLHEP-* External
-use CxxUtils CxxUtils-* Control
-
-# Create an interface library for the package with CMake:
-apply_pattern cmake_add_command command=metalibrary
-
-private
-use AtlasROOT AtlasROOT-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=GeoPrimitives selectionfile=selection.xml \
- headerfiles="../GeoPrimitives/GeoPrimitivesDict.h"
diff --git a/DetectorDescription/GeometryDBSvc/cmt/requirements b/DetectorDescription/GeometryDBSvc/cmt/requirements
deleted file mode 100644
index 01c1d29e492ce8383b0631c89e60466b094eac24..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeometryDBSvc/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package GeometryDBSvc
-
-author Grant Gorfine <Grant.Gorfine@cern.ch>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use RDBAccessSvc RDBAccessSvc-* Database/AthenaPOOL
-use GaudiInterface GaudiInterface-* External
-
-private
-use AthenaBaseComps AthenaBaseComps-* Control
-
-public
-
-library GeometryDBSvc *.cxx components/*.cxx
-apply_pattern component_library
-
diff --git a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
index fd77c5ed2e305dc71b465938d9f3b653e0b937b8..231cc1c6b54a08c5a21929708c3ab7951a178fbf 100644
--- a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
+++ b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../GeometryDBSvc.h"
-DECLARE_SERVICE_FACTORY(GeometryDBSvc)
-
-DECLARE_FACTORY_ENTRIES(GeometryDBSvc) {
- DECLARE_SERVICE(GeometryDBSvc)
-}
+DECLARE_COMPONENT( GeometryDBSvc )
diff --git a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx
deleted file mode 100644
index cd3880632cd6e9383e70fc1240c30ae2e5837637..0000000000000000000000000000000000000000
--- a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeometryDBSvc)
diff --git a/DetectorDescription/IRegionSelector/cmt/Makefile.RootCore b/DetectorDescription/IRegionSelector/cmt/Makefile.RootCore
deleted file mode 100644
index 33cddee36483c1a62cd84c4cc37dcc1a227b5287..0000000000000000000000000000000000000000
--- a/DetectorDescription/IRegionSelector/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,6 +0,0 @@
-PACKAGE = IRegionSelector
-PACKAGE_PRELOAD = EG
-PACKAGE_PEDANTIC = 0
-PACKAGE_NOCC=1
-include $(ROOTCOREDIR)/Makefile-common
-
diff --git a/DetectorDescription/IRegionSelector/cmt/requirements b/DetectorDescription/IRegionSelector/cmt/requirements
deleted file mode 100644
index 1e8e0b288aa8f93fe3ede453e0aa90eee1bb2462..0000000000000000000000000000000000000000
--- a/DetectorDescription/IRegionSelector/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package IRegionSelector
-
-author Mark Sutton <sutt@mail.desy.de>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-
-#use CLIDSvc CLIDSvc-* Control
-use GaudiInterface GaudiInterface-* External
-
-# use StoreGate StoreGate-* Control
-
-# Identifier
-use Identifier Identifier-* DetectorDescription
-
-# Declare a cmake metalibrary in order to ensure that clients of this package have
-# access to the libraries and header files of packages that this one depends upon
-apply_pattern cmake_add_command command=metalibrary
-
-# for locating data files
-# use PathResolver PathResolver-00-* Tools
-
-# apply_pattern declare_non_standard_include name=doc
diff --git a/DetectorDescription/IdDict/cmt/requirements b/DetectorDescription/IdDict/cmt/requirements
deleted file mode 100755
index 08f7b4867b0d9052336d6a5b4bf8f1e46e028649..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDict/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package IdDict
-
-author Christian Arnault <arnault@lal.in2p3.fr>
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use Identifier Identifier-* DetectorDescription
-
-library IdDict IdDictMgr.cxx IdDictFieldImplementation.cxx
-apply_pattern installed_library
-
-#macro IdDict_shlibflags "" WIN32 " $(Identifier_linkopts)"
-
-#macro IdDict_linkopts "$(IdDict_linkopts)" \
-# WIN32 "$(IdDict_root)\$(IdDict_tag)\IdDict.lib"
-
-private
-
-ignore_pattern config
-
-
diff --git a/DetectorDescription/IdDictDetDescr/cmt/requirements b/DetectorDescription/IdDictDetDescr/cmt/requirements
deleted file mode 100755
index 30e26fd72bbd095297e56bdae058dddf5dd54147..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDictDetDescr/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package IdDictDetDescr
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use IdDict IdDict-* DetectorDescription
-use CLIDSvc CLIDSvc-* Control
-
-
-library IdDictDetDescr IdDictManager.cxx
-apply_pattern installed_library
-
-private
-use Identifier Identifier-* DetectorDescription
-
diff --git a/DetectorDescription/IdDictDetDescrCnv/cmt/requirements b/DetectorDescription/IdDictDetDescrCnv/cmt/requirements
deleted file mode 100755
index dd69e33a5f7b783768880d22c4541aa0f6b8ab17..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDictDetDescrCnv/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package IdDictDetDescrCnv
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern component_library
-library IdDictDetDescrCnv *.cxx
-
-# Install job options
-apply_pattern declare_joboptions files=" *.py "
-
-private
-use Identifier Identifier-* DetectorDescription
-use DetDescrCnvSvc DetDescrCnvSvc-* DetectorDescription
-use IdDictParser IdDictParser-* DetectorDescription
-use IdDictDetDescr IdDictDetDescr-* DetectorDescription
-use AtlasDetDescr AtlasDetDescr-* DetectorDescription
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-use RDBAccessSvc RDBAccessSvc-* Database/AthenaPOOL
-use CxxUtils CxxUtils-* Control
-use StoreGate StoreGate-* Control
-use SGTools SGTools-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index 621fb397f78fbdf398a039ae9bfb321ee4bb32ab..641832c3c32531658920746162e490f405159593
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
@@ -1,22 +1,8 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "IdDictDetDescrCnv.h"
#include "AtlasIDDetDescrCnv.h"
#include "IdDictCnvTest.h"
DECLARE_CONVERTER_FACTORY( AtlasIDDetDescrCnv )
DECLARE_CONVERTER_FACTORY( IdDictDetDescrCnv )
-DECLARE_ALGORITHM_FACTORY( IdDictCnvTest )
-
-DECLARE_FACTORY_ENTRIES ( IdDictDetDescrCnv ) {
- DECLARE_CONVERTER ( IdDictDetDescrCnv )
- DECLARE_CONVERTER ( AtlasIDDetDescrCnv )
- DECLARE_ALGORITHM ( IdDictCnvTest )
-}
-
+DECLARE_COMPONENT( IdDictCnvTest )
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx
deleted file mode 100755
index 2dbc2d196b5cd029ec8cbea5420581b99c1ac836..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( IdDictDetDescrCnv )
diff --git a/DetectorDescription/IdDictParser/cmt/requirements b/DetectorDescription/IdDictParser/cmt/requirements
deleted file mode 100755
index d2ddf8a40db27bc7588e55846ff0aac170074b26..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDictParser/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package IdDictParser
-
-author Christian Arnault <arnault@lal.in2p3.fr>
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use XMLCoreParser XMLCoreParser-* Tools
-use IdDict IdDict-* DetectorDescription
-
-library IdDictParser IdDictParser.cxx
-apply_pattern installed_library
-
-# have all xml files installed
-apply_pattern declare_xmls
-
-private
-use Identifier Identifier-* DetectorDescription
-
-# temporarily comment out: (during Identifier migration)
-#use AGDD_Parser AGDD_Parser-* DetectorDescription/AGDD
-
-application tid ../test/tid.cxx
-macro_append tid_dependencies IdDictParser
-
-application test_det_id ../test/test_indet_id.cxx
-macro_append test_det_id_dependencies IdDictParser
-
-ignore_pattern config
-
-path_append XMLPATH "${AGDD_PARSERROOT}/run"
diff --git a/DetectorDescription/Identifier/cmt/requirements b/DetectorDescription/Identifier/cmt/requirements
deleted file mode 100644
index 5041255caf32ab11541f782a4c6a31b6a9b8d1e5..0000000000000000000000000000000000000000
--- a/DetectorDescription/Identifier/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-package Identifier
-
-author Christian Arnault <arnault@lal.in2p3.fr>
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCxxPolicy AtlasCxxPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AtlasBoost AtlasBoost-* External
-
-macro_append cppflags "" \
- WIN32 " -GX "
-
-#macro_append cppflags " -pg "
-
-macro no_share_option "" \
- VisualC "-no_share"
-
-library Identifier $(no_share_option) Identifier.cxx \
-Identifier32.cxx \
-ExpandedIdentifier.cxx \
-Range.cxx \
-Identifiable.cxx \
-IdHelper.cxx
-
-
-apply_pattern installed_library
-
-private
-
-macro Identifier_doc_path "../doc/Doxygen/html"
-
-ignore_pattern config
-
-path_append PATH "" WIN32 "$(Identifier_root)\$(Identifier_tag)"
-
diff --git a/DetectorDescription/RegSelLUT/cmt/requirements b/DetectorDescription/RegSelLUT/cmt/requirements
deleted file mode 100755
index e8ee367aa531d22f2c818d3befa3a6c61f0f2405..0000000000000000000000000000000000000000
--- a/DetectorDescription/RegSelLUT/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-package RegSelLUT
-
-author Mark Sutton <sutt@mail.desy.de>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use GaudiInterface GaudiInterface-* External
-# use AtlasROOT AtlasROOT-* External
-
-# use StoreGate StoreGate-* Control
-
-# Identifier
-use Identifier Identifier-* DetectorDescription
-
-# for locating data files
-# use PathResolver PathResolver-* Tools
-
-
-# private
-# macro_append RegSelLUTLib_shlibflags " -lpthread"
-# end_private
-
-apply_pattern installed_library
-library RegSelLUT *.cxx
-
-# files=*.cxx
-# apply_pattern declare_runtime files="*.txt *.cfg"
-# apply_pattern declare_joboptions files="-s=../share *.txt *.py"
-# apply_pattern declare_python_modules files="*.py"
-
-# apply_tag ROOTGraphicsLibs
-
-macro_append cppflags " "
-
diff --git a/DetectorDescription/RegionSelector/cmt/requirements b/DetectorDescription/RegionSelector/cmt/requirements
deleted file mode 100755
index a1e3cf621909934028acf4de654a8444eae004f3..0000000000000000000000000000000000000000
--- a/DetectorDescription/RegionSelector/cmt/requirements
+++ /dev/null
@@ -1,59 +0,0 @@
-package RegionSelector
-
-author Denis Damazio <Denis.Oliveira.Damazio@cern.ch>, Alessandro DiMattia <alessandro.dimattia@roma1.infn.it>, Simon George <S.George@rhul.ac.uk>, Aline Gesualdi Mello <aline@lps.ufrj.br>, Mark Sutton <sutt@mail.desy.de>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use GaudiInterface GaudiInterface-* External
-
-
-
-# Identifier
-use Identifier Identifier-* DetectorDescription
-
-
-
-private
-
-use AthenaBaseComps AthenaBaseComps-* Control
-
-# for detector description version
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-
-use InDetConditionsSummaryService InDetConditionsSummaryService-* InnerDetector/InDetConditions
-
-# To Get LAr Conditions
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-
-# for locating data files
-use PathResolver PathResolver-* Tools
-
-use RegSelLUT RegSelLUT-* DetectorDescription
-
-use StoreGate StoreGate-* Control
-
-end_private
-
-
-
-public
-
-
-use IRegionSelector IRegionSelector-* DetectorDescription
-
-
-private
-macro_append RegionSelectorLib_shlibflags " -lpthread"
-end_private
-
-apply_pattern dual_use_library files=*.cxx
-# apply_pattern declare_runtime files="*.txt *.cfg"
-# apply_pattern declare_joboptions files="-s=../share *.txt *.py"
-apply_pattern declare_joboptions files="-s=../share *.py"
-apply_pattern declare_python_modules files="*.py"
-
-# apply_tag ROOTGraphicsLibs
-
-macro_append cppflags ""
-
diff --git a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
old mode 100755
new mode 100644
index 3c0e961d04951caa37665d17547ca82e9a61835b..2f7680f880fe0c8aa93315e506a00942b0a23cf0
--- a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
+++ b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
@@ -1,12 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
// #include "RegionSelector/RegSelSvc.h"
#include "../RegSelSvc.h"
// #include "../NewRegSelSvc.h"
-DECLARE_SERVICE_FACTORY( RegSelSvc )
-// DECLARE_SERVICE_FACTORY( NewRegSelSvc )
+DECLARE_COMPONENT( RegSelSvc )
+// DECLARE_COMPONENT( NewRegSelSvc )
-DECLARE_FACTORY_ENTRIES(RegionSelector) {
- DECLARE_SERVICE( RegSelSvc )
- // DECLARE_SERVICE( NewRegSelSvc )
-}
diff --git a/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx b/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx
deleted file mode 100755
index 97e1e64cd19c87c63d936b3de20933e178a83263..0000000000000000000000000000000000000000
--- a/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RegionSelector)
-
diff --git a/DetectorDescription/RoiDescriptor/cmt/Makefile.RootCore b/DetectorDescription/RoiDescriptor/cmt/Makefile.RootCore
deleted file mode 100644
index 271246d6d850dc1958b62cdce3b96cf28a6d5e20..0000000000000000000000000000000000000000
--- a/DetectorDescription/RoiDescriptor/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,8 +0,0 @@
-PACKAGE = RoiDescriptor
-PACKAGE_PRELOAD = EG
-PACKAGE_CXXFLAGS = -D__USE_XOPEN2K8
-PACKAGE_LDFLAGS = $(shell root-config --libs) -lPyROOT -lXMLParser -lEG
-PACKAGE_DEP = IRegionSelector
-PACKAGE_PEDANTIC = 0
-include $(ROOTCOREDIR)/Makefile-common
-
diff --git a/DetectorDescription/RoiDescriptor/cmt/requirements b/DetectorDescription/RoiDescriptor/cmt/requirements
deleted file mode 100644
index 9230b49406999a5b30f80ab6dec85b0a6258aee7..0000000000000000000000000000000000000000
--- a/DetectorDescription/RoiDescriptor/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package RoiDescriptor
-
-author M Sutton <sutt@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use IRegionSelector IRegionSelector-* DetectorDescription
-# use GaudiInterface GaudiInterface-* External
-
-private
-use AtlasReflex AtlasReflex-* External
-
-apply_pattern lcgdict dict=RoiDescriptor selectionfile=selection.xml \
- headerfiles="../RoiDescriptor/RoiDescriptorDict.h"
-
-# Add cmake support to specify the Boost components that are required. This is transparent to CMT
-apply_pattern cmake_add_command command="find_package(Boost COMPONENTS program_options regex)"
-
-library RoiDescriptor ../Root/RoiDescriptor.cxx ../Root/RoiUtil.cxx
-end_private
-
-apply_pattern installed_library
-
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/cmt/requirements b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/cmt/requirements
deleted file mode 100644
index ff7085d8d47df8c33b652af3d9ad5794c49458af..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/cmt/requirements
+++ /dev/null
@@ -1,46 +0,0 @@
-## automatically generated CMT requirements file
-package AFP_ByteStream2RawCnv
-author nifomin
-
-public
-## for athena policies: this has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-
-## for gaudi tools, services and objects
-use GaudiInterface GaudiInterface-* External
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use ByteStreamCnvSvcBase ByteStreamCnvSvcBase-* Event
-use ByteStreamData ByteStreamData-* Event
-use DataCollection DataCollection-* External
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use AFP_RawEv AFP_RawEv-* ForwardDetectors/AFP
-
-##use AFP_RawEv AFP_RawEv-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use DataModel DataModel-* Control
-private
-use AthenaBaseComps AthenaBaseComps-* Control
-end_private
-
-
-
-
-
-
-## put here your package dependencies...
-
-##
-
-branches src src/components run
-
-## default is to make component library. See: https://twiki.cern.ch/twiki/bin/view/Main/LearningAthena#Libraries_in_CMT for alternatives
-#library AFP_ByteStream2RawCnv *.cxx -s=components *.cxx
-#apply_pattern component_library
-apply_pattern dual_use_library files="*.cxx"
-##apply_pattern declare_joboptions files="*.py"
-##apply_pattern declare_python_modules files="*.py"
-
-
-
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
index a8b45aea656c5809a5ddeecca48441fda9f33dd0..0152c881b5a535191a748099dc37256e82aa3ea3 100644
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
@@ -1,26 +1,16 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "AFP_ByteStream2RawCnv/RawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( RawDataProvider )
+DECLARE_COMPONENT( RawDataProvider )
#include "AFP_ByteStream2RawCnv/AFP_ByteStream2RawCnv.h"
-DECLARE_TOOL_FACTORY( AFP_ByteStream2RawCnv )
+DECLARE_COMPONENT( AFP_ByteStream2RawCnv )
#include "AFP_ByteStream2RawCnv/AFP_RawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( AFP_RawDataProviderTool )
+DECLARE_COMPONENT( AFP_RawDataProviderTool )
#include "AFP_ByteStream2RawCnv/AFP_RawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataProvider )
-
-DECLARE_FACTORY_ENTRIES( AFP_ByteStream2RawCnv )
-{
- DECLARE_ALGORITHM( AFP_RawDataProvider );
- DECLARE_TOOL( AFP_RawDataProviderTool );
- DECLARE_TOOL( AFP_ByteStream2RawCnv );
- DECLARE_ALGORITHM( RawDataProvider );
-}
+DECLARE_COMPONENT( AFP_RawDataProvider )
+
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx
deleted file mode 100644
index 125337d5cc6353bae852f7e61dd24a4cba36dddf..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_ByteStream2RawCnv)
diff --git a/ForwardDetectors/AFP/AFP_DigiEv/cmt/requirements b/ForwardDetectors/AFP/AFP_DigiEv/cmt/requirements
deleted file mode 100644
index a0d9befda0b9cbf756a909dc1539700972a0a712..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_DigiEv/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package AFP_DigiEv
-
-author Leszek Adamczyk <leszek.adamczyk@agh.edu.pl>
-author Tom Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-
-use HitManagement HitManagement-* Simulation
-
-library AFP_DigiEv *.cxx
-
-apply_pattern installed_library
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=AFP_DigiEv selectionfile=selection.xml headerfiles="../AFP_DigiEv/AFP_DigiEvDict.h"
-
-end_private
diff --git a/ForwardDetectors/AFP/AFP_Digitization/cmt/requirements b/ForwardDetectors/AFP/AFP_Digitization/cmt/requirements
deleted file mode 100644
index c60d81d48340839527303c3f42986791017c76f3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Digitization/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package AFP_Digitization
-
-author Leszek Adamczyk <leszek.adamczyk@agh.edu.pl>
-author Tom Sykora <tomas.sykora@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-use EventInfo EventInfo-* Event
-use HitManagement HitManagement-* Simulation
-
-use AFP_DigiEv AFP_DigiEv-* ForwardDetectors/AFP
-use AFP_SimEv AFP_SimEv-* ForwardDetectors/AFP
-use PileUpTools PileUpTools-* Control
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-
-library AFP_Digitization *.cxx components/*.cxx
-apply_pattern component_library
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_joboptions files="*.py"
-
-private
-
-use Identifier Identifier-* DetectorDescription
-use AtlasCLHEP AtlasCLHEP-* External
-
-end_private
diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
index 575fc986dc92a266fd0baf419e85de20c9fa7e6e..15e7e6127a86617f42efdf18597f36b96334fbc1 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
@@ -1,14 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AFP_Digitization/AFP_DigiTop.h"
#include "AFP_Digitization/AFP_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY(AFP_DigiTop)
+DECLARE_COMPONENT( AFP_DigiTop )
-DECLARE_TOOL_FACTORY( AFP_PileUpTool )
-
-DECLARE_FACTORY_ENTRIES (AFP_Digitization)
-{
- DECLARE_ALGORITHM(AFP_DigiTop)
- DECLARE_TOOL( AFP_PileUpTool )
-}
+DECLARE_COMPONENT( AFP_PileUpTool )
diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx
deleted file mode 100644
index fc0ce4471af35c7e10ca4213fa4b10b74fe77aae..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_Digitization)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/cmt/requirements b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/cmt/requirements
deleted file mode 100644
index 66fecd1da07b331041c33bb81e7ab1424b24b945..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,28 +0,0 @@
-package AFP_EventAthenaPool
-
-author Libor Nozka <libor.nozka@cern.ch>
-author Tom Sykora <tomas.sykora@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-
-
-# Converters for the rdo containers and hit collections
-apply_pattern poolcnv files=" -s=${AFP_SimEv_root}/AFP_SimEv AFP_TDSimHitCollection.h AFP_SIDSimHitCollection.h \
- -s=${AFP_DigiEv_root}/AFP_DigiEv AFP_TDDigiCollection.h AFP_SiDigiCollection.h \
- -s=${AFP_LocRecoEv_root}/AFP_LocRecoEv AFP_TDLocRecoEvCollection.h \
- -s=${AFP_LocRecoEv_root}/AFP_LocRecoEv AFP_SIDLocRecoEvCollection.h"
-
-macro_append AFP_EventAthenaPoolPoolCnv_shlibflags "$(AFP_EventAthenaPool_dict_linkopts)"
-
-private
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-use AFP_SimEv AFP_SimEv-* ForwardDetectors/AFP
-use AFP_DigiEv AFP_DigiEv-* ForwardDetectors/AFP
-use AFP_EventTPCnv AFP_EventTPCnv-* ForwardDetectors/AFP/AFP_EventCnv
-use AFP_LocRecoEv AFP_LocRecoEv-* ForwardDetectors/AFP/AFP_RecoEv
-use GaudiInterface GaudiInterface-* External
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/cmt/version.cmt b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/cmt/version.cmt
deleted file mode 100644
index 362d2d3a8881386c2773512c963274582d252a4b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-AFP_EventAthenaPool-00-00-02
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
index 5ebe500891dc16663dc791e995a529b7ecdfb4ca..2b7e014c262021636bf4a572f9db2b548a7558bf 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
@@ -7,21 +7,13 @@
#include "src/AFP_TDLocRecoEvCollectionCnv.h"
#include "src/AFP_SIDLocRecoEvCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollectionCnv )
+DECLARE_COMPONENT( AFP_TDSimHitCollectionCnv )
+DECLARE_COMPONENT( AFP_TDDigiCollectionCnv )
+DECLARE_COMPONENT( AFP_SIDSimHitCollectionCnv )
+DECLARE_COMPONENT( AFP_SiDigiCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv )
+DECLARE_COMPONENT( AFP_TDLocRecoEvCollectionCnv )
+DECLARE_COMPONENT( AFP_SIDLocRecoEvCollectionCnv )
-DECLARE_FACTORY_ENTRIES(AFP_EventAthenaPool) {
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_SiDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollectionCnv )
-}
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx
deleted file mode 100644
index f033e1200e6f14717b22a72413587940640b31d8..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_EventAthenaPool)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
index d1f56ba0863534275bbcee64606d28fd04ae9f54..962b01e575884f7d92be6b3407a2f155cfe98388 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
@@ -2,13 +2,7 @@
#include "src/AFP_TDDigiCollectionCnv.h"
#include "src/AFP_SIDSimHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimDigiCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv )
-
-DECLARE_FACTORY_ENTRIES(AFP_EventAthenaPool) {
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv )
-}
+DECLARE_COMPONENT( AFP_TDSimHitCollectionCnv )
+DECLARE_COMPONENT( AFP_TDSimDigiCollectionCnv )
+DECLARE_COMPONENT( AFP_SIDSimHitCollectionCnv )
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx
deleted file mode 100644
index 48d322a4456194323f32f4bbeee55e745fb034c8..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_SimEvEventAthenaPool)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/cmt/requirements b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/cmt/requirements
deleted file mode 100644
index 5a24750d438c1b66f8ad2408050a90d83366ec83..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/cmt/requirements
+++ /dev/null
@@ -1,34 +0,0 @@
-package AFP_EventTPCnv
-
-author Libor Nozka <libor.nozka@cern.ch>
-author Tom Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-
-use AFP_SimEv AFP_SimEv-* ForwardDetectors/AFP
-use AFP_DigiEv AFP_DigiEv-* ForwardDetectors/AFP
-use AFP_RawEv AFP_RawEv-* ForwardDetectors/AFP
-use AFP_LocRecoEv AFP_LocRecoEv-* ForwardDetectors/AFP/AFP_RecoEv
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-# The following use is to get the lcgdict pattern.
-# This is "hidden" behind "private" and "no_auto_imports" to keep
-# clients of EventInfo from seeing excess dependencies
-# private
-use AtlasReflex AtlasReflex-* External
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See EventInfoDict
-apply_pattern lcgdict dict=AFP_EventTPCnv selectionfile=selection.xml headerfiles="../AFP_EventTPCnv/AFP_EventTPCnvDict.h"
-
-# end_private
-
-private
-use Identifier Identifier-* DetectorDescription
-use GaudiInterface GaudiInterface-* External
-end_private
-
-
-library AFP_EventTPCnv *.cxx
-apply_pattern installed_library
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/cmt/version.cmt b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/cmt/version.cmt
deleted file mode 100644
index a7855209ba9dce1f3a38774df0738e7d9fae6e8b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-AFP_EventTPCnv-00-00-07
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
index 293b9ae6a71a394bfe4e041eece7e26b76f57e5c..0a92a0218241c4e4223e496fbd2a9e000393a545 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
@@ -38,84 +38,51 @@
#include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollection_p1.h"
#include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHit_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigi_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDDigiCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_RawData_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataCollectionCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataContainer_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_RawDataContainerCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHit_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigi_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollectionCnv_p1 )
-
-
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv_p1 )
-
-
-DECLARE_FACTORY_ENTRIES(AFP_EventTPCnv) {
- DECLARE_ALGORITHM( AFP_TDSimHit_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv_p1 )
-
- DECLARE_ALGORITHM( AFP_TDDigi_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv_p1 )
-
- DECLARE_ALGORITHM( AFP_RawData_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCollection_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawDataContainer_p1 )
- DECLARE_ALGORITHM( AFP_RawDataContainerCnv_p1 )
-
- DECLARE_ALGORITHM( AFP_SIDSimHit_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollection_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv_p1 )
-
- DECLARE_ALGORITHM( AFP_SiDigi_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCnv_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCollection_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_TDSimHit_p1 )
+DECLARE_COMPONENT( AFP_TDSimHitCnv_p1 )
+DECLARE_COMPONENT( AFP_TDSimHitCollection_p1 )
+DECLARE_COMPONENT( AFP_TDSimHitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_TDDigi_p1 )
+DECLARE_COMPONENT( AFP_TDDigiCnv_p1 )
+DECLARE_COMPONENT( AFP_TDDigiCollection_p1 )
+DECLARE_COMPONENT( AFP_TDDigiCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_RawData_p1 )
+DECLARE_COMPONENT( AFP_RawDataCnv_p1 )
+DECLARE_COMPONENT( AFP_RawDataCollection_p1 )
+DECLARE_COMPONENT( AFP_RawDataCollectionCnv_p1 )
+DECLARE_COMPONENT( AFP_RawDataContainer_p1 )
+DECLARE_COMPONENT( AFP_RawDataContainerCnv_p1 )
+
+DECLARE_COMPONENT( AFP_SIDSimHit_p1 )
+DECLARE_COMPONENT( AFP_SIDSimHitCnv_p1 )
+DECLARE_COMPONENT( AFP_SIDSimHitCollection_p1 )
+DECLARE_COMPONENT( AFP_SIDSimHitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_SiDigi_p1 )
+DECLARE_COMPONENT( AFP_SiDigiCnv_p1 )
+DECLARE_COMPONENT( AFP_SiDigiCollection_p1 )
+DECLARE_COMPONENT( AFP_SiDigiCollectionCnv_p1 )
+
+
+DECLARE_COMPONENT( AFP_TDLocRecoEvent_p1 )
+DECLARE_COMPONENT( AFP_TDLocRecoEventCnv_p1 )
+DECLARE_COMPONENT( AFP_TDLocRecoEvCollection_p1 )
+DECLARE_COMPONENT( AFP_TDLocRecoEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( AFP_SIDLocRecoEvent_p1 )
+DECLARE_COMPONENT( AFP_SIDLocRecoEventCnv_p1 )
+DECLARE_COMPONENT( AFP_SIDLocRecoEvCollection_p1 )
+DECLARE_COMPONENT( AFP_SIDLocRecoEvCollectionCnv_p1 )
+
+
+
+
+
+
- DECLARE_ALGORITHM( AFP_TDLocRecoEvent_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEventCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvent_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEventCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollection_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollectionCnv_p1 )
-}
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx
deleted file mode 100644
index d2b461b6de973283f009039a80c27e9d7e164d8c..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_EventTPCnv)
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/cmt/requirements b/ForwardDetectors/AFP/AFP_G4_SD/cmt/requirements
deleted file mode 100644
index e2ece39dbe906c8b012b7f81b628c07bf221da43..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_G4_SD/cmt/requirements
+++ /dev/null
@@ -1,28 +0,0 @@
-package AFP_G4_SD
-
-author Libor Nozka <libor.nozka@cern.ch>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-
-use GaudiInterface GaudiInterface-* External
-
-private
-use AFP_Geometry AFP_Geometry-* ForwardDetectors/AFP
-use AFP_SimEv AFP_SimEv-* ForwardDetectors/AFP
-use AtlasDoxygen AtlasDoxygen-* Tools
-use CxxUtils CxxUtils-* Control
-use Geant4 Geant4-* External
-use G4AtlasTools G4AtlasTools-* Simulation/G4Atlas
-use StoreGate StoreGate-* Control
-
-end_private
-
-apply_pattern declare_python_modules files="*.py"
-
-# define link options
-apply_pattern component_library
-library AFP_G4_SD *.cxx -s=components *.cxx
-
-# apply_pattern declare_joboptions files="MyJobOptions.py"
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
index 03452ff73c11b0b51e93da34d506ff92277830a7..221bbd0a44e8117dc3f55032750122632e3beeed 100644
--- a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
@@ -1,14 +1,8 @@
#include "../AFP_SensitiveDetectorTool.h" //TODO remove once separate versions tested
#include "../AFP_SiDSensitiveDetectorTool.h"
#include "../AFP_TDSensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY(AFP_SensitiveDetectorTool) //TODO remove once separate versions tested
-DECLARE_TOOL_FACTORY(AFP_SiDSensitiveDetectorTool)
-DECLARE_TOOL_FACTORY(AFP_TDSensitiveDetectorTool)
+DECLARE_COMPONENT( AFP_SensitiveDetectorTool ) //TODO remove once separate versions tested
+DECLARE_COMPONENT( AFP_SiDSensitiveDetectorTool )
+DECLARE_COMPONENT( AFP_TDSensitiveDetectorTool )
-DECLARE_FACTORY_ENTRIES(AFP_G4_SD) {
- DECLARE_TOOL(AFP_SensitiveDetectorTool); //TODO remove once separate versions tested
- DECLARE_TOOL(AFP_SiDSensitiveDetectorTool);
- DECLARE_TOOL(AFP_TDSensitiveDetectorTool);
-}
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx
deleted file mode 100644
index ef16ed74aac0adb986e4d148199b858b3512e4da..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_G4_SD)
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
old mode 100755
new mode 100644
index ba820e084fafb1a00381b12b49d11c7b7ed70eee..b483358fd76cd9ffe6499f396f776755e1a2be7d
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../AFP_GeoModelTool.h"
-DECLARE_TOOL_FACTORY(AFP_GeoModelTool)
+DECLARE_COMPONENT( AFP_GeoModelTool )
+
diff --git a/ForwardDetectors/AFP/AFP_Geometry/cmt/requirements b/ForwardDetectors/AFP/AFP_Geometry/cmt/requirements
deleted file mode 100644
index 08e18a4131996730aac97372a6e20e12c11d3f90..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Geometry/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package AFP_Geometry
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-#use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-use CLIDSvc CLIDSvc-* Control
-
-private
-use AthenaKernel AthenaKernel-* Control
-use GaudiInterface GaudiInterface-* External
-end_private
-
-library AFP_Geometry ../src/*.cxx
-
-apply_pattern installed_library
-apply_pattern declare_runtime files="-s=*.txt *.dat *.py"
-
-private
-macro cppdebugflags '$(cppdebugflags_s)'
-macro_remove componentshr_linkopts "-Wl,-s"
-end_private
-
-private
-use StoreGate StoreGate-* Control
-use PathResolver PathResolver-* Tools
-end_private
diff --git a/ForwardDetectors/AFP/AFP_Geometry/cmt/version.cmt b/ForwardDetectors/AFP/AFP_Geometry/cmt/version.cmt
deleted file mode 100644
index d5ebb6b6790f2406a323610ed2fd86481e09b673..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Geometry/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-AFP_Geometry-r735874
diff --git a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
index 5627aa47f989e7c61bc707a9705e48854387ca99..24b4c15c475c82c51fc93a4cee0c8901435e47e4 100644
--- a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
@@ -1,8 +1,4 @@
#include "AFP_Geometry/AFP_Geometry.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY(AFP_Geometry)
+DECLARE_COMPONENT( AFP_Geometry )
-DECLARE_FACTORY_ENTRIES(AFP_Geometry) {
- DECLARE_ALGORITHM(AFP_Geometry)
-}
diff --git a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx
deleted file mode 100644
index b41680a6b238ed0ab2e1d34f891a67123d4c8685..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_Geometry)
-
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/cmt/requirements b/ForwardDetectors/AFP/AFP_Monitoring/cmt/requirements
deleted file mode 100644
index 370ecadb8d9a20ef267c904c68fe09b5bb5bbdb5..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Monitoring/cmt/requirements
+++ /dev/null
@@ -1,38 +0,0 @@
-## automatically generated CMT requirements file
-package AFP_Monitoring
-author ggach
-
-## for athena policies: this has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-
-## for gaudi tools, services and objects
-use GaudiInterface GaudiInterface-* External
-use AthenaMonitoring AthenaMonitoring-* Control
-use AFP_RawEv AFP_RawEv-* ForwardDetectors/AFP
-use xAODForward xAODForward-* Event/xAOD
-private
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-use LWHists LWHists-* Tools
-# use AsgTools AsgTools-* Control/AthToolSupport
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-end_private
-
-
-## put here your package dependencies...
-
-##
-
-branches src src/components doc python share
-
-private
-## default is to make component library
-library AFP_Monitoring *.cxx components/*.cxx
-
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-end_private
-
-
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
index bb80b2b500ed637d6021f7e42ce88fe542b93652..846ee503dd4f1b506b0bb9aaf38af106e86b9839 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AFP_Monitoring/AFPHitsMonitorTool.h"
#include "AFP_Monitoring/AFPTechnicalMonitorTool.h"
-DECLARE_TOOL_FACTORY(AFPHitsMonitorTool)
-DECLARE_TOOL_FACTORY(AFPTechnicalMonitorTool)
+DECLARE_COMPONENT( AFPHitsMonitorTool )
+DECLARE_COMPONENT( AFPTechnicalMonitorTool )
-DECLARE_FACTORY_ENTRIES(AFP_Monitoring) {
- DECLARE_ALGTOOL(AFPHitsMonitorTool)
- DECLARE_ALGTOOL(AFPTechnicalMonitorTool)
-}
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx
deleted file mode 100644
index 2a70da3e08ade2b3295334803f32165d1e578158..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_Monitoring)
-
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/cmt/requirements b/ForwardDetectors/AFP/AFP_Raw2Digi/cmt/requirements
deleted file mode 100644
index a1d1f908db1704cc368194bd83d5e71f7da1aa68..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-## automatically generated CMT requirements file
-package AFP_Raw2Digi
-author nifomin
-
-## for athena policies: this has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-
-## for gaudi tools, services and objects
-
-## put here your package dependencies...
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AFP_DigiEv AFP_DigiEv-* ForwardDetectors/AFP
-use AFP_RawEv AFP_RawEv-* ForwardDetectors/AFP
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use xAODForward xAODForward-* Event/xAOD
-private
-use AthenaKernel AthenaKernel-* Control
-use AtlasROOT AtlasROOT-* External
-end_private
-##
-
-branches src src/components doc
-
-## default is to make component library. See: https://twiki.cern.ch/twiki/bin/view/Main/LearningAthena#Libraries_in_CMT for alternatives
-# library AFP_Raw2Digi *.cxx components/*.cxx
-
-apply_pattern dual_use_library files="*.cxx"
-
-##apply_pattern declare_joboptions files="*.py"
-##apply_pattern declare_python_modules files="*.py"
-
-
-
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
index 63e4326359f64bbf8dad4a9e24fdb5ce916a1aeb..28cbcaed20884333a7036058aac3977df4d45dee 100644
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
@@ -1,16 +1,6 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include <AFP_Raw2Digi/AFP_Raw2Digi.h>
#include "../AFP_Raw2DigiTool.h"
-DECLARE_ALGORITHM_FACTORY( AFP_Raw2Digi )
-DECLARE_TOOL_FACTORY( AFP_Raw2DigiTool )
+DECLARE_COMPONENT( AFP_Raw2Digi )
+DECLARE_COMPONENT( AFP_Raw2DigiTool )
-DECLARE_FACTORY_ENTRIES( AFP_Raw2Digi )
-{
- DECLARE_ALGORITHM( AFP_Raw2Digi );
-}
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx
deleted file mode 100644
index c9da80496922415152297d56ae604a1e5622ac22..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_Raw2Digi)
diff --git a/ForwardDetectors/AFP/AFP_RawEv/cmt/requirements b/ForwardDetectors/AFP/AFP_RawEv/cmt/requirements
deleted file mode 100644
index 3979c94ea17b820b30e5cdf561fbf3451162dc63..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_RawEv/cmt/requirements
+++ /dev/null
@@ -1,40 +0,0 @@
-## automatically generated CMT requirements file
-package AFP_RawEv
-author nifomin
-
-## for athena policies: this has to be the first use statement
-use AtlasPolicy AtlasPolicy-*
-
-## put here your package dependencies...
-
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-use HitManagement HitManagement-* Simulation
-use SGTools SGTools-* Control
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-
-
-##
-
-##branches src src/components doc python share
-
-## default is to make component library. See: https://twiki.cern.ch/twiki/bin/view/Main/LearningAthena#Libraries_in_CMT for alternatives
-library AFP_RawEv ../src/*.cxx
-apply_pattern installed_library
-
-apply_pattern lcgdict dict=AFP_RawEv selectionfile=selection.xml headerfiles="../AFP_RawEv/AFP_RawEvDict.h"
-
-##apply_pattern declare_joboptions files="*.py"
-##apply_pattern declare_python_modules files="*.py"
-
-private
-
-use GaudiInterface GaudiInterface-* External
-use EventContainers EventContainers-* Event
-use StoreGate StoreGate-* Control
-
-end_private
-
-
-
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/cmt/requirements b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/cmt/requirements
deleted file mode 100644
index 794e118f8ed9a03b889ca575e43da5cd8f69d8c1..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package AFP_LocRecoEv
-
-author Mateusz Dyndal <mateusz.dyndal@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-
-
-library AFP_LocRecoEv ../src/*.cxx
-
-
-apply_pattern installed_library
-
-
-private
-
-use GaudiInterface GaudiInterface-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=AFP_LocRecoEv selectionfile=selection.xml headerfiles="../AFP_LocRecoEv/AFP_LocRecoEvDict.h"
-
-end_private
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
index 28bb55fe5ab26f758395ad13092f2e0457bb6a68..75138fd962896ddc96aa2a93b2f1b0f8928ad2b9 100644
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
@@ -1,11 +1,6 @@
#include "AFP_LocRecoEv/AFP_SIDLocRecoEvent.h"
#include "AFP_LocRecoEv/AFP_TDLocRecoEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(AFP_SIDLocRecoEvent)
-DECLARE_ALGORITHM_FACTORY(AFP_TDLocRecoEvent)
+DECLARE_COMPONENT( AFP_SIDLocRecoEvent )
+DECLARE_COMPONENT( AFP_TDLocRecoEvent )
-DECLARE_FACTORY_ENTRIES(AFP_LocRecoEv) {
-DECLARE_ALGORITHM(AFP_SIDLocRecoEvent)
-DECLARE_ALGORITHM(AFP_TDLocRecoEvent)
-}
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx
deleted file mode 100644
index 77f9815568626480c3feb4d675e85705bb0e2a73..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_LocRecoEv)
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/cmt/requirements b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/cmt/requirements
deleted file mode 100644
index d359b76043712a659e6d60fbfbf4c6d1e56aef19..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/cmt/requirements
+++ /dev/null
@@ -1,46 +0,0 @@
-package AFP_LocReco
-
-author Mateusz Dyndal <mateusz.dyndal@cern.ch>
-
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-use AthenaKernel AthenaKernel-* Control
-use AtlasHepMC AtlasHepMC-* External
-use AtlasCLHEP AtlasCLHEP-* External
-use EventInfo EventInfo-* Event
-use GaudiInterface GaudiInterface-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use AtlasROOT AtlasROOT-* External
-use AtlasPolicy AtlasPolicy-*
-use StoreGate StoreGate-* Control
-use GeneratorObjects GeneratorObjects-* Generators
-
-use AFP_Geometry AFP_Geometry-* ForwardDetectors/AFP
-#use AFP_RawEv AFP_RawEv-* ForwardDetectors/AFP
-use AFP_LocRecoEv AFP_LocRecoEv-* ForwardDetectors/AFP/AFP_RecoEv
-use AFP_DigiEv AFP_DigiEv-* ForwardDetectors/AFP
-use AFP_EventTPCnv AFP_EventTPCnv-* ForwardDetectors/AFP/AFP_EventCnv
-use xAODForward xAODForward-* Event/xAOD
-
-library AFP_LocReco *.cxx components/*.cxx
-
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTTableLibs
-
-apply_pattern component_library
-apply_pattern declare_runtime files="-s=../share/mapping *.txt *.dat *.py"
-
-apply_pattern declare_joboptions files="*.py"
-
-private
-#use PathResolver PathResolver-* Tools
-use AthLinks AthLinks-* Control
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-
-end_private
-
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
index fd35ccf81e6cd7542feae97abf37b6791050c583..8bd17486b66bf6987b5f845f09965f8dbc475c43 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
@@ -1,11 +1,6 @@
#include "AFP_LocReco/AFP_TDLocReco.h"
#include "AFP_LocReco/AFP_SIDLocReco.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(AFP_TDLocReco)
-DECLARE_ALGORITHM_FACTORY(AFP_SIDLocReco)
+DECLARE_COMPONENT( AFP_TDLocReco )
+DECLARE_COMPONENT( AFP_SIDLocReco )
-DECLARE_FACTORY_ENTRIES(AFP_LocReco) {
- DECLARE_ALGORITHM (AFP_TDLocReco)
- DECLARE_ALGORITHM (AFP_SIDLocReco)
-}
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx
deleted file mode 100644
index a6bf7959e183121bf2d22c7b01d3031ad70787df..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_LocReco)
-
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
index 9f66a5151d97def0ed835021b6f35815ed9e9a32..f1963bfdcfa89ddce15ca97d6093b832b3118b66 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
@@ -1,17 +1,10 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AFPSiClusterTool.h"
#include "../AFPSiClusterSingleHitTool.h"
#include "../AFPSiRowColToLocalCSTool.h"
#include "../AFPSiClusterBasicNearestNeighbour.h"
-DECLARE_TOOL_FACTORY(AFPSiClusterTool)
-DECLARE_TOOL_FACTORY(AFPSiClusterSingleHitTool)
-DECLARE_TOOL_FACTORY(AFPSiRowColToLocalCSTool)
-DECLARE_TOOL_FACTORY(AFPSiClusterBasicNearestNeighbour)
+DECLARE_COMPONENT( AFPSiClusterTool )
+DECLARE_COMPONENT( AFPSiClusterSingleHitTool )
+DECLARE_COMPONENT( AFPSiRowColToLocalCSTool )
+DECLARE_COMPONENT( AFPSiClusterBasicNearestNeighbour )
-DECLARE_FACTORY_ENTRIES(AFP_SiClusterTools) {
-}
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx
deleted file mode 100644
index 4b08aade0332f039e0216687f627c6d8fb297bc4..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_SiClusterTools)
diff --git a/ForwardDetectors/AFP/AFP_SimEv/cmt/requirements b/ForwardDetectors/AFP/AFP_SimEv/cmt/requirements
deleted file mode 100644
index 22d7e78f8f20ba2403d92e7567eba47450424554..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_SimEv/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package AFP_SimEv
-
-author Libor Nozka <libor.nozka@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-#use DataModel DataModel-* Control
-#use Identifier Identifier-* DetectorDescription
-use HitManagement HitManagement-* Simulation
-
-library AFP_SimEv *.cxx
-
-apply_pattern installed_library
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=AFP_SimEv selectionfile=selection.xml headerfiles="../AFP_SimEv/AFP_SimEvDict.h"
-
-end_private
diff --git a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
index 2c4386e08172ffaea0d5c0dd2a6ea02f91974c4f..9bad587306e59f3d454dfbd74436135f4fb404ff 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
@@ -2,15 +2,9 @@
#include "AFP_SimEv/AFP_TDSimHit.h"
#include "AFP_SimEv/AFP_SIDSimHitCollection.h"
#include "AFP_SimEv/AFP_SIDSimHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(AFP_TDSimHit)
-DECLARE_ALGORITHM_FACTORY(AFP_TDSimHitCollection)
-DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHit)
-DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHitCollection)
+DECLARE_COMPONENT( AFP_TDSimHit )
+DECLARE_COMPONENT( AFP_TDSimHitCollection )
+DECLARE_COMPONENT( AFP_SIDSimHit )
+DECLARE_COMPONENT( AFP_SIDSimHitCollection )
-DECLARE_FACTORY_ENTRIES(AFP_SimEv) {
- DECLARE_ALGORITHM(AFP_SIDSimHit)
- DECLARE_ALGORITHM(AFP_SIDSimHitCollection)
-}
-
\ No newline at end of file
diff --git a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx
deleted file mode 100644
index 6d7f76fb429f151f426304faea721f8d57d4ede7..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_SimEv)
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/cmt/requirements b/ForwardDetectors/ALFA/ALFA_BeamTransport/cmt/requirements
deleted file mode 100644
index 2c5ce279bd609f9dbc49c5e1c9fd969a25d2e71d..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/cmt/requirements
+++ /dev/null
@@ -1,40 +0,0 @@
-package ALFA_BeamTransport
-
-author Daniel Pelikan
-
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasHepMC AtlasHepMC-* External
-
-use FPTracker FPTracker-* ForwardDetectors
-use AtlasBoost AtlasBoost-* External
-#use TwissFiles TwissFiles-* External/FWDet
-
-private
-
-use StoreGate StoreGate-* Control
-use EventInfo EventInfo-* Event
-#use AtlasCLHEP AtlasCLHEP-* External
-#use AtlasHepMCAnalysis AtlasHepMCAnalysis-* External
-use GeneratorObjects GeneratorObjects-* Generators
-
-
-
-macro ALFA_BeamTransport_linkopts " -lFPTracker"
-
-public
-
-
-
-library ALFA_BeamTransport *.cxx components/*.cxx
-apply_pattern component_library
-
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_joboptions files="*.py"
-
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
index 04ad492f1a3efe0d8a716a10167739bc7cd01d4c..d332df6e4584fb51921b88e1c0a8dd52c736ec9a 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
@@ -1,22 +1,6 @@
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//#include "GaudiKernel/ITHistSvc.h"
-
#include "ALFA_BeamTransport/ALFA_BeamTransport.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_BeamTransport )
+DECLARE_COMPONENT( ALFA_BeamTransport )
+
+//DECLARE_COMPONENT( THistSvc )
-DECLARE_FACTORY_ENTRIES( ALFA_BeamTransport ) {
- DECLARE_ALGORITHM( ALFA_BeamTransport )
-}
-//DECLARE_ALGORITHM_FACTORY( THistSvc )
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx
deleted file mode 100644
index 55c83023c471a76125285d4f392326de7d6b6bec..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-//Notes:
-//
-//1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
-// component library (libXXX.so).
-//
-// See Athena User Guide for more information
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-//#include "GaudiKernel/ITHistSvc.h"
-
-LOAD_FACTORY_ENTRIES( ALFA_BeamTransport )
-
- //LOAD_FACTORY_ENTRIES( THistSvc )
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/cmt/requirements b/ForwardDetectors/ALFA/ALFA_CLinkAlg/cmt/requirements
deleted file mode 100644
index 7e460e4263fa77b3f06bc3420a8fd740ce83074d..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/cmt/requirements
+++ /dev/null
@@ -1,46 +0,0 @@
-package ALFA_CLinkAlg
-
-author Libor Nozka <libor.nozka@cern.ch>
-author Petr Hamal <petr.hamal@cern.ch>
-
-branches run
-
-use GaudiInterface GaudiInterface-* External
-use AtlasPolicy AtlasPolicy-*
-use StoreGate StoreGate-* Control
-#use AtlasAnalysisRunTime AtlasAnalysisRunTime-*
-
-#use AtlasCLHEP AtlasCLHEP-* External
-#use AtlasROOT AtlasROOT-* External
-#use CBNT_Utils CBNT_Utils-* Reconstruction
-#use GeneratorObjects GeneratorObjects-* Generators
-#use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-public
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use AthLinks AthLinks-* Control
-use xAODForward xAODForward-* Event/xAOD
-end_public
-
-private
-use EventInfo EventInfo-* Event
-end_private
-
-use ALFA_CLinkEv ALFA_CLinkEv-* ForwardDetectors/ALFA
-
-library ALFA_CLinkAlg *.cxx components/*.cxx
-
-#apply_tag ROOTBasicLibs
-#apply_tag ROOTMathLibs
-#apply_tag ROOTSTLDictLibs
-#apply_tag ROOTGraphicsLibs
-#apply_tag ROOTTableLibs
-
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py *.C *.sh"
-
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
index 7a15b6af95c509db6c7681ff4cca5c0923b6c4ea..47042fc4a3c203696ac79e1dd63e9ed2938aa947 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_CLinkAlg/ALFA_CLinkAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_CLinkAlg)
+DECLARE_COMPONENT( ALFA_CLinkAlg )
-DECLARE_FACTORY_ENTRIES(ALFA_CLinkAlg) {
- DECLARE_ALGORITHM (ALFA_CLinkAlg)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx
deleted file mode 100644
index acf4fe98c84e4579b24e2785f2cfd6475b9c649b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_CLinkAlg)
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_CLinkEv/cmt/requirements
deleted file mode 100644
index f0c4987d547944dd8a2869b87436e5bd6fb84b30..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/cmt/requirements
+++ /dev/null
@@ -1,32 +0,0 @@
-package ALFA_CLinkEv
-
-author Libor Nozka <libor.nozka@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use AthLinks AthLinks-* Control
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-#use Identifier Identifier-* DetectorDescription
-#use EventContainers EventContainers-* Event
-
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_LocRecCorrEv ALFA_LocRecCorrEv-* ForwardDetectors/ALFA/ALFA_RecEv
-#use ALFA_GloRecEv ALFA_GloRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-
-library ALFA_CLinkEv ../src/*.cxx
-
-
-apply_pattern installed_library
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=ALFA_CLinkEv selectionfile=selection.xml headerfiles="../ALFA_CLinkEv/ALFA_CLinkEvDict.h"
-end_private
-
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
index 3df686209d78686dc1a4828bc79e2eeb2213a6ac..e648747465001573f9d8a7520db36409c3ae6403 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_CLinkEv/ALFA_CLinkEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_CLinkEvent)
+DECLARE_COMPONENT( ALFA_CLinkEvent )
-DECLARE_FACTORY_ENTRIES(ALFA_CLinkEv) {
- DECLARE_ALGORITHM(ALFA_CLinkEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx
deleted file mode 100644
index 8c8c268d5f6b4b6c5d522913178703d65285c4f5..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_CLinkEv)
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/cmt/install.history b/ForwardDetectors/ALFA/ALFA_Digitization/cmt/install.history
deleted file mode 100644
index 6c25e57429f429df7a7dc9d46a7505b4b5a9ec9d..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Digitization/cmt/install.history
+++ /dev/null
@@ -1,27 +0,0 @@
-(i__main__
-LogFile
-p0
-(dp1
-S'_installed_files'
-p2
-(dp3
-S'../../../../../atlas/15.3.0/GAUDI/v20r4p3/GaudiPolicy/cmt/fragments/__init__.py'
-p4
-S'../../../../InstallArea/python/ALFA_Digitization/__init__.py'
-p5
-sS'../../ForwardDetectors/ALFA/ALFA_Digitization/genConf/ALFA_Digitization'
-p6
-(dp7
-S'../../../ForwardDetectors/ALFA/ALFA_Digitization/genConf/ALFA_Digitization/ALFA_DigitizationConf.py'
-p8
-S'../../../../InstallArea/python/ALFA_Digitization/ALFA_DigitizationConf.py'
-p9
-sS'../../../ForwardDetectors/ALFA/ALFA_Digitization/genConf/ALFA_Digitization/ALFA_Digitization_confDb.py'
-p10
-S'../../../../InstallArea/python/ALFA_Digitization/ALFA_Digitization_confDb.py'
-p11
-ssS'../../../ForwardDetectors/ALFA/ALFA_Digitization/i686-slc4-gcc34-opt/libALFA_Digitization.so'
-p12
-S'../../../../InstallArea/i686-slc4-gcc34-opt/lib/libALFA_Digitization.so'
-p13
-ssb.
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/cmt/requirements b/ForwardDetectors/ALFA/ALFA_Digitization/cmt/requirements
deleted file mode 100644
index e05d6eac67d7b6383367358854ca60342babc5e3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Digitization/cmt/requirements
+++ /dev/null
@@ -1,42 +0,0 @@
-package ALFA_Digitization
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-branches run
-
-use GaudiInterface GaudiInterface-* External
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use HitManagement HitManagement-* Simulation
-use EventInfo EventInfo-* Event
-
-use PileUpTools PileUpTools-* Control
-# use xAODEventInfo xAODEventInfo-* Event/xAOD
-
-use ALFA_SimEv ALFA_SimEv-* ForwardDetectors/ALFA
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-
-library ALFA_Digitization *.cxx components/*.cxx
-
-#apply_tag ROOTBasicLibs
-#apply_tag ROOTMathLibs
-#apply_tag ROOTSTLDictLibs
-#apply_tag ROOTGraphicsLibs
-#apply_tag ROOTTableLibs
-
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py *.C *.sh"
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_runtime files="-s=../xtalk *.txt *.dat *.py"
-
-private
-use GeneratorObjects GeneratorObjects-* Generators
-use AtlasCLHEP_RandomGenerators AtlasCLHEP_RandomGenerators-* Simulation/Tools
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasHepMC AtlasHepMC-* External
-use AtlasROOT AtlasROOT-* External
-use Identifier Identifier-* DetectorDescription
-use PathResolver PathResolver-* Tools
-
-end_private
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
old mode 100755
new mode 100644
index f5ea6e646766809879620e93b4c9906ad1b56e68..6f7c2cf8cd1284cad40bc53002dae8645d88f9e8
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
@@ -1,13 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ALFA_Digitization/ALFA_DigiAlg.h"
#include "ALFA_Digitization/ALFA_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_DigiAlg)
-DECLARE_TOOL_FACTORY(ALFA_PileUpTool)
+DECLARE_COMPONENT( ALFA_DigiAlg )
+DECLARE_COMPONENT( ALFA_PileUpTool )
-DECLARE_FACTORY_ENTRIES(ALFA_Digitization)
-{
- DECLARE_ALGORITHM(ALFA_DigiAlg)
- DECLARE_TOOL(ALFA_PileUpTool)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx
deleted file mode 100755
index 1629dfcbc85c4ceebb5fdaa21ea69a0d7bcec691..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Digitization)
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/cmt/requirements b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/cmt/requirements
deleted file mode 100644
index 4aa2598a31c241bdb4740867d68849fcca63171c..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,42 +0,0 @@
-package ALFA_EventAthenaPool
-
-author Tom Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-#use DataModel DataModel-* Control
-#use CLIDSvc CLIDSvc-* Control
-#use AtlasReflex AtlasReflex-* External
-
-
-
-# Converters for the rdo containers and hit collections
-apply_pattern poolcnv files=" -s=${ALFA_SimEv_root}/ALFA_SimEv ALFA_HitCollection.h ALFA_ODHitCollection.h \
- -s=${ALFA_RawEv_root}/ALFA_RawEv ALFA_DigitCollection.h ALFA_ODDigitCollection.h ALFA_RawDataContainer.h \
- -s=${ALFA_LocRecEv_root}/ALFA_LocRecEv ALFA_LocRecEvCollection.h ALFA_LocRecODEvCollection.h \
- -s=${ALFA_LocRecCorrEv_root}/ALFA_LocRecCorrEv ALFA_LocRecCorrEvCollection.h ALFA_LocRecCorrODEvCollection.h \
- -s=${ALFA_GloRecEv_root}/ALFA_GloRecEv ALFA_GloRecEvCollection.h \
- -s=${ALFA_CLinkEv_root}/ALFA_CLinkEv ALFA_CLinkEvent.h"
-
-macro_append ALFA_EventAthenaPoolPoolCnv_shlibflags "$(ALFA_EventAthenaPool_dict_linkopts)"
-
-
-private
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-
-use ALFA_SimEv ALFA_SimEv-* ForwardDetectors/ALFA
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use ALFA_CLinkEv ALFA_CLinkEv-* ForwardDetectors/ALFA
-use ALFA_EventTPCnv ALFA_EventTPCnv-* ForwardDetectors/ALFA/ALFA_EventCnv
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_LocRecCorrEv ALFA_LocRecCorrEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_GloRecEv ALFA_GloRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-
-end_private
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/cmt/version.cmt b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/cmt/version.cmt
deleted file mode 100644
index 8d06fa9aeeba7ebcf2c665b0417e92c2d0c7794b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-ALFA_EventAthenaPool-00-00-08
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
index 4ed8e5907603b58db2e1101b00676549239c0dbd..d476d4bd98e0a8a477443cee78d9b342508cb86a 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
@@ -9,29 +9,14 @@
#include "src/ALFA_GloRecEvCollectionCnv.h"
#include "src/ALFA_CLinkEventCnv.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv_charge )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_GloRecEvCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_CLinkEventCnv )
-
-DECLARE_FACTORY_ENTRIES(ALFA_EventAthenaPool) {
-
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODDigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_charge )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_GloRecEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_CLinkEventCnv )
-
-}
+DECLARE_COMPONENT( ALFA_HitCollectionCnv )
+DECLARE_COMPONENT( ALFA_DigitCollectionCnv )
+DECLARE_COMPONENT( ALFA_ODHitCollectionCnv )
+DECLARE_COMPONENT( ALFA_ODDigitCollectionCnv )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv_charge )
+DECLARE_COMPONENT( ALFA_LocRecEvCollectionCnv )
+DECLARE_COMPONENT( ALFA_LocRecODEvCollectionCnv )
+DECLARE_COMPONENT( ALFA_GloRecEvCollectionCnv )
+DECLARE_COMPONENT( ALFA_CLinkEventCnv )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx
deleted file mode 100644
index fdc94c2adb57409c7bb2c67938adfdddfd9537ee..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_EventAthenaPool)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
index 3d240cc0117e4c8ccb513d705fe226c2344d3d1d..a2e0a787c1c416b7e2d047c87a2b37cd18ee8a4f 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
@@ -2,15 +2,7 @@
#include "src/ALFA_DigitCollectionCnv.h"
#include "src/ALFA_ODHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv )
-
-DECLARE_FACTORY_ENTRIES(ALFA_EventAthenaPool) {
-
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv )
-
-}
+DECLARE_COMPONENT( ALFA_HitCollectionCnv )
+DECLARE_COMPONENT( ALFA_DigitCollectionCnv )
+DECLARE_COMPONENT( ALFA_ODHitCollectionCnv )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx
deleted file mode 100644
index f9af3d78cf4a2e1a4aa0fc9fb557a25ef1f00088..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_SimEvEventAthenaPool)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/cmt/requirements
deleted file mode 100644
index 4d3894ef50620bf97fefe42d147a00d908772c14..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/cmt/requirements
+++ /dev/null
@@ -1,71 +0,0 @@
-package ALFA_EventTPCnv
-
-author Tom Sykora <Tomas.Sykora@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-#use AtlasCLHEP AtlasCLHEP-* External
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use DataModelAthenaPool DataModelAthenaPool-* Control
-
-
-use ALFA_SimEv ALFA_SimEv-* ForwardDetectors/ALFA
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_LocRecCorrEv ALFA_LocRecCorrEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_GloRecEv ALFA_GloRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_CLinkEv ALFA_CLinkEv-* ForwardDetectors/ALFA
-
-
-# The following use is to get the lcgdict pattern.
-# This is "hidden" behind "private" and "no_auto_imports" to keep
-# clients of EventInfo from seeing excess dependencies
-# private
-use AtlasReflex AtlasReflex-* External
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See EventInfoDict
-apply_pattern lcgdict dict=ALFA_EventTPCnv selectionfile=selection.xml headerfiles="../ALFA_EventTPCnv/ALFA_EventTPCnvDict.h"
-
-# end_private
-
-private
-use CxxUtils CxxUtils-* Control
-use Identifier Identifier-* DetectorDescription
-use GaudiInterface GaudiInterface-* External
-end_private
-
-
-library ALFA_EventTPCnv *.cxx
-apply_pattern installed_library
-
-
-private
-use TestTools TestTools-* AtlasTest
-
-apply_pattern UnitTest_run unit_test=ALFA_CLinkEventCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_DigitCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_DigitCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_ODDigitCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_ODDigitCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_GloRecEventCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_GloRecEvCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_HitCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_HitCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_ODHitCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_ODHitCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecCorrEventCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecCorrEvCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecCorrODEventCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecCorrODEvCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecEventCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecEvCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecODEventCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_LocRecODEvCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_RawDataCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_RawDataCnv_charge_p1
-apply_pattern UnitTest_run unit_test=ALFA_RawDataCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_RawDataCollectionCnv_charge_p1
-apply_pattern UnitTest_run unit_test=ALFA_RawDataContainerCnv_p1
-apply_pattern UnitTest_run unit_test=ALFA_RawDataContainerCnv_charge_p1
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/cmt/version.cmt b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/cmt/version.cmt
deleted file mode 100644
index 135fffe76d583a0f8638d5e7158707735889d8af..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-ALFA_EventTPCnv-00-00-21
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
index 40cba7e8e6e9ff78f6f81d87378823b548e1de18..9e40ec94b3147dc49d8d01754a1b4f5add2a2970 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
@@ -54,120 +54,58 @@
#include "ALFA_EventTPCnv/ALFA_LocRecCorrODEvCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-DECLARE_ALGORITHM_FACTORY( ALFA_Hit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_Digit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigit_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_ODDigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_RawData_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollectionCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainer_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_RawData_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCnv_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollection_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataCollectionCnv_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainer_charge_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataContainerCnv_charge_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvent_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEventCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollectionCnv_p1 )
-
-
-
-DECLARE_FACTORY_ENTRIES(ALFA_EventTPCnv) {
-
-DECLARE_ALGORITHM( ALFA_Hit_p1 )
-DECLARE_ALGORITHM( ALFA_HitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_HitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_Digit_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_ODHit_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_ODDigit_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_RawData_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCnv_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollection_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollectionCnv_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainer_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_RawData_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCnv_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollection_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollectionCnv_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainer_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_charge_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecODEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvCollectionCnv_p1 )
-
-
-}
+
+DECLARE_COMPONENT( ALFA_Hit_p1 )
+DECLARE_COMPONENT( ALFA_HitCnv_p1 )
+DECLARE_COMPONENT( ALFA_HitCollection_p1 )
+DECLARE_COMPONENT( ALFA_HitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_Digit_p1 )
+DECLARE_COMPONENT( ALFA_DigitCnv_p1 )
+DECLARE_COMPONENT( ALFA_DigitCollection_p1 )
+DECLARE_COMPONENT( ALFA_DigitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_ODHit_p1 )
+DECLARE_COMPONENT( ALFA_ODHitCnv_p1 )
+DECLARE_COMPONENT( ALFA_ODHitCollection_p1 )
+DECLARE_COMPONENT( ALFA_ODHitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_ODDigit_p1 )
+DECLARE_COMPONENT( ALFA_ODDigitCnv_p1 )
+DECLARE_COMPONENT( ALFA_ODDigitCollection_p1 )
+DECLARE_COMPONENT( ALFA_ODDigitCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_RawData_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCnv_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollection_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollectionCnv_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainer_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_RawData_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCnv_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollection_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataCollectionCnv_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainer_charge_p1 )
+DECLARE_COMPONENT( ALFA_RawDataContainerCnv_charge_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecODEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecODEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecODEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecODEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecCorrEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrEvCollectionCnv_p1 )
+
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvent_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEventCnv_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvCollection_p1 )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvCollectionCnv_p1 )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx
deleted file mode 100644
index 0ff21e2e9377d0349b90236458dadd78553e8480..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_EventTPCnv)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/cmt/requirements
deleted file mode 100644
index 4c8911df051b764a1a6e62222a2d4fbe17b793e6..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package ALFA_RawDataByteStreamCnv
-
-author Sara Diglio <Sara.Diglio@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use DataCollection DataCollection-* External
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use AthenaBaseComps AthenaBaseComps-* Control
-use ByteStreamCnvSvcBase ByteStreamCnvSvcBase-* Event
-use DataModel DataModel-* Control
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use ByteStreamData ByteStreamData-* Event
-private
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-end_private
-
-branches src src/components run
-
-library ALFA_RawDataByteStreamCnv *.cxx -s=components *.cxx
-apply_pattern component_library
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
index dce43fadc3cc22369c158d3ae6cf811da6440cf9..5bf6aae75ad30579ca67614b8cefcdca986dc4e2 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
@@ -1,30 +1,18 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProvider.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataProvider)
+DECLARE_COMPONENT( ALFA_RawDataProvider )
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProvider_charge.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_RawDataProvider_charge)
+DECLARE_COMPONENT( ALFA_RawDataProvider_charge )
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool.h"
-DECLARE_TOOL_FACTORY( ALFA_RawDataProviderTool)
+DECLARE_COMPONENT( ALFA_RawDataProviderTool )
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProviderTool_charge.h"
-DECLARE_TOOL_FACTORY( ALFA_RawDataProviderTool_charge)
+DECLARE_COMPONENT( ALFA_RawDataProviderTool_charge )
#include "ALFA_RawDataByteStreamCnv/ALFA_Decoder.h"
-DECLARE_TOOL_FACTORY( ALFA_Decoder )
+DECLARE_COMPONENT( ALFA_Decoder )
#include "ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h"
-DECLARE_TOOL_FACTORY( ALFA_Decoder_charge )
-
-DECLARE_FACTORY_ENTRIES( ALFA_RawDataByteStreamCnv ) {
-DECLARE_ALGORITHM ( ALFA_RawDataProvider )
-DECLARE_ALGORITHM ( ALFA_RawDataProvider_charge )
-DECLARE_TOOL ( ALFA_RawDataProviderTool )
-DECLARE_TOOL ( ALFA_RawDataProviderTool_charge )
-DECLARE_TOOL ( ALFA_Decoder )
-DECLARE_TOOL ( ALFA_Decoder_charge )
-}
-
+DECLARE_COMPONENT( ALFA_Decoder_charge )
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index fa54d7913b2004889555a0617f941c7b3c7b4d71..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_RawDataByteStreamCnv)
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/cmt/requirements b/ForwardDetectors/ALFA/ALFA_G4_SD/cmt/requirements
deleted file mode 100644
index c14675908a4a63641e8146aae90e3a3da13de38c..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package ALFA_G4_SD
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use ALFA_SimEv ALFA_SimEv-* ForwardDetectors/ALFA
-use AtlasDoxygen AtlasDoxygen-* Tools
-use CxxUtils CxxUtils-* Control
-use Geant4 Geant4-* External
-use G4AtlasTools G4AtlasTools-* Simulation/G4Atlas
-use StoreGate StoreGate-* Control
-end_private
-
-apply_pattern declare_python_modules files="*.py"
-
-# define link options
-apply_pattern component_library
-library ALFA_G4_SD *.cxx -s=components *.cxx
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
index 43477b1253241fd18080fbdaef2115de6cf5c12b..1742e18564178cda1cb3449e35b0c8a9cde5c59e 100644
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
#include "../ALFA_SensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY(ALFA_SensitiveDetectorTool)
-
-DECLARE_FACTORY_ENTRIES(ALFA_G4_SD) {
- DECLARE_TOOL(ALFA_SensitiveDetectorTool);
-}
+DECLARE_COMPONENT( ALFA_SensitiveDetectorTool )
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx
deleted file mode 100644
index 7046e6766e2d5756f4c235639c1e868073934f8b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_G4_SD)
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
old mode 100755
new mode 100644
index 103c3d42fcc34008d32630b54e83fd7227c47d7b..aebb7566d2ca392d23190eabfd7d2a04d42852a5
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../ALFA_DetectorTool.h"
-DECLARE_TOOL_FACTORY(ALFA_DetectorTool)
+DECLARE_COMPONENT( ALFA_DetectorTool )
+
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/cmt/requirements b/ForwardDetectors/ALFA/ALFA_Geometry/cmt/requirements
deleted file mode 100644
index e0a4bd3f8e9b97fb484ca9f036c3cb1d92bc82ef..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Geometry/cmt/requirements
+++ /dev/null
@@ -1,32 +0,0 @@
-package ALFA_Geometry
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-#use GeoModelSvc GeoModelSvc-* DetectorDescription/GeoModel
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-use RDBAccessSvc RDBAccessSvc-* Database/AthenaPOOL
-use CLIDSvc CLIDSvc-* Control
-
-library ALFA_Geometry ../src/*.cxx
-
-apply_pattern installed_library
-apply_pattern declare_runtime files="-s=../share/metrology *.txt *.dat *.py"
-
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
-
-private
-use StoreGate StoreGate-* Control
-use PathResolver PathResolver-* Tools
-#use AtlasReflex AtlasReflex-00-* External -no_auto_imports
-#apply_pattern lcgdict dict=ALFA_Geometry selectionfile=selection.xml headerfiles="../ALFA_Geometry/ALFA_GeometryDict.h"
-end_private
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
index 5f763a8a3c1819791ab9ece03d0074576ff077cf..d4120c26852e77436e7c6f742db200c913965a80 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_Geometry/ALFA_GeometryReader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY(ALFA_GeometryReader)
+DECLARE_COMPONENT( ALFA_GeometryReader )
-DECLARE_FACTORY_ENTRIES(ALFA_Geometry) {
- DECLARE_ALGORITHM(ALFA_GeometryReader)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx
deleted file mode 100644
index 1309eca148e78c8f94e31a2ed841d1bd735829e4..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Geometry)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/cmt/requirements b/ForwardDetectors/ALFA/ALFA_Ntuple/cmt/requirements
deleted file mode 100644
index 790afa3b6bf0744fa6bda77cf00e8e9f17569c40..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/cmt/requirements
+++ /dev/null
@@ -1,45 +0,0 @@
-package ALFA_Ntuple
-
-author Petr Hamal <petr.hamal@cern.ch>
-
-use EventInfo EventInfo-* Event
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasPolicy AtlasPolicy-*
-use StoreGate StoreGate-* Control
-use GeneratorObjects GeneratorObjects-* Generators
-use AthenaKernel AthenaKernel-* Control
-
-use AthenaBaseComps AthenaBaseComps-* Control
-
-#For reading file/DB metadata:
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-#use AtlasCORAL AtlasCORAL-* External
-
-use ALFA_Geometry ALFA_Geometry-* ForwardDetectors/ALFA
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use ALFA_LocRec ALFA_LocRec-* ForwardDetectors/ALFA/ALFA_Reconstruction
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_LocRecCorrEv ALFA_LocRecCorrEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_GloRecEv ALFA_GloRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-
-library ALFA_Ntuple *.cxx components/*.cxx
-
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTTableLibs
-
-apply_pattern component_library
-
-#apply_pattern declare_joboptions files="*.py *.C *.sh"
-
-#apply_pattern declare_runtime_extras extras="*.dat"
-apply_pattern component_library
-apply_pattern declare_runtime files="-s=../share/mapping *.txt *.dat *.py"
-
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
index 9c5819c5316907843c0f38843b005f083048ac89..fa7d1a68aabea890e8c07bd8af414d2d67db9cad 100644
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
@@ -1,10 +1,5 @@
#include "ALFA_Ntuple/ALFA_Ntuple.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( ALFA_Ntuple )
-
-DECLARE_FACTORY_ENTRIES( ALFA_Ntuple ) {
- DECLARE_ALGORITHM( ALFA_Ntuple )
-}
+DECLARE_COMPONENT( ALFA_Ntuple )
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx
deleted file mode 100644
index 55ecb3c7c48f75307e228bea907b4964f47b6771..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_Ntuple)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/cmt/requirements b/ForwardDetectors/ALFA/ALFA_Raw2Digit/cmt/requirements
deleted file mode 100644
index 2d11a9423a968943d17d4231d20789ce159724c3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package ALFA_Raw2Digit
-author Tom Sykora
-# tomas.sykora@cern.ch
-
-private
-use AtlasBoost AtlasBoost-* External
-use PathResolver PathResolver-* Tools
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-#use StoreGate StoreGate-* Control
-
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-#use ALFA_RawDataByteStreamCnv ALFA_RawDataByteStreamCnv-* ForwardDetectors/ALFA/ALFA_EventCnv
-
-library ALFA_Raw2Digit *.cxx -s=components *.cxx
-
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTTableLibs
-
-apply_pattern component_library
-apply_pattern declare_runtime files="-s=../mapping *.txt *.dat *.py"
-
-#apply_pattern declare_joboptions files="MyJobOptions.py"
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
old mode 100755
new mode 100644
index 1765499771369a9a757aa9f192360784bda96a29..fa852077de00054180bcd0cda1dd83c398bfba33
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_Raw2Digit/ALFA_Raw2Digit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_Raw2Digit)
+DECLARE_COMPONENT( ALFA_Raw2Digit )
-DECLARE_FACTORY_ENTRIES(ALFA_Raw2Digit) {
-DECLARE_ALGORITHM(ALFA_Raw2Digit)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx
deleted file mode 100755
index 2dd027214073555712a75b182cf5b9f31e0f96c6..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Raw2Digit)
-
diff --git a/ForwardDetectors/ALFA/ALFA_RawEv/cmt/install.history b/ForwardDetectors/ALFA/ALFA_RawEv/cmt/install.history
deleted file mode 100644
index 805944cafb2e0ddff82fc53a42864426193438ae..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RawEv/cmt/install.history
+++ /dev/null
@@ -1,56 +0,0 @@
-(i__main__
-LogFile
-p0
-(dp1
-S'_installed_files'
-p2
-(dp3
-S'../../../MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-opt/libALFA_RawEvDict.so'
-p4
-S'../../../../../InstallArea/i686-slc5-gcc43-opt/lib/libALFA_RawEvDict.so'
-p5
-sS'../../../ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEv.so'
-p6
-S'../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEv.so'
-p7
-sS'../../../16.0.3/MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEvDict.so'
-p8
-S'../../../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEvDict.so'
-p9
-sS'../../../MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEvDict.so'
-p10
-S'../../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEvDict.so'
-p11
-sS'../../../MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-opt/libALFA_RawEv.so'
-p12
-S'../../../../../InstallArea/i686-slc5-gcc43-opt/lib/libALFA_RawEv.so'
-p13
-sS'../../../../MyTestDir3/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEv.so'
-p14
-S'../../../../../MyTestDir/InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEv.so'
-p15
-sS'../../../testarea/16.0.3/MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEvDict.so'
-p16
-S'../../../../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEvDict.so'
-p17
-sS'../../../16.0.3/MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEv.so'
-p18
-S'../../../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEv.so'
-p19
-sS'../../../testarea/16.0.3/MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEv.so'
-p20
-S'../../../../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEv.so'
-p21
-sS'../../../../MyTestDir3/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEvDict.so'
-p22
-S'../../../../../MyTestDir/InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEvDict.so'
-p23
-sS'../../../MyTestDir/ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEv.so'
-p24
-S'../../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEv.so'
-p25
-sS'../../../ForwardDetectors/ALFA/ALFA_RawEv/i686-slc5-gcc43-dbg/libALFA_RawEvDict.so'
-p26
-S'../../../../InstallArea/i686-slc5-gcc43-dbg/lib/libALFA_RawEvDict.so'
-p27
-ssb.
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_RawEv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_RawEv/cmt/requirements
deleted file mode 100644
index 5a1c60c96d077f49c288af4c1ae3a7ba52fb9247..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RawEv/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package ALFA_RawEv
-
-author Tomas Sykora <tomas.sykora@cern.ch>, Sara Diglio <Sara.Diglio@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-
-use HitManagement HitManagement-* Simulation
-
-use SGTools SGTools-* Control
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-library ALFA_RawEv ../src/*.cxx
-
-apply_pattern installed_library
-
-apply_pattern lcgdict dict=ALFA_RawEv selectionfile=selection.xml headerfiles="../ALFA_RawEv/ALFA_RawEvDict.h"
-
-
-private
-
-
-use GaudiInterface GaudiInterface-* External
-use EventContainers EventContainers-* Event
-use StoreGate StoreGate-* Control
-
-end_private
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/cmt/requirements
deleted file mode 100644
index 48049cddee5a9c903c0d88ea45a8ef4a194bdc96..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package ALFA_GloRecEv
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-# use Identifier Identifier-* DetectorDescription
-# use EventContainers EventContainers-* Event
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_LocRecCorrEv ALFA_LocRecCorrEv-* ForwardDetectors/ALFA/ALFA_RecEv
-
-#library ALFA_LocRecEv ../src/*.cxx
-#library ALFA_LocRecCorrEv ../src/*.cxx
-library ALFA_GloRecEv ../src/*.cxx
-
-apply_pattern installed_library
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use GaudiInterface GaudiInterface-* External
-
-#apply_pattern lcgdict dict=ALFA_LocRecEv selectionfile=selection.xml headerfiles="../ALFA_LocRecEv/ALFA_LocRecEvDict.h"
-apply_pattern lcgdict dict=ALFA_GloRecEv selectionfile=selection.xml headerfiles="../ALFA_GloRecEv/ALFA_GloRecEvDict.h"
-
-end_private
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
index 078b0b60548c2cfc17b7318ea4bb26f07e7b893c..45d6128585a31ad2f3d5de43471167bed70054d5 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_GloRecEv/ALFA_GloRecEvent.h"
#include "ALFA_GloRecEv/ALFA_GloRecODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_GloRecEvent)
-DECLARE_ALGORITHM_FACTORY(ALFA_GloRecODEvent)
+DECLARE_COMPONENT( ALFA_GloRecEvent )
+DECLARE_COMPONENT( ALFA_GloRecODEvent )
-DECLARE_FACTORY_ENTRIES(ALFA_GloRecEv) {
-DECLARE_ALGORITHM(ALFA_GloRecEvent)
-DECLARE_ALGORITHM(ALFA_GloRecODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx
deleted file mode 100644
index 1a3ad1820cfeb9b737df07d2668300837744de16..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_GloRecEv)
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/cmt/requirements
deleted file mode 100644
index c02f09de8193854952a32c30fb90133c688cb1ab..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package ALFA_LocRecCorrEv
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-#use Identifier Identifier-* DetectorDescription
-#use EventContainers EventContainers-* Event
-
-
-library ALFA_LocRecCorrEv ../src/*.cxx
-
-
-apply_pattern installed_library
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use GaudiInterface GaudiInterface-* External
-
-apply_pattern lcgdict dict=ALFA_LocRecCorrEv selectionfile=selection.xml headerfiles="../ALFA_LocRecCorrEv/ALFA_LocRecCorrEvDict.h"
-
-end_private
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
index 7ba7b3edbc691735c3334f6881dea243419d9ed7..7d8ac9afc50e68f27d3a00ca6cc1d813dd97f7c4 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrEvent.h"
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrEvent)
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrODEvent)
+DECLARE_COMPONENT( ALFA_LocRecCorrEvent )
+DECLARE_COMPONENT( ALFA_LocRecCorrODEvent )
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecCorrEv) {
-DECLARE_ALGORITHM(ALFA_LocRecCorrEvent)
-DECLARE_ALGORITHM(ALFA_LocRecCorrODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx
deleted file mode 100644
index 6aceb3a4446a1c2170c9a2b98d93ffeeb57af13a..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecCorrEv)
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/cmt/install.history b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/cmt/install.history
deleted file mode 100644
index 76fc7312e0759cc95f7d440a5fb921c2e151ff17..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/cmt/install.history
+++ /dev/null
@@ -1,16 +0,0 @@
-(i__main__
-LogFile
-p0
-(dp1
-S'_installed_files'
-p2
-(dp3
-S'../../../ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/i686-slc4-gcc34-opt/libALFA_LocRecEv.so'
-p4
-S'../../../../../InstallArea/i686-slc4-gcc34-opt/lib/libALFA_LocRecEv.so'
-p5
-sS'../../../ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/i686-slc4-gcc34-opt/libALFA_LocRecEvDict.so'
-p6
-S'../../../../../InstallArea/i686-slc4-gcc34-opt/lib/libALFA_LocRecEvDict.so'
-p7
-ssb.
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/cmt/requirements
deleted file mode 100644
index a792df08ecf609385e124fca2edbb80a5bc32ba3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package ALFA_LocRecEv
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-# use Identifier Identifier-* DetectorDescription
-# use EventContainers EventContainers-* Event
-
-
-library ALFA_LocRecEv ../src/*.cxx
-
-
-apply_pattern installed_library
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use GaudiInterface GaudiInterface-* External
-
-apply_pattern lcgdict dict=ALFA_LocRecEv selectionfile=selection.xml headerfiles="../ALFA_LocRecEv/ALFA_LocRecEvDict.h"
-
-end_private
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
index 18b74f10d5af217cd449a503e2126febba7aa4ea..6cfe9589be6a375f7d47fb3382fbe12aaffc4700 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_LocRecEv/ALFA_LocRecEvent.h"
#include "ALFA_LocRecEv/ALFA_LocRecODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecEvent)
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecODEvent)
+DECLARE_COMPONENT( ALFA_LocRecEvent )
+DECLARE_COMPONENT( ALFA_LocRecODEvent )
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecEv) {
-DECLARE_ALGORITHM(ALFA_LocRecEvent)
-DECLARE_ALGORITHM(ALFA_LocRecODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx
deleted file mode 100644
index 5210dcdfc552605956f4deb7ba956ac44c40a408..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecEv)
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/cmt/requirements b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/cmt/requirements
deleted file mode 100644
index 0ecaadba670cc675eb628d878aa39f3f5cba846b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/cmt/requirements
+++ /dev/null
@@ -1,41 +0,0 @@
-package ALFA_GloRec
-
-author Libor Nozka <libor.nozka@cern.ch>
-author Petr Hamal <petr.hamal@cern.ch>
-
-branches run
-
-use GaudiInterface GaudiInterface-* External
-use GeneratorObjects GeneratorObjects-* Generators
-
-use AtlasPolicy AtlasPolicy-*
-#use AtlasCLHEP AtlasCLHEP-* External
-use AtlasROOT AtlasROOT-* External
-
-use StoreGate StoreGate-* Control
-
-use EventInfo EventInfo-* Event
-use AthenaBaseComps AthenaBaseComps-* Control
-
-
-use ALFA_Geometry ALFA_Geometry-* ForwardDetectors/ALFA
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_LocRecCorrEv ALFA_LocRecCorrEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_GloRecEv ALFA_GloRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-
-library ALFA_GloRec *.cxx components/*.cxx
-
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTTableLibs
-
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py *.C *.sh"
-
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
index d1730066dbd52c51002163af0fae899c63a9f7ae..ee792159d3699453ce55af5dfa5f3e5947a7a09b 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_GloRec/ALFA_GloRec.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_GloRec)
+DECLARE_COMPONENT( ALFA_GloRec )
-DECLARE_FACTORY_ENTRIES(ALFA_GloRec) {
- DECLARE_ALGORITHM (ALFA_GloRec)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx
deleted file mode 100644
index 5042e5e63e30d0265c39f605709dae1b1c9cb10e..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_GloRec)
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/cmt/requirements b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/cmt/requirements
deleted file mode 100644
index eac9499ab16187778cc505e47c98512aafa88483..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/cmt/requirements
+++ /dev/null
@@ -1,43 +0,0 @@
-package ALFA_LocRec
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-use AthenaKernel AthenaKernel-* Control
-use AtlasHepMC AtlasHepMC-* External
-use EventInfo EventInfo-* Event
-
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasPolicy AtlasPolicy-*
-use StoreGate StoreGate-* Control
-use GeneratorObjects GeneratorObjects-* Generators
-
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use ALFA_Geometry ALFA_Geometry-* ForwardDetectors/ALFA
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-
-library ALFA_LocRec *.cxx components/*.cxx
-
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTTableLibs
-
-apply_pattern component_library
-apply_pattern declare_runtime files="-s=../share/mapping *.txt *.dat *.py"
-
-apply_pattern declare_joboptions files="*.py"
-
-private
-#use PathResolver PathResolver-* Tools
-
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-
-end_private
-
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
index fe8453e3e7bc0e69d0ee5310a1501b562311b8a0..2a06550bb5b0d12b88510dec530fef1ae70e7f54 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_LocRec/ALFA_LocRec.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRec)
+DECLARE_COMPONENT( ALFA_LocRec )
-DECLARE_FACTORY_ENTRIES(ALFA_LocRec) {
- DECLARE_ALGORITHM (ALFA_LocRec)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx
deleted file mode 100644
index 78ea028d649cf469387f74dc88c7fad6aaee5e76..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRec)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/cmt/requirements b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/cmt/requirements
deleted file mode 100644
index 3dc3a249ddb8280411e155bc319e88e862e2db85..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/cmt/requirements
+++ /dev/null
@@ -1,45 +0,0 @@
-package ALFA_LocRecCorr
-
-author Petr Hamal <petr.hamal@cern.ch>
-
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-use EventInfo EventInfo-* Event
-
-use GaudiInterface GaudiInterface-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasPolicy AtlasPolicy-*
-use StoreGate StoreGate-* Control
-use GeneratorObjects GeneratorObjects-* Generators
-
-use ALFA_Geometry ALFA_Geometry-* ForwardDetectors/ALFA
-use ALFA_RawEv ALFA_RawEv-* ForwardDetectors/ALFA
-use ALFA_LocRecEv ALFA_LocRecEv-* ForwardDetectors/ALFA/ALFA_RecEv
-use ALFA_LocRecCorrEv ALFA_LocRecCorrEv-* ForwardDetectors/ALFA/ALFA_RecEv
-
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-use AthenaKernel AthenaKernel-* Control
-end_private
-
-
-library ALFA_LocRecCorr *.cxx components/*.cxx
-
-apply_tag ROOTBasicLibs
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTTableLibs
-
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-
-private
-#use PathResolver PathResolver-* Tools
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
-
-
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
index fa0ed74b61df1d130f541ec00d71a57df911fb7d..e2be714eacd7d49eefb2c89cfd65696d0ce6130c 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_LocRecCorr/ALFA_LocRecCorr.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorr)
+DECLARE_COMPONENT( ALFA_LocRecCorr )
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecCorr) {
- DECLARE_ALGORITHM (ALFA_LocRecCorr)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx
deleted file mode 100644
index 141f6ff370a121be95c8d2df12ee160060c4cc44..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecCorr)
-
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/cmt/requirements b/ForwardDetectors/ALFA/ALFA_SimEv/cmt/requirements
deleted file mode 100644
index b1b0cdbbd96ebd79c9db425e091df48e372a0d94..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_SimEv/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package ALFA_SimEv
-
-author Tomas Sykora <tomas.sykora@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use CLIDSvc CLIDSvc-* Control
-#use DataModel DataModel-* Control
-#use GaudiInterface GaudiInterface-* External
-#use Identifier Identifier-* DetectorDescription
-use HitManagement HitManagement-* Simulation
-
-library ALFA_SimEv *.cxx
-
-apply_pattern installed_library
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use GaudiInterface GaudiInterface-* External
-
-apply_pattern lcgdict dict=ALFA_SimEv selectionfile=selection.xml headerfiles="../ALFA_SimEv/ALFA_SimEvDict.h"
-
-end_private
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
index b72851e6917dfc3d3b91ae0f4029b9d59358d4a6..3b500d7818a41949ff173447fa31ece27e9f240f 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
@@ -2,17 +2,9 @@
#include "ALFA_SimEv/ALFA_Hit.h"
#include "ALFA_SimEv/ALFA_ODHitCollection.h"
#include "ALFA_SimEv/ALFA_ODHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(ALFA_Hit)
-DECLARE_ALGORITHM_FACTORY(ALFA_HitCollection)
-DECLARE_ALGORITHM_FACTORY(ALFA_ODHit)
-DECLARE_ALGORITHM_FACTORY(ALFA_ODHitCollection)
+DECLARE_COMPONENT( ALFA_Hit )
+DECLARE_COMPONENT( ALFA_HitCollection )
+DECLARE_COMPONENT( ALFA_ODHit )
+DECLARE_COMPONENT( ALFA_ODHitCollection )
-DECLARE_FACTORY_ENTRIES(ALFA_SimEv) {
-DECLARE_ALGORITHM(ALFA_Hit)
-DECLARE_ALGORITHM(ALFA_HitCollection)
-DECLARE_ALGORITHM(ALFA_ODHit)
-DECLARE_ALGORITHM(ALFA_ODHitCollection)
-}
-
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx
deleted file mode 100644
index 8c459bcba726320cba4d24b6e0ec3d3ba7ae9e2a..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_SimEv)
diff --git a/ForwardDetectors/FPTracker/cmt/install.history b/ForwardDetectors/FPTracker/cmt/install.history
deleted file mode 100644
index f0d988b7c9096ffb75d4fd27631342070a9044d1..0000000000000000000000000000000000000000
--- a/ForwardDetectors/FPTracker/cmt/install.history
+++ /dev/null
@@ -1,52 +0,0 @@
-(i__main__
-LogFile
-p0
-(dp1
-S'_installed_files'
-p2
-(dp3
-S'../../../ForwardDetectors/FPTracker/i686-slc5-gcc43-opt/fpTrackerMain.exe'
-p4
-S'../../../InstallArea/i686-slc5-gcc43-opt/bin/fpTrackerMain.exe'
-p5
-sS'../../../ForwardDetectors/FPTracker/i686-slc4-gcc34-dbg/fpTrackerMain.exe'
-p6
-S'../../../InstallArea/i686-slc4-gcc34-dbg/bin/fpTrackerMain.exe'
-p7
-sS'../../../ForwardDetectors/FPTracker/i686-slc5-gcc43-opt/libFPTracker.so'
-p8
-S'../../../InstallArea/i686-slc5-gcc43-opt/lib/libFPTracker.so'
-p9
-sS'../../../16.3.0/ForwardDetectors/FPTracker/i686-slc5-gcc43-opt/libFPTracker.so'
-p10
-S'../../../../InstallArea/i686-slc5-gcc43-opt/lib/libFPTracker.so'
-p11
-sS'../../../ForwardDetectors/FPTracker/i686-slc4-gcc34-dbg/libFPTracker.so'
-p12
-S'../../../InstallArea/i686-slc4-gcc34-dbg/lib/libFPTracker.so'
-p13
-sS'../../../FPTracker/i686-slc4-gcc34-dbg/libFPTracker.so'
-p14
-S'../../InstallArea/i686-slc4-gcc34-dbg/lib/libFPTracker.so'
-p15
-sS'../../../ForwardDetectors/FPTracker/i686-slc4-gcc34-opt/fpTrackerMain.exe'
-p16
-S'../../../InstallArea/i686-slc4-gcc34-opt/bin/fpTrackerMain.exe'
-p17
-sS'../../../16.3.0/ForwardDetectors/FPTracker/i686-slc5-gcc43-opt/fpTrackerMain.exe'
-p18
-S'../../../../InstallArea/i686-slc5-gcc43-opt/bin/fpTrackerMain.exe'
-p19
-sS'../../../ForwardDetectors/FPTracker/NotSupported/libFPTracker.so'
-p20
-S'../../../InstallArea/NotSupported/lib/libFPTracker.so'
-p21
-sS'../../../ForwardDetectors/FPTracker/i686-slc4-gcc34-opt/libFPTracker.so'
-p22
-S'../../../InstallArea/i686-slc4-gcc34-opt/lib/libFPTracker.so'
-p23
-sS'../../../FPTracker/i686-slc4-gcc34-dbg/fpTrackerMain.exe'
-p24
-S'../../InstallArea/i686-slc4-gcc34-dbg/bin/fpTrackerMain.exe'
-p25
-ssb.
\ No newline at end of file
diff --git a/ForwardDetectors/FPTracker/cmt/requirements b/ForwardDetectors/FPTracker/cmt/requirements
deleted file mode 100644
index d7b811145d9c76d814ba1d12a99f9d4920e004c2..0000000000000000000000000000000000000000
--- a/ForwardDetectors/FPTracker/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package FPTracker
-
-author P. Bussey, P. Sherwood
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasBoost AtlasBoost-* External
-
-# Specify required Boost components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(Boost COMPONENTS program_options)"
-
-library FPTracker *.cxx
-apply_pattern installed_library
-
-private
-
-macro fpTrackerMainlinkopts " -lFPTracker "
-macro_prepend fpTrackerMainlinkopts " $(Boost_linkopts_program_options) "
-macro_append fpTrackerMain_dependencies " FPTracker "
-application fpTrackerMain -s=../test fpTrackerMain.cxx -import=Boost
-
-
diff --git a/ForwardDetectors/ForwardIdCnv/cmt/requirements b/ForwardDetectors/ForwardIdCnv/cmt/requirements
deleted file mode 100644
index 00bb66316e07ad966130b7dbe212de16ba5d4bcd..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardIdCnv/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package ForwardIdCnv
-
-author RD Schaffer <R.D.Schaffer@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use DetDescrCnvSvc DetDescrCnvSvc-* DetectorDescription
-use IdDictDetDescr IdDictDetDescr-* DetectorDescription
-use ZdcIdentifier ZdcIdentifier-* ForwardDetectors/ZDC
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-
-apply_pattern component_library
-library ForwardIdCnv *.cxx
-
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
index 56a1277d683ab27a42438c799938cec3957af5a9..9802a3f51533e423f596d9d672982af920933a79 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
+++ b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
@@ -1,14 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZdcIDDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY(ZdcIDDetDescrCnv)
+DECLARE_CONVERTER_FACTORY( ZdcIDDetDescrCnv )
-DECLARE_FACTORY_ENTRIES ( ForwardIdCnv ) {
- DECLARE_CONVERTER ( ZdcIDDetDescrCnv );
-}
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx
deleted file mode 100644
index 5d5b203351fa91a9b7e06c676bb819a0b738e6aa..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ForwardIdCnv )
diff --git a/ForwardDetectors/ForwardRec/cmt/requirements b/ForwardDetectors/ForwardRec/cmt/requirements
deleted file mode 100644
index 0af9ae88e40d12bd3b5a709b0568bf0ff045194e..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardRec/cmt/requirements
+++ /dev/null
@@ -1,11 +0,0 @@
-author Peter Steinberg <peter.steinberg@bnl.gov>
-private
-package ForwardRec
-
-use AtlasReconstructionRunTime AtlasReconstructionRunTime-* -no_auto_imports
-use AtlasPolicy AtlasPolicy-*
-
-
-branches run
-apply_pattern declare_joboptions files="*.py"
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
old mode 100755
new mode 100644
index 800a8383cc3045208143b0dc4ac493dcae03bfbc..0947d041ab163102c753b22114755b8b9fe97914
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../ForwardRegionGeoModelTool.h"
-DECLARE_TOOL_FACTORY(ForwardRegionGeoModelTool)
+DECLARE_COMPONENT( ForwardRegionGeoModelTool )
+
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/cmt/requirements b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/cmt/requirements
deleted file mode 100644
index dc782a5fa6ebb97912464c9efe80e4f40d0b5811..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package ForwardRegionMgField
-
-author Ladislav Chytka <ladislav.chytka@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AtlasCLHEP AtlasCLHEP-* External
-
-private
-use AthenaBaseComps AthenaBaseComps-* Control
-use Geant4 Geant4-* External
-use MagFieldInterfaces MagFieldInterfaces-* MagneticField
-use PathResolver PathResolver-* Tools
-end_private
-
-apply_pattern dual_use_library files="*.cxx"
-
-apply_pattern declare_runtime files="-s=../share/ *.dat"
-apply_pattern declare_python_modules files="*.py"
-
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
index 3ddf0598b7020f99431b85f6b6924d22c695cded..ebfbe8f567186014e9b8df6e1f2431a7fb205279 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
@@ -1,5 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ForwardRegionFieldSvc.h"
-DECLARE_NAMESPACE_SERVICE_FACTORY( MagField, ForwardRegionFieldSvc )
+DECLARE_COMPONENT( MagField::ForwardRegionFieldSvc )
+
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/cmt/requirements b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/cmt/requirements
deleted file mode 100644
index 7483406270b3da76ddcd474da44c288c1294533c..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package ForwardRegionProperties
-
-author Ladislav Chytka <ladislav.chytka@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-
-private
-use GaudiInterface GaudiInterface-* External
-end_private
-
-use ForwardRegionGeoModel ForwardRegionGeoModel-* ForwardDetectors/ForwardSimulation
-
-library ForwardRegionProperties *.cxx components/*.cxx
-apply_pattern component_library
-
-apply_pattern declare_python_modules files="*.py"
-#private
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#end_private
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
index 28d734a21fd64c80d98c4feae8f51109786f8136..bd1d6a175ddc9eddf0e09d80cdaaf819aadefaf5 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
@@ -1,8 +1,4 @@
#include "ForwardRegionProperties/ForwardRegionProperties.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY(ForwardRegionProperties)
+DECLARE_COMPONENT( ForwardRegionProperties )
-DECLARE_FACTORY_ENTRIES(ForwardRegionProperties) {
- DECLARE_TOOL (ForwardRegionProperties)
-}
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx
deleted file mode 100644
index 72b310a56bad8b75ad619efde734898f60312139..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardRegionProperties)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/Makefile b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/cleanup.csh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/cleanup.csh
deleted file mode 100644
index 0249237110c157a63a13fd5f0934e994f461c454..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/cleanup.csh
+++ /dev/null
@@ -1,27 +0,0 @@
-# echo "cleanup ForwardRegion_EventAthenaPool ForwardRegion_EventAthenaPool-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /cvmfs/atlas.cern.ch/repo/sw/software/x86_64-slc6-gcc46-opt/17.7.0/CMT/v1r26
-endif
-source ${CMTROOT}/mgr/setup.csh
-set cmtForwardRegion_EventAthenaPooltempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set cmtForwardRegion_EventAthenaPooltempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt cleanup -csh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv $* >${cmtForwardRegion_EventAthenaPooltempfile}
-if ( $status != 0 ) then
- echo "${CMTROOT}/mgr/cmt cleanup -csh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv $* >${cmtForwardRegion_EventAthenaPooltempfile}"
- set cmtcleanupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
- unset cmtForwardRegion_EventAthenaPooltempfile
- exit $cmtcleanupstatus
-endif
-set cmtcleanupstatus=0
-source ${cmtForwardRegion_EventAthenaPooltempfile}
-if ( $status != 0 ) then
- set cmtcleanupstatus=2
-endif
-/bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
-unset cmtForwardRegion_EventAthenaPooltempfile
-exit $cmtcleanupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/cleanup.sh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/cleanup.sh
deleted file mode 100644
index 243d8bfc5685b03452bf2e3ff0899d6a79efed78..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/cleanup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# echo "cleanup ForwardRegion_EventAthenaPool ForwardRegion_EventAthenaPool-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/cvmfs/atlas.cern.ch/repo/sw/software/x86_64-slc6-gcc46-opt/17.7.0/CMT/v1r26; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-cmtForwardRegion_EventAthenaPooltempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then cmtForwardRegion_EventAthenaPooltempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt cleanup -sh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv $* >${cmtForwardRegion_EventAthenaPooltempfile}
-if test $? != 0 ; then
- echo >&2 "${CMTROOT}/mgr/cmt cleanup -sh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv $* >${cmtForwardRegion_EventAthenaPooltempfile}"
- cmtcleanupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
- unset cmtForwardRegion_EventAthenaPooltempfile
- return $cmtcleanupstatus
-fi
-cmtcleanupstatus=0
-. ${cmtForwardRegion_EventAthenaPooltempfile}
-if test $? != 0 ; then
- cmtcleanupstatus=2
-fi
-/bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
-unset cmtForwardRegion_EventAthenaPooltempfile
-return $cmtcleanupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/requirements b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/requirements
deleted file mode 100644
index ad588642cc2058ad12aa9caed4a7591e4a050b73..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package ForwardRegion_EventAthenaPool
-
-author Thomas Keck <thomas.keck@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-#use StoreGate StoreGate-* Control
-#use DataModel DataModel-* Control
-#use CLIDSvc CLIDSvc-* Control
-#use AtlasReflex AtlasReflex-* External
-
-
-# Converters for the rdo containers and hit collections
-apply_pattern poolcnv files=" -s=${ForwardRegion_SimEv_root}/ForwardRegion_SimEv SimulationHitCollection.h"
-
-macro_append ForwardRegion_EventAthenaPoolPoolCnv_shlibflags "$(ForwardRegion_EventAthenaPool_dict_linkopts)"
-
-private
-use GaudiInterface GaudiInterface-* External
-use ForwardRegion_SimEv ForwardRegion_SimEv-* ForwardDetectors/ForwardSimulation
-use ForwardRegion_EventTPCnv ForwardRegion_EventTPCnv-* ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-00-* Database/AthenaPOOL
-use AtlasSealCLHEP AtlasSealCLHEP-* Database
-
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/setup.csh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/setup.csh
deleted file mode 100644
index 9f2c7215abb08dfad3f35b84b7d1abf97535e6d5..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/setup.csh
+++ /dev/null
@@ -1,27 +0,0 @@
-# echo "setup ForwardRegion_EventAthenaPool ForwardRegion_EventAthenaPool-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /cvmfs/atlas.cern.ch/repo/sw/software/x86_64-slc6-gcc46-opt/17.7.0/CMT/v1r26
-endif
-source ${CMTROOT}/mgr/setup.csh
-set cmtForwardRegion_EventAthenaPooltempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set cmtForwardRegion_EventAthenaPooltempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt setup -csh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -no_cleanup $* >${cmtForwardRegion_EventAthenaPooltempfile}
-if ( $status != 0 ) then
- echo "${CMTROOT}/mgr/cmt setup -csh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -no_cleanup $* >${cmtForwardRegion_EventAthenaPooltempfile}"
- set cmtsetupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
- unset cmtForwardRegion_EventAthenaPooltempfile
- exit $cmtsetupstatus
-endif
-set cmtsetupstatus=0
-source ${cmtForwardRegion_EventAthenaPooltempfile}
-if ( $status != 0 ) then
- set cmtsetupstatus=2
-endif
-/bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
-unset cmtForwardRegion_EventAthenaPooltempfile
-exit $cmtsetupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/setup.sh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/setup.sh
deleted file mode 100644
index d80679a8b142be6b05e4dc5303b19937d0e70e3e..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# echo "setup ForwardRegion_EventAthenaPool ForwardRegion_EventAthenaPool-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/cvmfs/atlas.cern.ch/repo/sw/software/x86_64-slc6-gcc46-opt/17.7.0/CMT/v1r26; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-cmtForwardRegion_EventAthenaPooltempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then cmtForwardRegion_EventAthenaPooltempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt setup -sh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -no_cleanup $* >${cmtForwardRegion_EventAthenaPooltempfile}
-if test $? != 0 ; then
- echo >&2 "${CMTROOT}/mgr/cmt setup -sh -pack=ForwardRegion_EventAthenaPool -version=ForwardRegion_EventAthenaPool-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -no_cleanup $* >${cmtForwardRegion_EventAthenaPooltempfile}"
- cmtsetupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
- unset cmtForwardRegion_EventAthenaPooltempfile
- return $cmtsetupstatus
-fi
-cmtsetupstatus=0
-. ${cmtForwardRegion_EventAthenaPooltempfile}
-if test $? != 0 ; then
- cmtsetupstatus=2
-fi
-/bin/rm -f ${cmtForwardRegion_EventAthenaPooltempfile}
-unset cmtForwardRegion_EventAthenaPooltempfile
-return $cmtsetupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/version.cmt b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/version.cmt
deleted file mode 100644
index b82afca34873902015f3edc7435d0e56e4c7df72..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-ForwardRegion_EventAthenaPool-00-00-05
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
index 88a6bc2e7a7b4cbe4a729d0151d5db560a6daaa1..a94fcd67f2d824a0bb2896d662d12beef49b31f9 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
@@ -1,8 +1,4 @@
#include "src/SimulationHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
-
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventAthenaPool) {
- DECLARE_ALGORITHM( SimulationHitCollectionCnv )
-}
+DECLARE_COMPONENT( SimulationHitCollectionCnv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx
deleted file mode 100644
index 96701a706909cb0152e685d0237424de854c325b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SimulationHitAthenaPool)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
index 88a6bc2e7a7b4cbe4a729d0151d5db560a6daaa1..a94fcd67f2d824a0bb2896d662d12beef49b31f9 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
@@ -1,8 +1,4 @@
#include "src/SimulationHitCollectionCnv.h"
-DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
-
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventAthenaPool) {
- DECLARE_ALGORITHM( SimulationHitCollectionCnv )
-}
+DECLARE_COMPONENT( SimulationHitCollectionCnv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx
deleted file mode 100644
index c9d5f712bf8ea46d5455148427ab38f0612514aa..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SimulationHitCollectionAthenaPool)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/Makefile b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/cleanup.csh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/cleanup.csh
deleted file mode 100644
index b9cb1b7fac5d4f863d8817d60877bcf05a8892a1..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/cleanup.csh
+++ /dev/null
@@ -1,27 +0,0 @@
-# echo "cleanup ForwardRegion_EventTPCnv ForwardRegion_EventTPCnv-00-00-07 in /afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r25p20140131
-endif
-source ${CMTROOT}/mgr/setup.csh
-set cmtForwardRegion_EventTPCnvtempfile=`${CMTROOT}/${CMTBIN}/cmt.exe -quiet build temporary_name`
-if $status != 0 then
- set cmtForwardRegion_EventTPCnvtempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/${CMTBIN}/cmt.exe cleanup -csh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory $* >${cmtForwardRegion_EventTPCnvtempfile}
-if ( $status != 0 ) then
- echo "${CMTROOT}/${CMTBIN}/cmt.exe cleanup -csh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory $* >${cmtForwardRegion_EventTPCnvtempfile}"
- set cmtcleanupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
- unset cmtForwardRegion_EventTPCnvtempfile
- exit $cmtcleanupstatus
-endif
-set cmtcleanupstatus=0
-source ${cmtForwardRegion_EventTPCnvtempfile}
-if ( $status != 0 ) then
- set cmtcleanupstatus=2
-endif
-/bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
-unset cmtForwardRegion_EventTPCnvtempfile
-exit $cmtcleanupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/cleanup.sh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/cleanup.sh
deleted file mode 100644
index 9a29e57a52cb5fc5187b8e66c67a09ad7977f2b9..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/cleanup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# echo "cleanup ForwardRegion_EventTPCnv ForwardRegion_EventTPCnv-00-00-07 in /afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r25p20140131; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-cmtForwardRegion_EventTPCnvtempfile=`${CMTROOT}/${CMTBIN}/cmt.exe -quiet build temporary_name`
-if test ! $? = 0 ; then cmtForwardRegion_EventTPCnvtempfile=/tmp/cmt.$$; fi
-${CMTROOT}/${CMTBIN}/cmt.exe cleanup -sh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory $* >${cmtForwardRegion_EventTPCnvtempfile}
-if test $? != 0 ; then
- echo >&2 "${CMTROOT}/${CMTBIN}/cmt.exe cleanup -sh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory $* >${cmtForwardRegion_EventTPCnvtempfile}"
- cmtcleanupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
- unset cmtForwardRegion_EventTPCnvtempfile
- return $cmtcleanupstatus
-fi
-cmtcleanupstatus=0
-. ${cmtForwardRegion_EventTPCnvtempfile}
-if test $? != 0 ; then
- cmtcleanupstatus=2
-fi
-/bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
-unset cmtForwardRegion_EventTPCnvtempfile
-return $cmtcleanupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/requirements b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/requirements
deleted file mode 100644
index 8876617ba2c4b42db79b7c7cef8afdf8b308efc9..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package ForwardRegion_EventTPCnv
-
-author Thomas Keck <thomas.keck@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-
-use ForwardRegion_SimEv ForwardRegion_SimEv-* ForwardDetectors/ForwardSimulation
-
-# The following use is to get the lcgdict pattern.
-# This is "hidden" behind "private" and "no_auto_imports" to keep
-# clients of EventInfo from seeing excess dependencies
-# private
-use AtlasReflex AtlasReflex-* External
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See EventInfoDict
-apply_pattern lcgdict dict=ForwardRegion_EventTPCnv selectionfile=selection.xml headerfiles="../ForwardRegion_EventTPCnv/SimulationHitTPCnvDict.h"
-
-# end_private
-
-private
-use Identifier Identifier-* DetectorDescription
-use GaudiInterface GaudiInterface-* External
-end_private
-
-
-library ForwardRegion_EventTPCnv *.cxx
-apply_pattern installed_library
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/setup.csh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/setup.csh
deleted file mode 100644
index 5b727b5959b2138900dc3e613f411e6118551110..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/setup.csh
+++ /dev/null
@@ -1,27 +0,0 @@
-# echo "setup ForwardRegion_EventTPCnv ForwardRegion_EventTPCnv-00-00-07 in /afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r25p20140131
-endif
-source ${CMTROOT}/mgr/setup.csh
-set cmtForwardRegion_EventTPCnvtempfile=`${CMTROOT}/${CMTBIN}/cmt.exe -quiet build temporary_name`
-if $status != 0 then
- set cmtForwardRegion_EventTPCnvtempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/${CMTBIN}/cmt.exe setup -csh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory -no_cleanup $* >${cmtForwardRegion_EventTPCnvtempfile}
-if ( $status != 0 ) then
- echo "${CMTROOT}/${CMTBIN}/cmt.exe setup -csh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory -no_cleanup $* >${cmtForwardRegion_EventTPCnvtempfile}"
- set cmtsetupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
- unset cmtForwardRegion_EventTPCnvtempfile
- exit $cmtsetupstatus
-endif
-set cmtsetupstatus=0
-source ${cmtForwardRegion_EventTPCnvtempfile}
-if ( $status != 0 ) then
- set cmtsetupstatus=2
-endif
-/bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
-unset cmtForwardRegion_EventTPCnvtempfile
-exit $cmtsetupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/setup.sh b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/setup.sh
deleted file mode 100644
index 90980f0b2bed39ebc037064cd2efddd54e442b13..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# echo "setup ForwardRegion_EventTPCnv ForwardRegion_EventTPCnv-00-00-07 in /afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r25p20140131; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-cmtForwardRegion_EventTPCnvtempfile=`${CMTROOT}/${CMTBIN}/cmt.exe -quiet build temporary_name`
-if test ! $? = 0 ; then cmtForwardRegion_EventTPCnvtempfile=/tmp/cmt.$$; fi
-${CMTROOT}/${CMTBIN}/cmt.exe setup -sh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory -no_cleanup $* >${cmtForwardRegion_EventTPCnvtempfile}
-if test $? != 0 ; then
- echo >&2 "${CMTROOT}/${CMTBIN}/cmt.exe setup -sh -pack=ForwardRegion_EventTPCnv -version=ForwardRegion_EventTPCnv-00-00-07 -path=/afs/cern.ch/user/g/gemmeren/workarea/dev/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv -quiet -without_version_directory -no_cleanup $* >${cmtForwardRegion_EventTPCnvtempfile}"
- cmtsetupstatus=2
- /bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
- unset cmtForwardRegion_EventTPCnvtempfile
- return $cmtsetupstatus
-fi
-cmtsetupstatus=0
-. ${cmtForwardRegion_EventTPCnvtempfile}
-if test $? != 0 ; then
- cmtsetupstatus=2
-fi
-/bin/rm -f ${cmtForwardRegion_EventTPCnvtempfile}
-unset cmtForwardRegion_EventTPCnvtempfile
-return $cmtsetupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/version.cmt b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/version.cmt
deleted file mode 100644
index 95cb2023c8772451388d1eb25820646162edc6b4..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-ForwardRegion_EventTPCnv-00-00-07
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
index 7a38ce6151cc8b68b6f9cf2e78e80dc269f367c7..5e0f1f987dc598a0da28634ffaed39979e289928 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
@@ -3,18 +3,9 @@
#include "ForwardRegion_EventTPCnv/SimulationHitHitCollection_p1.h"
#include "ForwardRegion_EventTPCnv/SimulationHitHitCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( SimulationHit_p1 )
-DECLARE_ALGORITHM_FACTORY( SimulationHitHitCnv_p1 )
-DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollection_p1 )
-DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollectionCnv_p1 )
-
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventTPCnv) {
-
- DECLARE_ALGORITHM( SimulationHit_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCnv_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCollection_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCollectionCnv_p1 )
-}
+DECLARE_COMPONENT( SimulationHit_p1 )
+DECLARE_COMPONENT( SimulationHitHitCnv_p1 )
+DECLARE_COMPONENT( SimulationHitHitCollection_p1 )
+DECLARE_COMPONENT( SimulationHitHitCollectionCnv_p1 )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx
deleted file mode 100644
index 1c975e468a7032fca079b95a2e579c8d7e6ba132..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ForwardRegion_EventTPCnv)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/Makefile b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/cleanup.csh b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/cleanup.csh
deleted file mode 100644
index a1b6e129ca53fb41a17804a208ed76817ff17508..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/cleanup.csh
+++ /dev/null
@@ -1,27 +0,0 @@
-# echo "cleanup ForwardRegion_SimEv ForwardRegion_SimEv-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r25
-endif
-source ${CMTROOT}/mgr/setup.csh
-set cmtForwardRegion_SimEvtempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set cmtForwardRegion_SimEvtempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt cleanup -csh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation $* >${cmtForwardRegion_SimEvtempfile}
-if ( $status != 0 ) then
- echo "${CMTROOT}/mgr/cmt cleanup -csh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation $* >${cmtForwardRegion_SimEvtempfile}"
- set cmtcleanupstatus=2
- /bin/rm -f ${cmtForwardRegion_SimEvtempfile}
- unset cmtForwardRegion_SimEvtempfile
- exit $cmtcleanupstatus
-endif
-set cmtcleanupstatus=0
-source ${cmtForwardRegion_SimEvtempfile}
-if ( $status != 0 ) then
- set cmtcleanupstatus=2
-endif
-/bin/rm -f ${cmtForwardRegion_SimEvtempfile}
-unset cmtForwardRegion_SimEvtempfile
-exit $cmtcleanupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/cleanup.sh b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/cleanup.sh
deleted file mode 100644
index 5e3883e3f42b86c2fe24c7195bfc25a40dc617bc..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/cleanup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# echo "cleanup ForwardRegion_SimEv ForwardRegion_SimEv-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r25; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-cmtForwardRegion_SimEvtempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then cmtForwardRegion_SimEvtempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt cleanup -sh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation $* >${cmtForwardRegion_SimEvtempfile}
-if test $? != 0 ; then
- echo >&2 "${CMTROOT}/mgr/cmt cleanup -sh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation $* >${cmtForwardRegion_SimEvtempfile}"
- cmtcleanupstatus=2
- /bin/rm -f ${cmtForwardRegion_SimEvtempfile}
- unset cmtForwardRegion_SimEvtempfile
- return $cmtcleanupstatus
-fi
-cmtcleanupstatus=0
-. ${cmtForwardRegion_SimEvtempfile}
-if test $? != 0 ; then
- cmtcleanupstatus=2
-fi
-/bin/rm -f ${cmtForwardRegion_SimEvtempfile}
-unset cmtForwardRegion_SimEvtempfile
-return $cmtcleanupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/requirements b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/requirements
deleted file mode 100644
index 2e77104a16dbe3e27705ca677a3b9679c85a4806..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package ForwardRegion_SimEv
-
-author Thomas Keck <thomas.keck@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use CLIDSvc CLIDSvc-* Control
-use HitManagement HitManagement-* Simulation
-use AtlasCLHEP AtlasCLHEP-* External
-library ForwardRegion_SimEv *.cxx
-
-apply_pattern installed_library
-
-private
-
-use GaudiInterface GaudiInterface-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=ForwardRegion_SimEv selectionfile=selection.xml headerfiles="../ForwardRegion_SimEv/SimulationHitDict.h"
-
-end_private
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/setup.csh b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/setup.csh
deleted file mode 100644
index 0fcd39ed872989a797b9e00640d621557ebcedec..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/setup.csh
+++ /dev/null
@@ -1,27 +0,0 @@
-# echo "setup ForwardRegion_SimEv ForwardRegion_SimEv-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r25
-endif
-source ${CMTROOT}/mgr/setup.csh
-set cmtForwardRegion_SimEvtempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set cmtForwardRegion_SimEvtempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt setup -csh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation -no_cleanup $* >${cmtForwardRegion_SimEvtempfile}
-if ( $status != 0 ) then
- echo "${CMTROOT}/mgr/cmt setup -csh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation -no_cleanup $* >${cmtForwardRegion_SimEvtempfile}"
- set cmtsetupstatus=2
- /bin/rm -f ${cmtForwardRegion_SimEvtempfile}
- unset cmtForwardRegion_SimEvtempfile
- exit $cmtsetupstatus
-endif
-set cmtsetupstatus=0
-source ${cmtForwardRegion_SimEvtempfile}
-if ( $status != 0 ) then
- set cmtsetupstatus=2
-endif
-/bin/rm -f ${cmtForwardRegion_SimEvtempfile}
-unset cmtForwardRegion_SimEvtempfile
-exit $cmtsetupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/setup.sh b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/setup.sh
deleted file mode 100644
index 21c67682896565606ba742e92f862255d5d26e77..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# echo "setup ForwardRegion_SimEv ForwardRegion_SimEv-00-00-05 in /afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r25; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-cmtForwardRegion_SimEvtempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then cmtForwardRegion_SimEvtempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt setup -sh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation -no_cleanup $* >${cmtForwardRegion_SimEvtempfile}
-if test $? != 0 ; then
- echo >&2 "${CMTROOT}/mgr/cmt setup -sh -pack=ForwardRegion_SimEv -version=ForwardRegion_SimEv-00-00-05 -path=/afs/cern.ch/user/t/tkeck/workspace/17.7.0/ForwardDetectors/ForwardSimulation -no_cleanup $* >${cmtForwardRegion_SimEvtempfile}"
- cmtsetupstatus=2
- /bin/rm -f ${cmtForwardRegion_SimEvtempfile}
- unset cmtForwardRegion_SimEvtempfile
- return $cmtsetupstatus
-fi
-cmtsetupstatus=0
-. ${cmtForwardRegion_SimEvtempfile}
-if test $? != 0 ; then
- cmtsetupstatus=2
-fi
-/bin/rm -f ${cmtForwardRegion_SimEvtempfile}
-unset cmtForwardRegion_SimEvtempfile
-return $cmtsetupstatus
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/version.cmt b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/version.cmt
deleted file mode 100644
index 4b0c60dbd8998e1a3ece7c834259005166e83b3f..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-ForwardRegion_SimEv-00-00-06
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
index 493189cb760193d7f721c680a70df8319af90063..0a767855725c065481cb3a46db68162aa0f9c0dd 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
@@ -1,12 +1,6 @@
#include "ForwardRegion_SimEv/SimulationHitCollection.h"
#include "ForwardRegion_SimEv/SimulationHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY(SimulationHit)
-DECLARE_ALGORITHM_FACTORY(SimulationHitCollection)
+DECLARE_COMPONENT( SimulationHit )
+DECLARE_COMPONENT( SimulationHitCollection )
-DECLARE_FACTORY_ENTRIES(ForwardRegion_SimEv) {
- DECLARE_ALGORITHM(SimulationHit)
- DECLARE_ALGORITHM(SimulationHitCollection)
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx
deleted file mode 100644
index 35f50691f0a496de160fc981cbdea35c2bd7e8b4..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardRegion_SimEv)
diff --git a/ForwardDetectors/ForwardTracker/cmt/requirements b/ForwardDetectors/ForwardTracker/cmt/requirements
deleted file mode 100644
index 21b7da74ec683a741e19689e359b9618fa95a900..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTracker/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package ForwardTracker
-
-author P. Bussey, P. Sherwood, M.D. Baker, E. Carquin, A. Sbrizzi
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCoreRunTime AtlasCoreRunTime-*
-use AtlasBoost AtlasBoost-* External
-
-# Specify required Boost components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(Boost COMPONENTS program_options)"
-
-library ForwardTracker *.cxx
-apply_pattern installed_library
-
-private
-
-macro forwardTrackerMainlinkopts " -lForwardTracker "
-macro_prepend forwardTrackerMainlinkopts " $(Boost_linkopts_program_options) "
-macro_append forwardTrackerMain_dependencies " ForwardTracker "
-application forwardTrackerMain -s=../test forwardTrackerMain.cxx -import=Boost
diff --git a/ForwardDetectors/ForwardTransport/cmt/requirements b/ForwardDetectors/ForwardTransport/cmt/requirements
deleted file mode 100644
index c35f8a9d7c73296e0cc2b1d8e24f56ab38252c9e..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransport/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package ForwardTransport
-
-author ADA <dellacqu@mail.cern.ch>
-
-branches src cmt
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use ForwardTracker ForwardTracker-* ForwardDetectors
-use G4AtlasTools G4AtlasTools-* Simulation/G4Atlas
-use ForwardTransportSvc ForwardTransportSvc-* ForwardDetectors
-use Geant4 Geant4-* External
-use GaudiInterface GaudiInterface-* External
-use AtlasHepMC AtlasHepMC-* External
-end_private
-
-library ForwardTransport ../src/*.cxx ../src/components/*.cxx
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-
diff --git a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
index d2bb6f27606bb48e7b4ad21a8d8386c28d70cc6a..e5ade9047392510f03c499b5954a4c7e34676a77 100644
--- a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
+++ b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ForwardTransportModelTool.h"
-DECLARE_TOOL_FACTORY( ForwardTransportModelTool )
+DECLARE_COMPONENT( ForwardTransportModelTool )
-DECLARE_FACTORY_ENTRIES( ForwardTransport ) {
- DECLARE_TOOL( ForwardTransportModelTool )
-}
diff --git a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx
deleted file mode 100644
index b65f64dee1b6de62e3a83013fea16961ac589f78..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( ForwardTransport )
diff --git a/ForwardDetectors/ForwardTransportFast/cmt/requirements b/ForwardDetectors/ForwardTransportFast/cmt/requirements
deleted file mode 100644
index 5158b99eaed81003eb4933e0967c408fd4668fac..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransportFast/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package ForwardTransportFast
-
-author Antonello <Antonio.Sbrizzi@mail.cern.ch>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use ForwardTransportSvc ForwardTransportSvc-* ForwardDetectors
-use ForwardTracker ForwardTracker-* ForwardDetectors
-use HepPDT v* LCG_Interfaces
-use GaudiInterface GaudiInterface-* External
-
-macro ForwardTransportFast_linkopts " -lForwardTracker "
-
-library ForwardTransportFast *.cxx components/*.cxx
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py"
-
-private
-
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasHepMC AtlasHepMC-* External
-use GeneratorObjects GeneratorObjects-* Generators
diff --git a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
index 7116f2271764508094ceef2dc3435343632c63f6..5a359b0a752d1252a78541d4626a889fc410a1ba 100644
--- a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
+++ b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ForwardTransportFast/ForwardTransportFast.h"
-DECLARE_ALGORITHM_FACTORY( ForwardTransportFast )
-
-DECLARE_FACTORY_ENTRIES( ForwardTransportFast ) {
- DECLARE_ALGORITHM( ForwardTransportFast )
-}
+DECLARE_COMPONENT( ForwardTransportFast )
diff --git a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx
deleted file mode 100644
index 85b5acb7cfa45093c45f1cd35494babe2fbb2a05..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ForwardTransportFast )
diff --git a/ForwardDetectors/ForwardTransportSvc/cmt/requirements b/ForwardDetectors/ForwardTransportSvc/cmt/requirements
deleted file mode 100644
index 8131b90ab3d16af281a7d91f39274adc03e9fa1f..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransportSvc/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package ForwardTransportSvc
-
-author ADA <Andrea.DellAcqua@cern.ch>
-manager ADA <Andrea.DellAcqua@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use Geant4 Geant4-* External
-use AtlasHepMC * External
-use ForwardTracker ForwardTracker-* ForwardDetectors
-
-macro ForwardTransportSvc_linkopts " -lForwardTracker "
-
-library ForwardTransportSvc *.cxx components/*.cxx
-
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-private
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasROOT AtlasROOT-* External
-use GeneratorObjects GeneratorObjects-* Generators
-
diff --git a/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h b/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h
index ebf407219627fac5991ce160538f4e0b25f904e2..2c18ab665b02241940f9a97e628b973ef7f33dfb 100755
--- a/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h
+++ b/ForwardDetectors/ForwardTransportSvc/src/ForwardTransportSvc.h
@@ -36,8 +36,6 @@ class ForwardTransportSvc: public AthService, virtual public IForwardTransportSv
virtual HepMC::GenEvent* getEvent();
- protected:
-
friend class SvcFactory<ForwardTransportSvc>;
ForwardTransportSvc(const std::string& name, ISvcLocator* svc);
diff --git a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
old mode 100755
new mode 100644
index edcd20d31c0f8e29050dabb24a9c33fd667d4584..cf80ea07096ca3b82a2c44765c3fa3d18f639d32
--- a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
+++ b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
@@ -1,9 +1,4 @@
#include "../ForwardTransportSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_SERVICE_FACTORY(ForwardTransportSvc)
-
-DECLARE_FACTORY_ENTRIES(ForwardTransportSvc) {
- DECLARE_SERVICE ( ForwardTransportSvc )
-}
+DECLARE_COMPONENT( ForwardTransportSvc )
diff --git a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx
deleted file mode 100755
index 06c6bf686fac96fd49ad20bb5573798a167b7007..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardTransportSvc)
-
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/cmt/requirements b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/cmt/requirements
deleted file mode 100644
index cd3247ad7a3ba596c9cf14e524f18d4e91b025dc..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package LUCID_EventAthenaPool
-
-author Jacob Groth-Jensen <Jacob.Groth-Jensen@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use GaudiInterface GaudiInterface-* External
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use LUCID_EventTPCnv LUCID_EventTPCnv-* ForwardDetectors/LUCID/LUCID_Cnv
-use LUCID_RawEvent LUCID_RawEvent-* ForwardDetectors/LUCID
-use LUCID_SimEvent LUCID_SimEvent-* ForwardDetectors/LUCID/LUCID_SimUtils
-
-apply_pattern declare_joboptions files="*.txt *.py"
-
-apply_pattern poolcnv files="-s=$(LUCID_SimEvent_root)/LUCID_SimEvent LUCID_SimHitCollection.h -s=$(LUCID_RawEvent_root)/LUCID_RawEvent LUCID_DigitContainer.h -s=$(LUCID_RawEvent_root)/LUCID_RawEvent LUCID_RawDataContainer.h"
-
-macro_append LUCID_EventAthenaPoolPoolCnv_shlibflags "$(LUCID_EventAthenaPool_dict_linkopts)"
-
-
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/cmt/requirements b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/cmt/requirements
deleted file mode 100644
index d7e347306334aec97ed05fd58834a2718f1c04da..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/cmt/requirements
+++ /dev/null
@@ -1,38 +0,0 @@
-package LUCID_EventTPCnv
-
-author Jacob Groth-Jensen <Jacob.Groth-Jensen@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use GeneratorObjectsTPCnv GeneratorObjectsTPCnv-* Generators
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use LUCID_RawEvent LUCID_RawEvent-* ForwardDetectors/LUCID
-use LUCID_SimEvent LUCID_SimEvent-* ForwardDetectors/LUCID/LUCID_SimUtils
-
-include_dirs "$(LUCID_EventTPCnv_root)/LUCID_EventTPCnv"
-
-apply_pattern installed_library
-
-library LUCID_EventTPCnv ../src/*.cxx
-
-private
-
-use GaudiInterface GaudiInterface-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use Identifier Identifier-* DetectorDescription
-
-apply_pattern lcgdict dict=LUCID_EventTPCnv selectionfile=selection.xml headerfiles="../LUCID_EventTPCnv/LUCID_EventTPCnvDict.h"
-
-end_private
-
-
-private
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=LUCID_DigitCnv_p1
-apply_pattern UnitTest_run unit_test=LUCID_DigitCnv_p2
-apply_pattern UnitTest_run unit_test=LUCID_DigitContainerCnv_p1
-apply_pattern UnitTest_run unit_test=LUCID_DigitContainerCnv_p2
-apply_pattern UnitTest_run unit_test=LUCID_RawDataCnv_p1
-apply_pattern UnitTest_run unit_test=LUCID_RawDataContainerCnv_p1
-apply_pattern UnitTest_run unit_test=LUCID_SimHitCnv_p1
-
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/cmt/requirements b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/cmt/requirements
deleted file mode 100644
index e84a3da6ec11e5c67ddf92115112a99dd5962c2a..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package LUCID_RawDataByteStreamCnv
-
-author Antonello Sbrizzi <Antonio.Sbrizzi@bo.infn.it>
-author Jacob Groth-Jensen <jacob.groth-jensen@cern.ch>
-
-use AthenaKernel AthenaKernel-* Control
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use LUCID_RawEvent LUCID_RawEvent-* ForwardDetectors/LUCID
-use ByteStreamData ByteStreamData-* Event
-
-use StoreGate StoreGate-* Control
-use GaudiInterface GaudiInterface-* External
-use ByteStreamCnvSvcBase ByteStreamCnvSvcBase-* Event
-use DataCollection DataCollection-* External
-
-# Declare the tdaq-common components that are required (only relevent for cmake - invisible to CMT)
-apply_pattern cmake_add_command command="find_package(tdaq-common COMPONENTS eformat_write DataWriter)"
-
-apply_pattern component_library
-library LUCID_RawDataByteStreamCnv *.cxx components/*.cxx
-
-apply_pattern declare_joboptions files="*.py"
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
index 0abda3d71f967e634dfab127847dd1c26b27b49f..5ba06c1e29f89904ddcce4bc81e4b7f52661eda4 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
@@ -1,16 +1,9 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LUCID_RawDataByteStreamCnv/LUCID_ByteStreamRawDataCnv.h"
-DECLARE_ALGORITHM_FACTORY ( LUCID_ByteStreamRawDataCnv )
+DECLARE_COMPONENT( LUCID_ByteStreamRawDataCnv )
#include "LUCID_RawDataByteStreamCnv/LUCID_DigitRawDataCnv.h"
-DECLARE_ALGORITHM_FACTORY ( LUCID_DigitRawDataCnv )
+DECLARE_COMPONENT( LUCID_DigitRawDataCnv )
#include "LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h"
-DECLARE_CONVERTER_FACTORY ( LUCID_DigitByteStreamCnv )
+DECLARE_CONVERTER_FACTORY( LUCID_DigitByteStreamCnv )
-DECLARE_FACTORY_ENTRIES( LUCID_RawDataByteStreamCnv ) {
- DECLARE_ALGORITHM ( LUCID_ByteStreamRawDataCnv )
- DECLARE_ALGORITHM ( LUCID_DigitRawDataCnv )
- DECLARE_CONVERTER ( LUCID_DigitByteStreamCnv )
-}
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 19522f12a3a6abb98af93c37a8fd4b4d35094489..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES ( LUCID_RawDataByteStreamCnv )
diff --git a/ForwardDetectors/LUCID/LUCID_DigiTools/cmt/requirements b/ForwardDetectors/LUCID/LUCID_DigiTools/cmt/requirements
deleted file mode 100644
index 3025c65e55c5b84a365aedb1e8f231ef3b59901c..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_DigiTools/cmt/requirements
+++ /dev/null
@@ -1,13 +0,0 @@
-package LUCID_DigiTools
-
-author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-
-private
-
-use GaudiInterface GaudiInterface-* External
-
-library LUCID_DigiTools ../src/*.cxx
-apply_pattern installed_library
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/cmt/requirements b/ForwardDetectors/LUCID/LUCID_Digitization/cmt/requirements
deleted file mode 100644
index 6669243b0066a50456ee96996c1281baba3f7c9c..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Digitization/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package LUCID_Digitization
-
-author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
-author Antonello Sbrizzi <antonio.sbrizzi@bo.infn.it>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-use GeneratorObjects GeneratorObjects-* Generators
-use HitManagement HitManagement-* Simulation
-use LUCID_RawEvent LUCID_RawEvent-* ForwardDetectors/LUCID
-use LUCID_SimEvent LUCID_SimEvent-* ForwardDetectors/LUCID/LUCID_SimUtils
-use PileUpTools PileUpTools-* Control
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-public
-
-library LUCID_Digitization *.cxx components/*.cxx
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-apply_pattern component_library
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
index 570952a908ec7c393f8996a387022d11b2beaa2c..78f790b4bec20a0b6e3c96bca1a8dea35653afe6 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
@@ -1,14 +1,8 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../LUCID_Digitization.h"
#include "../LUCID_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY( LUCID_DigiTop )
-DECLARE_TOOL_FACTORY( LUCID_PileUpTool )
+DECLARE_COMPONENT( LUCID_DigiTop )
+DECLARE_COMPONENT( LUCID_PileUpTool )
-DECLARE_FACTORY_ENTRIES(LUCID_Digitization) {
- DECLARE_ALGORITHM(LUCID_DigiTop)
- DECLARE_ALGTOOL(LUCID_PileUpTool)
-
-}
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx
deleted file mode 100644
index f5a77b63552b13ed1598631859df65a896567440..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LUCID_Digitization)
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/cmt/requirements b/ForwardDetectors/LUCID/LUCID_G4_SD/cmt/requirements
deleted file mode 100644
index 7c4dcad0292dac5eba04f98370a40d1a82a90e00..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package LUCID_G4_SD
-
-author Antonello Sbrizzi <sbrizzi@bo.infn.it>
-author Jacob Groth-Jensen <Jacob.Groth-Jensen@cern.ch>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasDoxygen AtlasDoxygen-* Tools
-use CxxUtils CxxUtils-* Control
-use Geant4 Geant4-* External
-use G4AtlasTools G4AtlasTools-* Simulation/G4Atlas
-use HitManagement HitManagement-* Simulation
-use LUCID_GeoModel LUCID_GeoModel-* ForwardDetectors/LUCID
-use LUCID_SimEvent LUCID_SimEvent-* ForwardDetectors/LUCID/LUCID_SimUtils
-use StoreGate StoreGate-* Control
-
-end_private
-
-apply_pattern declare_python_modules files="*.py"
-
-# define link options
-library LUCID_G4_SD *.cxx -s=components *.cxx
-apply_pattern component_library
-
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
index a0caf13f3be1819a1fc98cee18eeac396cfb6d42..0ccdf14f204f518915f12740ddb0bacea08ad351 100644
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
@@ -1,8 +1,4 @@
#include "../LUCID_SensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY(LUCID_SensitiveDetectorTool)
+DECLARE_COMPONENT( LUCID_SensitiveDetectorTool )
-DECLARE_FACTORY_ENTRIES(LUCID_G4_SD) {
- DECLARE_TOOL(LUCID_SensitiveDetectorTool);
-}
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx
deleted file mode 100644
index e384ef3e7acbe2b3307964aeb29bd7920ccb7fe5..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(LUCID_G4_SD)
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
old mode 100755
new mode 100644
index 77cfd83493d26ea3de17f089fbdc6af488c5763d..b9d2018de9e2effae452a94e41e1a1895ca683a0
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../LUCID_DetectorTool.h"
-DECLARE_TOOL_FACTORY(LUCID_DetectorTool)
+DECLARE_COMPONENT( LUCID_DetectorTool )
+
diff --git a/ForwardDetectors/LUCID/LUCID_Identifier/cmt/requirements b/ForwardDetectors/LUCID/LUCID_Identifier/cmt/requirements
deleted file mode 100644
index 3273d0291d7df6a61846af15218a804c3600f07e..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Identifier/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package LUCID_Identifier
-author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasDetDescr AtlasDetDescr-* DetectorDescription
-use Identifier Identifier-* DetectorDescription
-use IdDict IdDict-* DetectorDescription
-use CLIDSvc CLIDSvc-* Control
-
-private
-
-use AthenaKernel AthenaKernel-* Control
-use GaudiInterface GaudiInterface-* External
-
-branches LUCID_Identifier src
-
-library LUCID_Identifier *.cxx
-
-apply_pattern installed_library
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/cmt/requirements b/ForwardDetectors/LUCID/LUCID_Monitoring/cmt/requirements
deleted file mode 100755
index 396665aefcbbafa2fd51d76214c0d075e7de0c86..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package LUCID_Monitoring
-
-author Antonello Sbrizzi <Antonio.Sbrizzi@bo.infn.it>
-
-use AtlasPolicy AtlasPolicy-*
-use LUCID_RawEvent LUCID_RawEvent-* ForwardDetectors/LUCID
-use AthenaMonitoring AthenaMonitoring-* Control
-use AtlasROOT AtlasROOT-* External
-
-library LUCID_Monitoring *.cxx components/*.cxx
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py"
-
-private
-
-use GaudiInterface GaudiInterface-* External
-
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
old mode 100755
new mode 100644
index 632c254592764d943ac3068ebb2d781b3084f825..05a53b223f91b34592ef66e9ecf442311b99ba53
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
@@ -1,9 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LUCID_Monitoring/LUCID_HitsMoniTool.h"
-DECLARE_TOOL_FACTORY(LUCID_HitsMoniTool)
-
-DECLARE_FACTORY_ENTRIES(LUCID_Monitoring) {
- DECLARE_ALGTOOL(LUCID_HitsMoniTool);
-}
+DECLARE_COMPONENT( LUCID_HitsMoniTool )
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx
deleted file mode 100755
index 4128a7603854fd55151c6487c428272e10cd0b94..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LUCID_Monitoring)
diff --git a/ForwardDetectors/LUCID/LUCID_RawEvent/cmt/requirements b/ForwardDetectors/LUCID/LUCID_RawEvent/cmt/requirements
deleted file mode 100644
index 42b95dda08ef64dd8b10736f566c5fbb4094ae07..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_RawEvent/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package LUCID_RawEvent
-
-author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
-
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-
-library LUCID_RawEvent ../src/*.cxx
-
-apply_pattern installed_library
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use TestPolicy TestPolicy-*
-
-apply_pattern lcgdict dict=LUCID_RawEvent selectionfile=selection.xml headerfiles="../LUCID_RawEvent/LUCID_RawEventDict.h"
-
-end_private
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/cmt/requirements b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/cmt/requirements
deleted file mode 100644
index 33b242149d7351a4b362e7b3d790f63341d0685b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package LUCID_OpProcess
-
-author Edoardo Farina <edoardo.maria.farina@cern.ch>
-author Antonello Sbrizzi <antonio.sbrizzi@bo.infn.it>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use AthenaBaseComps AthenaBaseComps-* Control
-use G4AtlasInterfaces G4AtlasInterfaces-* Simulation/G4Atlas
-use Geant4 Geant4-* External
-
-public
-
-library LUCID_OpProcess *.cxx -s=components *.cxx
-apply_pattern component_library
-
-# Install run-time files
-apply_pattern declare_joboptions files="-s=../share *.py"
-
-apply_pattern declare_python_modules files="*.py"
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
index 214a43812d3bde0b64e7e47c7f78983c52bab899..c74bc777cbb2a6387676c60831b1add661c8ac52 100644
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../LucidPhysicsTool.h"
-DECLARE_TOOL_FACTORY( LucidPhysicsTool )
-
-DECLARE_FACTORY_ENTRIES( LUCID_OpProcess ) {
- DECLARE_TOOL( LucidPhysicsTool )
+DECLARE_COMPONENT( LucidPhysicsTool )
-}
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx
deleted file mode 100644
index 2753400e6b49bc91f3fd3f4a4ee83d58113e1728..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( LUCID_OpProcess )
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/cmt/requirements b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/cmt/requirements
deleted file mode 100644
index dc88ef826c6d99a7078f14f4aa70dfec7d4a86c2..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package LUCID_SimEvent
-
-author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use GeneratorObjects GeneratorObjects-* Generators
-use Identifier Identifier-* DetectorDescription
-use AtlasCLHEP AtlasCLHEP-* External
-use CLIDSvc CLIDSvc-* Control
-use HitManagement HitManagement-* Simulation
-
-library LUCID_SimEvent ../src/*.cxx
-
-apply_pattern installed_library
-
-private
-
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=LUCID_SimEvent selectionfile=selection.xml headerfiles=" ../LUCID_SimEvent/LUCID_SimEventDict.h"
-
-end_private
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
index 9351a1fddd08cb80e5a6ba4bae83f97d28154bc5..675ea397cb5090725887fc71296f3c13248a80a4 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
@@ -1,3 +1,4 @@
#include "../ZDC_DetTool.h"
-DECLARE_TOOL_FACTORY(ZDC_DetTool)
+DECLARE_COMPONENT( ZDC_DetTool )
+
diff --git a/ForwardDetectors/ZDC/ZDC_SD/cmt/requirements b/ForwardDetectors/ZDC/ZDC_SD/cmt/requirements
deleted file mode 100644
index 325166ba5a9eb25bf6969ddfc4d4b702d98e1e85..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZDC_SD/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package ZDC_SD
-author Soumya Mohapatra <soumya.mohapatra@stonybrook.edu>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasDoxygen AtlasDoxygen-* Tools
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use CxxUtils CxxUtils-* Control
-use Geant4 Geant4-* External
-use G4AtlasTools G4AtlasTools-* Simulation/G4Atlas
-use StoreGate StoreGate-* Control
-use ZDC_SimEvent ZDC_SimEvent-* ForwardDetectors/ZDC
-
-public
-apply_pattern declare_python_modules files="*.py"
-
-apply_pattern component_library
-library ZDC_SD *.cxx components/*.cxx
diff --git a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
index 0a80f51dfcc0f58fbc8ee3453d8858da7bb8b9ae..5e2451cd80ecd4938d2ef67d08b7d7a2e59feefa 100644
--- a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ZDC_PixelSDTool.h"
#include "../ZDC_StripSDTool.h"
-DECLARE_TOOL_FACTORY( ZDC_PixelSDTool )
-DECLARE_TOOL_FACTORY( ZDC_StripSDTool )
+DECLARE_COMPONENT( ZDC_PixelSDTool )
+DECLARE_COMPONENT( ZDC_StripSDTool )
-DECLARE_FACTORY_ENTRIES( ZDC_SD ){
- DECLARE_TOOL( ZDC_PixelSDTool );
- DECLARE_TOOL( ZDC_StripSDTool );
-}
diff --git a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx
deleted file mode 100644
index 1c865a97f78463de2368104fcf3aad55d3b1f943..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZDC_SD)
diff --git a/ForwardDetectors/ZDC/ZDC_SimEvent/cmt/requirements b/ForwardDetectors/ZDC/ZDC_SimEvent/cmt/requirements
deleted file mode 100644
index 271d2874c41dace7211c9740dcf1a307499d3a7d..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZDC_SimEvent/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package ZDC_SimEvent
-author Soumya Mohapatra <soumya.mohapatra@stonybrook.edu>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use CLIDSvc CLIDSvc-* Control
-use HitManagement HitManagement-* Simulation
-
-library ZDC_SimEvent *.cxx
-apply_pattern installed_library
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=ZDC_SimEvent selectionfile=selection.xml headerfiles="../ZDC_SimEvent/ZDC_SimEventDict.h"
-
-
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/cmt/requirements b/ForwardDetectors/ZDC/ZDC_SimuDigitization/cmt/requirements
deleted file mode 100644
index 56d71f35f74e977cf3d920fe8759dbe47f0271b8..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package ZDC_SimuDigitization
-author Soumya Mohapatra <soumya.mohapatra@stonybrook.edu>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use EventInfo EventInfo-* Event
-use HitManagement HitManagement-* Simulation
-
-use ZdcEvent ZdcEvent-* ForwardDetectors/ZDC
-use ZDC_SimEvent ZDC_SimEvent-* ForwardDetectors/ZDC
-use PileUpTools PileUpTools-* Control
-# use xAODEventInfo xAODEventInfo-* Event/xAOD
-
-library ZDC_SimuDigitization *.cxx components/*.cxx
-apply_pattern component_library
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_joboptions files="*.py"
-
-private
-
-use AtlasCLHEP AtlasCLHEP-* External
-use Identifier Identifier-* DetectorDescription
-
-
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
index ec2e7c4ec2af530fe73ad4ed96937ea339feb2c3..d7dc3091f7fece16ff53259b487fce53d7abcb3b 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
@@ -1,14 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZDC_SimuDigitization/ZDC_DigiTop.h"
#include "ZDC_SimuDigitization/ZDC_PileUpTool.h"
-DECLARE_ALGORITHM_FACTORY(ZDC_DigiTop)
+DECLARE_COMPONENT( ZDC_DigiTop )
-DECLARE_TOOL_FACTORY( ZDC_PileUpTool )
-
-DECLARE_FACTORY_ENTRIES (ZDC_SimuDigitization)
-{
- DECLARE_ALGORITHM(ZDC_DigiTop)
- DECLARE_TOOL( ZDC_PileUpTool )
-}
+DECLARE_COMPONENT( ZDC_PileUpTool )
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx
deleted file mode 100644
index 0263473c4db932bd04fa833742879bd98175bdf0..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZDC_SimuDigitization)
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/cmt/Makefile.RootCore b/ForwardDetectors/ZDC/ZdcAnalysis/cmt/Makefile.RootCore
deleted file mode 100644
index 9f3ee50d3b7bbae31ff396ceacb1c7be0a335844..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcAnalysis/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,60 +0,0 @@
-# this makefile also gets parsed by shell scripts
-# therefore it does not support full make syntax and features
-# edit with care
-
-# for full documentation check:
-# https://twiki.cern.ch/twiki/bin/viewauth/Atlas/RootCore#Package_Makefile
-
-
-# the name of the package:
-PACKAGE = ZdcAnalysis
-
-# the libraries to link with this one:
-PACKAGE_PRELOAD = Minuit
-
-# additional compilation flags to pass (not propagated to dependent packages):
-PACKAGE_CXXFLAGS =
-
-# additional compilation flags to pass (propagated to dependent packages):
-PACKAGE_OBJFLAGS =
-
-# additional linker flags to pass (for compiling the library):
-PACKAGE_LDFLAGS =
-
-# additional linker flags to pass (for compiling binaries):
-PACKAGE_BINFLAGS =
-
-# additional linker flags to pass (propagated to client libraries):
-PACKAGE_LIBFLAGS =
-
-# the list of packages we depend on:
-PACKAGE_DEP = xAODRootAccess xAODBase xAODForward xAODEventInfo AsgTools xAODTrigL1Calo PathResolver
-
-# the list of packages we use if present, but that we can work without :
-PACKAGE_TRYDEP =
-
-# list pattern of scripts to link directly into binary path:
-PACKAGE_SCRIPTS =
-
-# whether to use pedantic compilation:
-PACKAGE_PEDANTIC = 1
-
-# whether to turn *off* optimization (set to dict to do it only for
-# dictionaries):
-PACKAGE_NOOPT = 0
-
-# whether to build no library (needs to be set if no source files are
-# present):
-PACKAGE_NOCC = 0
-
-# whether we build a reflex dictionary:
-PACKAGE_REFLEX = 0
-
-# the list of all unit tests that should be called in recursive testing,
-# i.e. in unit tests that call other unit tests
-# for that unit tests need to pass on all machines, and run very fast
-PACKAGE_RECURSIVE_UT =
-
-
-
-include $(ROOTCOREDIR)/Makefile-common
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/cmt/requirements b/ForwardDetectors/ZDC/ZdcAnalysis/cmt/requirements
deleted file mode 100644
index 937d3d8020ad5bfe478d83af063eefe98e7eaaf5..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcAnalysis/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package ZdcAnalysis
-
-author Peter Steinberg <peter.steinberg@bnl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-
-use AsgTools AsgTools-* Control/AthToolSupport
-use AtlasROOT AtlasROOT-* External
-use GaudiInterface GaudiInterface-* External
-use xAODForward xAODForward-* Event/xAOD
-use xAODTrigL1Calo xAODTrigL1Calo-* Event/xAOD
-
-private
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-use PathResolver PathResolver-* Tools
-end_private
-
-library ZdcAnalysis ../Root/*.cxx
-apply_pattern component_library
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_joboptions files="*.py"
-
-
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
index ff4c36e6867dd3a5e7f81a0cb2c72a5cd3820e3a..bcc716a43171692a3eefbafcba7e40be102796b3 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
@@ -1,16 +1,9 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
#ifndef XAOD_STANDALONE
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZdcAnalysis/ZdcAnalysisTool.h"
-DECLARE_TOOL_FACTORY (ZDC::ZdcAnalysisTool)
+DECLARE_COMPONENT( ZDC::ZdcAnalysisTool )
-DECLARE_FACTORY_ENTRIES (ZdcAnalysis) {
- DECLARE_TOOL (ZDC::ZdcAnalysisTool)
-}
#endif
+
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/cmt/requirements b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/cmt/requirements
deleted file mode 100644
index f6979406416cb4868fd0cacdc79e400f753db54b..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/cmt/requirements
+++ /dev/null
@@ -1,35 +0,0 @@
-package ZdcByteStream
-
-use AtlasPolicy AtlasPolicy-*
-use DataModel DataModel-* Control
-use GaudiInterface GaudiInterface-* External
-
-author Marco Leite <leite@cern.ch>
-author Peter Steinberg <peter.steinberg@bnl.gov>
-
-public
-apply_pattern dual_use_library files="*.cxx"
-apply_pattern declare_joboptions files="*.py"
-
-use DataCollection DataCollection-* External
-use AsgTools AsgTools-* Control/AthToolSupport
-use ByteStreamCnvSvcBase ByteStreamCnvSvcBase-* Event
-use ByteStreamData ByteStreamData-* Event
-use xAODTrigL1Calo xAODTrigL1Calo-* Event/xAOD
-#use xAODForward xAODForward-* Event/xAOD
-use AthenaBaseComps AthenaBaseComps-* Control
-use ZdcEvent ZdcEvent-* ForwardDetectors/ZDC
-
-private
-use StoreGate StoreGate-* Control
-use SGTools SGTools-* Control
-
-use CLIDSvc CLIDSvc-* Control
-use ZdcConditions ZdcConditions-* ForwardDetectors/ZDC
-use TrigT1Interfaces TrigT1Interfaces-* Trigger/TrigT1
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=ZdcByteStream selectionfile=selection.xml headerfiles="../ZdcByteStream/ZdcByteStreamDict.h"
-
-end_private
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
index 8136e4b66f1821746ee7a83383f7274ae5202707..c50568d7645bead64d7abb36da5eb66dec352e77 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ZdcByteStream/ZdcByteStreamCnv.h"
#include "ZdcByteStream/ZdcByteStreamTool.h"
#include "ZdcByteStream/ZdcDataAccessV2.h"
@@ -16,23 +14,12 @@
#include "ZdcByteStream/ZdcL1CaloErrorByteStreamTool.h"
-DECLARE_TOOL_FACTORY (ZdcByteStreamTool)
-DECLARE_TOOL_FACTORY (ZdcByteStreamReadV1V2Tool)
-DECLARE_TOOL_FACTORY (ZdcL1CaloErrorByteStreamTool)
-DECLARE_TOOL_FACTORY (ZdcDataAccessV2)
-DECLARE_CONVERTER_FACTORY (ZdcByteStreamCnv)
-DECLARE_ALGORITHM_FACTORY (ZdcByteStreamTester)
-DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawData)
-DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawDataV2)
-
-DECLARE_FACTORY_ENTRIES (ZdcByteStream) {
- DECLARE_CONVERTER (ZdcByteStreamCnv)
- DECLARE_TOOL (ZdcByteStreamTool)
- DECLARE_TOOL (ZdcByteStreamReadV1V2Tool)
- DECLARE_TOOL (ZdcL1CaloErrorByteStreamTool)
- DECLARE_TOOL (ZdcDataAccessV2)
- DECLARE_ALGORITHM (ZdcByteStreamTester)
- DECLARE_ALGORITHM (ZdcByteStreamRawData)
- DECLARE_ALGORITHM (ZdcByteStreamRawDataV2)
-}
+DECLARE_COMPONENT( ZdcByteStreamTool )
+DECLARE_COMPONENT( ZdcByteStreamReadV1V2Tool )
+DECLARE_COMPONENT( ZdcL1CaloErrorByteStreamTool )
+DECLARE_COMPONENT( ZdcDataAccessV2 )
+DECLARE_CONVERTER_FACTORY( ZdcByteStreamCnv )
+DECLARE_COMPONENT( ZdcByteStreamTester )
+DECLARE_COMPONENT( ZdcByteStreamRawData )
+DECLARE_COMPONENT( ZdcByteStreamRawDataV2 )
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx
deleted file mode 100644
index d56f4874854fa181af8423de39bcac09f3bdd4e8..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZdcByteStream)
-
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/cmt/requirements b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/cmt/requirements
deleted file mode 100755
index 3cf0a0543a7edc020012124e612c4252f65240f9..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,31 +0,0 @@
-package ZdcEventAthenaPool
-
-author Peter Steinberg <Peter.Alan.Steinberg@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use GaudiInterface GaudiInterface-* External
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use ZdcEvent ZdcEvent-* ForwardDetectors/ZDC
-use ZDC_SimEvent ZDC_SimEvent-* ForwardDetectors/ZDC
-use ZdcEventTPCnv ZdcEventTPCnv-* ForwardDetectors/ZDC/ZdcCnv
-
-apply_pattern poolcnv files="-s=${ZdcEvent_root}/ZdcEvent ZdcDigitsCollection.h ZdcRawChannelCollection.h -s=${ZDC_SimEvent_root}/ZDC_SimEvent ZDC_SimStripHit_Collection.h ZDC_SimPixelHit_Collection.h"
-
-macro_append ZdcEventAthenaPoolPoolCnv_shlibflags "$(ZdcEventAthenaPool_dict_linkopts)"
-
-
-apply_pattern declare_joboptions files="*.py"
-
-
-private
-use TestTools TestTools-* AtlasTest -no_auto_imports
-
-
-apply_pattern athenarun_test \
- name="ZdcEventTPCnv_15.6.7" \
- options="ZdcEventAthenaPool/ZdcEventTPCnv_15.6.7_test.py" \
- pre_script="${ATHENAPOOLUTILITIESROOT}/share/pre_tpcnvtest.sh ZdcEventTPCnv_15.6.7" \
- post_script="${ATHENAPOOLUTILITIESROOT}/share/post_tpcnvtest.sh ZdcEventTPCnv_15.6.7"
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/cmt/requirements b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/cmt/requirements
deleted file mode 100644
index ac44760b02e604451a6300093894caffbc0fc8c3..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventTPCnv/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-package ZdcEventTPCnv
-
-author Peter Steinberg <peter.steinberg@bnl.gov
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AtlasReflex AtlasReflex-* External
-use ZdcEvent ZdcEvent-* ForwardDetectors/ZDC
-use ZDC_SimEvent ZDC_SimEvent-* ForwardDetectors/ZDC
-#use EventContainers EventContainers-* Event
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-
-private
-use GaudiInterface GaudiInterface-* External
-use CxxUtils CxxUtils-* Control
-use Identifier Identifier-* DetectorDescription
-
-public
-
-library ZdcEventTPCnv *.cxx
-apply_pattern installed_library
-
-apply_pattern lcgdict dict=ZdcEventTPCnv selectionfile=selection.xml headerfiles="../ZdcEventTPCnv/ZdcEventTPCnvDict.h"
-
-
-private
-use TestTools TestTools-* AtlasTest
-
-apply_pattern UnitTest_run unit_test=ZdcDigitsCnv_p1
-apply_pattern UnitTest_run unit_test=ZdcDigitsCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ZdcRawChannelCnv_p1
-apply_pattern UnitTest_run unit_test=ZdcRawChannelCollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ZDC_SimPixelHitCnv_p1
-apply_pattern UnitTest_run unit_test=ZDC_SimPixelHit_CollectionCnv_p1
-apply_pattern UnitTest_run unit_test=ZDC_SimStripHitCnv_p1
-apply_pattern UnitTest_run unit_test=ZDC_SimStripHit_CollectionCnv_p1
diff --git a/ForwardDetectors/ZDC/ZdcConditions/cmt/requirements b/ForwardDetectors/ZDC/ZdcConditions/cmt/requirements
deleted file mode 100644
index 9dc739cb260db4c966246baffb262e4e3c8bccb1..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcConditions/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package ZdcConditions
-
-author Peter Steinberg <peter.steinberg@bnl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use StoreGate StoreGate-* Control
-use Identifier Identifier-* DetectorDescription
-use ZdcIdentifier ZdcIdentifier-* ForwardDetectors/ZDC
-use GaudiInterface GaudiInterface-* External
-
-library ZdcConditions *.cxx
-apply_pattern installed_library
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use GeoModelInterfaces GeoModelInterfaces-* DetectorDescription/GeoModel
-
-end_private
diff --git a/ForwardDetectors/ZDC/ZdcEvent/cmt/requirements b/ForwardDetectors/ZDC/ZdcEvent/cmt/requirements
deleted file mode 100644
index 89880836a614064875f510380e1767ca12cf5ac7..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcEvent/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package ZdcEvent
-
-author William H. Bell <W.Bell@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use DataModel DataModel-* Control
-use CLIDSvc CLIDSvc-* Control
-use Identifier Identifier-* DetectorDescription
-#use StoreGate StoreGate-* Control
-#use EventContainers EventContainers-* Event
-#use ZdcConditions ZdcConditions-* ForwardDetectors/ZDC
-#use ZdcIdentifier ZdcIdentifier-* ForwardDetectors/ZDC
-
-library ZdcEvent *.cxx
-apply_pattern installed_library
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use ZdcConditions ZdcConditions-* ForwardDetectors/ZDC
-use ZdcIdentifier ZdcIdentifier-* ForwardDetectors/ZDC
-
-apply_pattern lcgdict dict=ZdcEvent selectionfile=selection.xml \
- headerfiles="../ZdcEvent/ZdcEventDict.h"
-
-# dataLinks="ZdcRawData"
-
-end_private
diff --git a/ForwardDetectors/ZDC/ZdcIdentifier/cmt/requirements b/ForwardDetectors/ZDC/ZdcIdentifier/cmt/requirements
deleted file mode 100644
index 9dd4ff334b0e615b3061eb3dcb2ebcfe9e142507..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcIdentifier/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package ZdcIdentifier
-
-## To some extent build on the ID helper class for the inner detector
-
-####################################################################
-author Jacob Groth-Jensen <jacob.groth-jensen@hep.lu.se>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasDetDescr AtlasDetDescr-* DetectorDescription
-use Identifier Identifier-* DetectorDescription
-use IdDict IdDict-* DetectorDescription
-use CLIDSvc CLIDSvc-* Control
-
-
-branches ZdcIdentifier src
-
-library ZdcIdentifier *.cxx
-
-apply_pattern installed_library
-
-private
-use GaudiInterface GaudiInterface-* External
-use AthenaKernel AthenaKernel-* Control
-use IdDictParser IdDictParser-* DetectorDescription
-
-application test_zdc_id ../test/test_zdc_id.cxx
-macro_append test_zdc_id_dependencies ZdcIdentifier
-
-####################################################################
-
diff --git a/ForwardDetectors/ZDC/ZdcRec/cmt/requirements b/ForwardDetectors/ZDC/ZdcRec/cmt/requirements
deleted file mode 100644
index 478ab933238f4bc7b8c65150ff68d55488ccdd46..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcRec/cmt/requirements
+++ /dev/null
@@ -1,47 +0,0 @@
-package ZdcRec
-
-author Marco Leite <leite@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-apply_pattern dual_use_library files="*.cxx"
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-#library ZdcRec *.cxx components/*.cxx
-#apply_pattern component_library
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use DataCollection DataCollection-* External
-use AsgTools AsgTools-* Control/AthToolSupport
-use AtlasGSL AtlasGSL-* External
-use ZdcEvent ZdcEvent-* ForwardDetectors/ZDC
-use xAODTrigL1Calo xAODTrigL1Calo-* Event/xAOD
-use xAODForward xAODForward-* Event/xAOD
-use ZdcAnalysis ZdcAnalysis-* ForwardDetectors/ZDC
-
-private
-
-use ZdcIdentifier ZdcIdentifier-* ForwardDetectors/ZDC
-use ZdcConditions ZdcConditions-* ForwardDetectors/ZDC
-use StoreGate StoreGate-* Control
-use AtlasROOT AtlasROOT-* External
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-use ZdcByteStream ZdcByteStream-* ForwardDetectors/ZDC/ZdcCnv
-
-#apply_pattern lcgdict dict=ZdcRec selectionfile=selection.xml headerfiles="../ZdcRecStream/ZdcRecDict.h"
-
-#public
-#apply_pattern dual_use_library files=*.cxx
-#apply_pattern declare_joboptions files="*.py"
-#apply_pattern declare_python_modules files="*.py"
-#apply_tag ROOTBasicLibs
-#apply_tag ROOTMathLibs
-#apply_tag ROOTSTLDictLibs
-#apply_tag ROOTGraphicsLibs
-#apply_tag ROOTTableLibs
-
-end_private
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
index 8498383ce6dd81c1f898fd57a6daaf0feade3440..06bbf781cdeb71c164ca4fbc04a5e3a66541bee4 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ZdcRec/ZdcRec.h"
#include "ZdcRec/ZdcRecV2.h"
#include "ZdcRec/ZdcRecV3.h"
@@ -8,19 +6,10 @@
#include "ZdcRec/ZdcRecNoiseTool.h"
#include "ZdcRec/ZdcSignalSinc.h"
-DECLARE_ALGORITHM_FACTORY (ZdcRec)
-DECLARE_ALGORITHM_FACTORY (ZdcRecV2)
-DECLARE_ALGORITHM_FACTORY (ZdcRecV3)
-DECLARE_TOOL_FACTORY (ZdcRecChannelTool)
-DECLARE_TOOL_FACTORY (ZdcRecChannelToolV2)
-DECLARE_TOOL_FACTORY (ZdcRecNoiseTool)
-
-DECLARE_FACTORY_ENTRIES (ZdcRec) {
- DECLARE_TOOL (ZdcRecChannelTool)
- DECLARE_TOOL (ZdcRecChannelToolV2)
- DECLARE_TOOL (ZdcRecNoiseTool)
- DECLARE_ALGORITHM (ZdcRec)
- DECLARE_ALGORITHM (ZdcRecV2)
- DECLARE_ALGORITHM (ZdcRecV3)
-}
+DECLARE_COMPONENT( ZdcRec )
+DECLARE_COMPONENT( ZdcRecV2 )
+DECLARE_COMPONENT( ZdcRecV3 )
+DECLARE_COMPONENT( ZdcRecChannelTool )
+DECLARE_COMPONENT( ZdcRecChannelToolV2 )
+DECLARE_COMPONENT( ZdcRecNoiseTool )
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx
deleted file mode 100644
index ba0976fe9b45fa8b1741535300bf8e3273df76bb..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZdcRec)
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
index fa0f327bb63251f6dc3cc9d054d41bf6d64ff3f8..cb4b40c24f5984ae9c14d75f84c2f4a6f8062217 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
@@ -1,11 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ByteStreamEmonSvc/ByteStreamEmonInputSvc.h"
-DECLARE_SERVICE_FACTORY( ByteStreamEmonInputSvc )
+DECLARE_COMPONENT( ByteStreamEmonInputSvc )
-DECLARE_FACTORY_ENTRIES( ByteStreamEmonSvc ) {
- DECLARE_SERVICE ( ByteStreamEmonInputSvc )
-}
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx
deleted file mode 100644
index e9c746b820581ae9142784a538aeb50c8588fc08..0000000000000000000000000000000000000000
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ByteStreamEmonSvc )
-
-
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
old mode 100755
new mode 100644
index b4011fd41ea6a3acdd5709ed306478330a711b35..9ee255197dd56c1629fbb6142610545186a39f86
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
@@ -1,11 +1,6 @@
#include "TrigExL2muCalibTest/L2muCalibTest.h"
#include "TrigExL2muCalibTest/TrigPartialEBFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( L2muCalibTest )
-DECLARE_ALGORITHM_FACTORY( TrigPartialEBFilter )
+DECLARE_COMPONENT( L2muCalibTest )
+DECLARE_COMPONENT( TrigPartialEBFilter )
-DECLARE_FACTORY_ENTRIES(TrigExL2muCalibTest) {
- DECLARE_ALGORITHM( L2muCalibTest );
- DECLARE_ALGORITHM( TrigPartialEBFilter );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx
deleted file mode 100755
index bf06fa07714af59e66cd5365ebf284fccca80987..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExL2muCalibTest)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
old mode 100755
new mode 100644
index 5d34ad59de639e41c93c281f3ddd9678d94908bf..9def105eb61f4422c7a1621ee7f98230f39d1e09
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
@@ -1,8 +1,4 @@
#include "TrigExMTHelloWorld/MTHelloWorld.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( MTHelloWorld )
+DECLARE_COMPONENT( MTHelloWorld )
-DECLARE_FACTORY_ENTRIES(TrigExMTHelloWorld) {
- DECLARE_ALGORITHM( MTHelloWorld );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx
deleted file mode 100755
index ac59b3791827570c7a5ef068804ae1945961724a..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHelloWorld)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
old mode 100755
new mode 100644
index 8ee95c20f06cd683b3ed260bd685b4186af110c8..b45bcb5dc6811586d69f7661e06c26859e09b594
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
@@ -1,8 +1,4 @@
#include "TrigExMTHelloWorldLvl1/MTHelloWorldLvl1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( MTHelloWorldLvl1 )
+DECLARE_COMPONENT( MTHelloWorldLvl1 )
-DECLARE_FACTORY_ENTRIES(TrigExMTHelloWorldLvl1) {
- DECLARE_ALGORITHM( MTHelloWorldLvl1 );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx
deleted file mode 100755
index 2050e7fbde0ef77b9af99f38f3bdec32847ea1da..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHelloWorldLvl1)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
old mode 100755
new mode 100644
index 9895055aa01f103790eaaf157dfdc6239ac94925..e0e4182e9f0c6838f6881b5b7d3faf95042afd42
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
@@ -1,14 +1,8 @@
#include "TrigExMTHistNtup/MTHist.h"
#include "TrigExMTHistNtup/MTNtup.h"
#include "TrigExMTHistNtup/MTTHist.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( MTHist )
-DECLARE_ALGORITHM_FACTORY( MTNtup )
-DECLARE_ALGORITHM_FACTORY( MTTHist )
+DECLARE_COMPONENT( MTHist )
+DECLARE_COMPONENT( MTNtup )
+DECLARE_COMPONENT( MTTHist )
-DECLARE_FACTORY_ENTRIES(TrigExMTHistNtup) {
- DECLARE_ALGORITHM( MTHist );
- DECLARE_ALGORITHM( MTNtup );
- DECLARE_ALGORITHM( MTTHist );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx
deleted file mode 100755
index 014527fcb7f8c43ed24424fd8e3d1777ec65e0eb..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHistNtup)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
old mode 100755
new mode 100644
index 7455949fcf5f06817603c68dbd56111ed9970112..d66f2baecfc76419c617fe2b900f9b8a948a23f2
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigExPartialEB/MTCalibPeb.h"
-DECLARE_ALGORITHM_FACTORY( MTCalibPeb )
+DECLARE_COMPONENT( MTCalibPeb )
-DECLARE_FACTORY_ENTRIES(TrigExPartialEB) {
- DECLARE_ALGORITHM( MTCalibPeb )
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx
deleted file mode 100755
index 2b23ed31f0529c2a5bffdddec98f73853f12d696..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExPartialEB)
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
index cde6e20dfa01b4fc2977e3933611f30aa7703339..cc6b8886284f81d3aaa0319132661e6b01f64782 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigServices/TrigMessageSvc.h"
#include "../TrigMonTHistSvc.h"
#include "TrigServices/HltEventLoopMgr.h"
@@ -8,23 +7,12 @@
#include "../TrigPreFlightCheck.h"
#include "../TrigCOOLUpdateHelper.h"
-DECLARE_SERVICE_FACTORY( TrigMessageSvc )
-DECLARE_SERVICE_FACTORY( TrigMonTHistSvc )
-DECLARE_SERVICE_FACTORY( TrigIS )
-DECLARE_SERVICE_FACTORY( HltEventLoopMgr )
-DECLARE_SERVICE_FACTORY( HltROBDataProviderSvc )
-DECLARE_TOOL_FACTORY( TrigISHelper )
-DECLARE_TOOL_FACTORY( TrigPreFlightCheck )
-DECLARE_TOOL_FACTORY( TrigCOOLUpdateHelper )
+DECLARE_COMPONENT( TrigMessageSvc )
+DECLARE_COMPONENT( TrigMonTHistSvc )
+DECLARE_COMPONENT( TrigIS )
+DECLARE_COMPONENT( HltEventLoopMgr )
+DECLARE_COMPONENT( HltROBDataProviderSvc )
+DECLARE_COMPONENT( TrigISHelper )
+DECLARE_COMPONENT( TrigPreFlightCheck )
+DECLARE_COMPONENT( TrigCOOLUpdateHelper )
-
-DECLARE_FACTORY_ENTRIES( TrigServices ) {
- DECLARE_SERVICE( TrigMessageSvc );
- DECLARE_SERVICE( TrigMonTHistSvc );
- DECLARE_SERVICE( TrigIS );
- DECLARE_SERVICE( HltEventLoopMgr );
- DECLARE_SERVICE( HltROBDataProviderSvc );
- DECLARE_TOOL( TrigISHelper );
- DECLARE_TOOL( TrigPreFlightCheck );
- DECLARE_TOOL( TrigCOOLUpdateHelper );
-}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx
deleted file mode 100644
index 0e7b58ee4de342f6381f709065d8155ae555f1b3..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrigServices )
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
index f9201f2fd9d83f2db1668c172898128861463222..719ef868ca87bb80a2f2a5211eebc3a3ebc67a48 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
@@ -1,17 +1,10 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigOnlineMonitor/TrigROBMonitor.h"
#include "TrigOnlineMonitor/TrigMuCTPiROBMonitor.h"
#include "src/TrigALFAROBMonitor.h"
#include "src/TrigL1TopoROBMonitor.h"
-DECLARE_ALGORITHM_FACTORY( TrigROBMonitor )
-DECLARE_ALGORITHM_FACTORY( TrigMuCTPiROBMonitor )
-DECLARE_ALGORITHM_FACTORY( TrigALFAROBMonitor )
-DECLARE_ALGORITHM_FACTORY( TrigL1TopoROBMonitor )
+DECLARE_COMPONENT( TrigROBMonitor )
+DECLARE_COMPONENT( TrigMuCTPiROBMonitor )
+DECLARE_COMPONENT( TrigALFAROBMonitor )
+DECLARE_COMPONENT( TrigL1TopoROBMonitor )
-DECLARE_FACTORY_ENTRIES(TrigOnlineMonitor) {
- DECLARE_ALGORITHM( TrigROBMonitor )
- DECLARE_ALGORITHM( TrigMuCTPiROBMonitor )
- DECLARE_ALGORITHM( TrigALFAROBMonitor )
- DECLARE_ALGORITHM( TrigL1TopoROBMonitor )
-}
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx
deleted file mode 100644
index 1ba3f653356808e0ce14c9332a092b86c2604b8c..0000000000000000000000000000000000000000
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigOnlineMonitor)
diff --git a/LumiBlock/LumiBlockComps/cmt/requirements b/LumiBlock/LumiBlockComps/cmt/requirements
deleted file mode 100644
index 698f42717292c44bf4e9205de6c79f538f536ec0..0000000000000000000000000000000000000000
--- a/LumiBlock/LumiBlockComps/cmt/requirements
+++ /dev/null
@@ -1,55 +0,0 @@
-package LumiBlockComps
-
-author Marjorie Shapiro <mdshapiro@lbl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-
-branches run
-
-use GaudiInterface GaudiInterface-* External
-use AthenaPoolKernel AthenaPoolKernel-* Database/AthenaPOOL
-use AtlasROOT AtlasROOT-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-use AthenaKernel AthenaKernel-* Control
-use AtlasCORAL AtlasCORAL-* External
-use StoreGate StoreGate-* Control
-
-#use LumiCalc LumiCalc-* LumiBlock
-use_ifndef pplist="XAOD_ANALYSIS" pkg="LumiBlock/LumiCalc"
-#use CoolLumiUtilities CoolLumiUtilities-* Database
-use_ifndef pplist="XAOD_ANALYSIS" pkg="Database/CoolLumiUtilities"
-use xAODLuminosity xAODLuminosity-* Event/xAOD
-#use LumiBlockData LumiBlockData-* LumiBlock
-#use_ifndef pplist="XAOD_ANALYSIS" pkg="LumiBlock/LumiBlockData"
-
-private
-use AtlasCOOL AtlasCOOL-* External
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use CoraCool CoraCool-* Database -no_auto_imports
-#use CoolConvUtilities CoolConvUtilities-* Database -no_auto_imports
-#use_ifndef pplist="XAOD_ANALYSIS" pkg="Database/CoolConvUtilities"
-use DBDataModel DBDataModel-* Database/AthenaPOOL
-use EventInfo EventInfo-* Event
-use GoodRunsLists GoodRunsLists-* DataQuality
-end_private
-
-# Create a dual_use library since the lcgdict pattern doesn't work with component libraries using cmake.
-# This pollutes the linkopts for clients, but is otherwise harmless.
-macro LumiBlockComps_filesToCompile "*.cxx ../Root/*.cxx" AthAnalysisBase "xAOD2NtupLumiSvc.cxx CreateLumiBlockCollectionFromFile.cxx ILumiCalcSvc.cxx ../Root/*.cxx"
-apply_pattern dual_use_library files=$(LumiBlockComps_filesToCompile)
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_joboptions files="*.py"
-#apply_pattern declare_scripts files="LumiCalc.py"
-
-# Create dictionary for LumiBlockComps
-private
-use AtlasReflex AtlasReflex-* External
-apply_pattern lcgdict dict=LumiBlockComps selectionfile=selection.xml headerfiles="../LumiBlockComps/LumiBlockCompsDict.h"
-end_private
-
-use_if tag=AthAnalysisBase pkg=xAODRootAccess ver=xAODRootAccess-* root=Control
-application getLumi ../util/getLumi.cxx
-macro_append getLumi_dependencies " LumiBlockCompsLib "
-
-
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
index 0f9873e8865436402e3e9fa775c53b6787c4f729..b1a196e09d667425bf98b54db8317e3635e96237 100644
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
+++ b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LumiBlockComps/CreateLumiBlockCollectionFromFile.h"
//#include "LumiBlockComps/CreateAANTFromLumiBlockCollection.h"
#include "LumiBlockComps/LumiBlockMetaDataTool.h"
@@ -13,34 +12,18 @@
#include "LumiBlockComps/LumiBlockTester.h"
#endif
-DECLARE_ALGORITHM_FACTORY( CreateLumiBlockCollectionFromFile )
-//DECLARE_ALGORITHM_FACTORY( CreateAANTFromLumiBlockCollection )
+DECLARE_COMPONENT( CreateLumiBlockCollectionFromFile )
+//DECLARE_COMPONENT( CreateAANTFromLumiBlockCollection )
#ifndef XAOD_ANALYSIS
-DECLARE_ALGORITHM_FACTORY( LumiBlockMuWriter )
-DECLARE_ALGORITHM_FACTORY( LumiBlockTester )
-DECLARE_TOOL_FACTORY( LumiBlockMuTool )
-DECLARE_TOOL_FACTORY( LuminosityTool )
-DECLARE_TOOL_FACTORY( TrigLivefractionTool )
-DECLARE_SERVICE_FACTORY( LumiCalcSvc )
+DECLARE_COMPONENT( LumiBlockMuWriter )
+DECLARE_COMPONENT( LumiBlockTester )
+DECLARE_COMPONENT( LumiBlockMuTool )
+DECLARE_COMPONENT( LuminosityTool )
+DECLARE_COMPONENT( TrigLivefractionTool )
+DECLARE_COMPONENT( LumiCalcSvc )
#endif
-DECLARE_TOOL_FACTORY( LumiBlockMetaDataTool )
+DECLARE_COMPONENT( LumiBlockMetaDataTool )
#include "../xAOD2NtupLumiSvc.h"
-DECLARE_SERVICE_FACTORY( xAOD2NtupLumiSvc )
-
-DECLARE_FACTORY_ENTRIES(LumiBlockComps) {
- DECLARE_ALGORITHM( CreateLumiBlockCollectionFromFile );
- // DECLARE_ALGORITHM( CreateAANTFromLumiBlockCollection );
- DECLARE_ALGTOOL( LumiBlockMetaDataTool);
- DECLARE_SERVICE( xAOD2NtupLumiSvc );
-
-#ifndef XAOD_ANALYSIS
- DECLARE_ALGORITHM( LumiBlockMuWriter );
- DECLARE_ALGORITHM( LumiBlockTester );
- DECLARE_ALGTOOL( LumiBlockMuTool);
- DECLARE_ALGTOOL( LuminosityTool);
- DECLARE_ALGTOOL( TrigLivefractionTool);
- DECLARE_SERVICE( LumiCalcSvc );
-#endif
-}
+DECLARE_COMPONENT( xAOD2NtupLumiSvc )
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx
deleted file mode 100644
index d63dc04f581b65f99466e5e48d1eab12fb4a4af3..0000000000000000000000000000000000000000
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LumiBlockComps)
diff --git a/LumiBlock/LumiBlockData/cmt/requirements b/LumiBlock/LumiBlockData/cmt/requirements
deleted file mode 100755
index c87995898d5049dc025696d986706f3100979991..0000000000000000000000000000000000000000
--- a/LumiBlock/LumiBlockData/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package LumiBlockData
-
-author Marjorie Shapiro <mdshapiro@lbl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use DataModel DataModel-* Control
-use CLIDSvc CLIDSvc-* Control
-use AthenaKernel AthenaKernel-* Control
-
-library LumiBlockData *.cxx
-apply_pattern installed_library
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-# Pattern to build the dict lib. User should create a single header
-# file: <package>Dict.h which includes all other .h files. See MissingETDict
-# A selection file must be created by hand. This file lists the
-# classes to be added to the dictionary, and which fields are
-# transient. It should be put in ../<package> dir and is conventionally called
-# selection.xml.
-apply_pattern lcgdict dict=LumiBlockData \
-selectionfile=selection.xml \
-headerfiles="../LumiBlockData/LumiBlockDataDict.h"
-end_private
diff --git a/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/cmt/requirements b/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/cmt/requirements
deleted file mode 100755
index 6550313f2581558dc7da43006cfe3927a6a55124..0000000000000000000000000000000000000000
--- a/LumiBlock/LumiBlockPers/LumiBlockAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package LumiBlockAthenaPool
-
-author Marjorie Shapiro <mdshapiro@lbl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-private
-use LumiBlockData LumiBlockData-* LumiBlock
-use LumiBlockTPCnv LumiBlockTPCnv-* LumiBlock/LumiBlockPers
-end_private
-
-apply_pattern poolcnv files="-s=${LumiBlockData_root}/LumiBlockData \
- LumiBlockCollection.h "
-
diff --git a/LumiBlock/LumiBlockPers/LumiBlockTPCnv/cmt/requirements b/LumiBlock/LumiBlockPers/LumiBlockTPCnv/cmt/requirements
deleted file mode 100755
index b72019d1f8abd0d420d2e188c8b870108534944a..0000000000000000000000000000000000000000
--- a/LumiBlock/LumiBlockPers/LumiBlockTPCnv/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package LumiBlockTPCnv
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-use LumiBlockData LumiBlockData-* LumiBlock
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasReflex AtlasReflex-* External
-use AthenaKernel AthenaKernel-* Control
-end_private
-
-branches LumiBlockTPCnv src
-library LumiBlockTPCnv *.cxx
-apply_pattern tpcnv_library
-
-private
-apply_pattern lcgdict dict=LumiBlockTPCnv selectionfile=selection.xml headerfiles="../LumiBlockTPCnv/LumiBlockTPCnvDict.h"
-##apply_pattern lcgdict dict=ARA_LumiBlockTPCnv selectionfile=ARA_selection.xml headerfiles="../LumiBlockTPCnv/LumiBlockTPCnvDict.h"
-##apply_pattern lcgdict dict=OLD_LumiBlockTPCnv selectionfile=OLD_selection.xml headerfiles="../LumiBlockTPCnv/LumiBlockTPCnvDict.h"
-
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=LumiBlockRangeCnv_p1
-apply_pattern UnitTest_run unit_test=LumiBlockRangeCnv_p2
-
-
-end_private
diff --git a/MagneticField/BFieldData/cmt/requirements b/MagneticField/BFieldData/cmt/requirements
deleted file mode 100755
index e292b7880c14e59ca5f1df4ebf1f578764bcd303..0000000000000000000000000000000000000000
--- a/MagneticField/BFieldData/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package BFieldData
-
-author Marc Virchaux <virchaux@hep.saclay.cea.fr>
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_runtime_extras extras=" bmagatlas02.data \
- bmagatlas03_test2.data \
- magempty \
- magfieldfull \
- mbps1-200-source.data \
- bmagatlas04_test1.data \
- bmagatlas05_test2.data \
- bmagatlas05_test2_10250Amp.data \
- bmagatlas05_test2_NoSolenoid.data \
- bmagatlas_08_full45SymOld.data.bz2\
- geommap7730.grid \
- map7730best.grid \
- map7730bes2.grid \
- bmagatlas04_test1_WithNoToroid_OnlySolAndIron.data \
- mbps1-all-id-800-mbps2-muons-800.data "
-
-apply_pattern no_include_path
-
diff --git a/MagneticField/MagFieldInterfaces/cmt/requirements b/MagneticField/MagFieldInterfaces/cmt/requirements
deleted file mode 100644
index a8f52db37d00c57b1e6711ca67433487567ad4b5..0000000000000000000000000000000000000000
--- a/MagneticField/MagFieldInterfaces/cmt/requirements
+++ /dev/null
@@ -1,32 +0,0 @@
-package MagFieldInterfaces
-author <elmar.ritsch@cern.ch>
-
-manager Niels van Eldik <niels.van.eldik@cern.ch>
-manager Robert Langenberg <robert.johannes.langenberg@cern.ch>
-manager Masahiro Morii <masahiro_morii@harvard.edu>
-manager Elmar Ritsch <elmar.ritsch@cern.ch>
-manager Valerio IPpolito <valerio.ippolito@cern.ch>
-
-#################################################################
-# public use statements
-#################################################################
-public
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-# Declare this package as a cmake metalibrary so that the libraries and header files from
-# package it depends on are available to its clients. Transparent to CMT
-apply_pattern cmake_add_command command=metalibrary
-
-#################################################################
-# private use statements
-#################################################################
-private
-
-end_private
-
-#private
-## use this to activate debug info in this package:
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
diff --git a/MagneticField/MagFieldServices/cmt/requirements b/MagneticField/MagFieldServices/cmt/requirements
deleted file mode 100644
index aead0fcca43bafc80af18ebadd3e4a21dc21da62..0000000000000000000000000000000000000000
--- a/MagneticField/MagFieldServices/cmt/requirements
+++ /dev/null
@@ -1,47 +0,0 @@
-package MagFieldServices
-author <elmar.ritsch@cern.ch>
-
-manager Niels van Eldik <niels.van.eldik@cern.ch>
-manager Robert Langenberg <robert.johannes.langenberg@cern.ch>
-manager Masahiro Morii <masahiro_morii@harvard.edu>
-manager Elmar Ritsch <elmar.ritsch@cern.ch>
-manager Valerio Ippolito <valerio.ippolito@cern.ch>
-
-#################################################################
-# public use statements
-#################################################################
-public
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasROOT AtlasROOT-* External
-
-use MagFieldInterfaces MagFieldInterfaces-* MagneticField
-
-#################################################################
-# private use statements
-#################################################################
-private
-use GaudiInterface GaudiInterface-* External
-use PathResolver PathResolver-* Tools
-use AtlasCLHEP AtlasCLHEP-* External
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use StoreGate StoreGate-* Control
-
-apply_pattern declare_runtime_extras extras=../Data/*.root
-
-#apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-public
-library MagFieldServices *.cxx components/*.cxx
-apply_pattern component_library
-
-private
-# use this to activate debug info in this package:
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#macro_append cppflags " -g"
-#macro_append cppflags " -O0"
-#macro_remove cppflags " -O1"
-#macro_remove cppflags " -O2"
-#macro_remove cppflags " -O3"
diff --git a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
index 0df26cdfe474da034eeb719fad77a8ef91c7445f..4b16a448307e522847e02fa5f8af884097b89811 100644
--- a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
+++ b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MagFieldServices/AtlasFieldSvc.h"
#include "MagFieldServices/H8FieldSvc.h"
-DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , AtlasFieldSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , H8FieldSvc )
+DECLARE_COMPONENT( MagField::AtlasFieldSvc )
+DECLARE_COMPONENT( MagField::H8FieldSvc )
-DECLARE_FACTORY_ENTRIES( MagFieldServices ) {
- DECLARE_NAMESPACE_SERVICE( MagField , AtlasFieldSvc )
- DECLARE_NAMESPACE_SERVICE( MagField , H8FieldSvc )
-}
diff --git a/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx b/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx
deleted file mode 100644
index 014766ae5231cfd939efd8c8057d233e5bcb569c..0000000000000000000000000000000000000000
--- a/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MagFieldServices )
diff --git a/MagneticField/MagFieldUtils/cmt/requirements b/MagneticField/MagFieldUtils/cmt/requirements
deleted file mode 100644
index 530c0d50bb900f2ff06835234e7f5de6ff1239c6..0000000000000000000000000000000000000000
--- a/MagneticField/MagFieldUtils/cmt/requirements
+++ /dev/null
@@ -1,41 +0,0 @@
-package MagFieldUtils
-author <elmar.ritsch@cern.ch>
-
-manager Niels van Eldik <niels.van.eldik@cern.ch>
-manager Robert Langenberg <robert.johannes.langenberg@cern.ch>
-manager Masahiro Morii <masahiro_morii@harvard.edu>
-manager Elmar Ritsch <elmar.ritsch@cern.ch>
-manager Valerio Ippolito <valerio.ippolito@cern.ch>
-
-#################################################################
-# public use statements
-#################################################################
-public
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use MagFieldInterfaces MagFieldInterfaces-* MagneticField
-
-#################################################################
-# private use statements
-#################################################################
-private
-use Geant4 Geant4-* External
-use AtlasROOT AtlasROOT-* External
-use AtlasCLHEP AtlasCLHEP-* External
-
-# Specify the required ROOT component for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS RIO MathCore)"
-
-public
-library MagFieldUtils *.cxx components/*.cxx
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-private
-# use this to activate debug info in this package:
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
index a7386487a70b91a56c8d529c8cfc9cc92148ff8e..f0d04aae274864ab3ac846457c3ba3e4ed4833d0 100644
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
+++ b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
@@ -1,14 +1,8 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MagFieldUtils/MagFieldTestbedAlg.h"
#include "MagFieldUtils/SolenoidTest.h"
#include "MagFieldUtils/IdentityManipulator.h"
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , MagFieldTestbedAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , SolenoidTest )
-DECLARE_NAMESPACE_TOOL_FACTORY( MagField , IdentityManipulator )
+DECLARE_COMPONENT( MagField::MagFieldTestbedAlg )
+DECLARE_COMPONENT( MagField::SolenoidTest )
+DECLARE_COMPONENT( MagField::IdentityManipulator )
-DECLARE_FACTORY_ENTRIES( MagFieldUtils ) {
- DECLARE_NAMESPACE_ALGORITHM( MagField , MagFieldTestbedAlg )
- DECLARE_NAMESPACE_ALGORITHM( MagField , SolenoidTest )
- DECLARE_NAMESPACE_TOOL( MagField , IdentityManipulator )
-}
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx
deleted file mode 100644
index 5b3493ffa1cfac4b9b10dfbd413afd12d6c2f305..0000000000000000000000000000000000000000
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MagFieldUtils )
-
diff --git a/Offloading/OffloadSvc/cmt/requirements b/Offloading/OffloadSvc/cmt/requirements
deleted file mode 100644
index 93cd96e99afbc0c161982d526d2a01c703c84611..0000000000000000000000000000000000000000
--- a/Offloading/OffloadSvc/cmt/requirements
+++ /dev/null
@@ -1,28 +0,0 @@
-package OffloadSvc
-author Sami Kama <sami.kama@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use StoreGate StoreGate-* Control
-use EventInfo EventInfo-* Event
-use SGTools SGTools-* Control
-
-library OffloadSvc "OffloadSvc.cxx \
- IOffloadSvc.cxx" \
- -s=components *.cxx
-macro_append OffloadSvc_shlibflags " ${APE_linkopts} "
-apply_pattern component_library
-
-apply_pattern declare_joboptions \
- files="*.py"
-
-apply_pattern declare_python_modules \
- files="*.py"
-action checkreq "echo 'skipping checkreq'"
-
-use APEGlue APEGlue-* External
-
-apply_pattern install_runtime
diff --git a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
index 06c86f4e0bdd314546730a50be5374a849798620..79a96478d5caaa62bf7d9d4a8422ddd245c823b4 100644
--- a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
+++ b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
@@ -1,9 +1,5 @@
#include "OffloadSvc/OffloadSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_SERVICE_FACTORY( OffloadSvc )
+DECLARE_COMPONENT( OffloadSvc )
-DECLARE_FACTORY_ENTRIES( OffloadSvc ) {
- DECLARE_SERVICE( OffloadSvc )
-}
diff --git a/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx b/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx
deleted file mode 100644
index 623ff1d7aefe486ea5596f25d28c64698db5df7e..0000000000000000000000000000000000000000
--- a/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(OffloadSvc)
diff --git a/TestBeam/TBCaloGeometry/cmt/requirements b/TestBeam/TBCaloGeometry/cmt/requirements
deleted file mode 100755
index 0feb267322713a66ab448f2f0a90577e0f271211..0000000000000000000000000000000000000000
--- a/TestBeam/TBCaloGeometry/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package TBCaloGeometry
-
-author Claire Adam <claire.bourdarios@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-use CaloDetDescr CaloDetDescr-* Calorimeter
-
-private
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use StoreGate StoreGate-* Control
-use EventInfo EventInfo-* Event
-use TBCaloConditions TBCaloConditions-* TestBeam/TBConditions
-use TBDetDescr TBDetDescr-* TestBeam
-use CaloGeoHelpers CaloGeoHelpers-* Calorimeter
-end_private
-
-apply_pattern declare_joboptions files="*.py"
-
-apply_pattern dual_use_library files=*.cxx
-
diff --git a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
old mode 100755
new mode 100644
index 996a047990727a5a7240077c609bae01410616da..b538675d4159aeb497c982bc5f007d5b88265021
--- a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
+++ b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
@@ -1,12 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBCaloGeometry/TBCaloCoordinate.h"
-DECLARE_TOOL_FACTORY( TBCaloCoordinate )
-
-DECLARE_FACTORY_ENTRIES ( TBCaloGeometry ) {
- DECLARE_TOOL( TBCaloCoordinate )
-}
-
+DECLARE_COMPONENT( TBCaloCoordinate )
diff --git a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx
deleted file mode 100755
index 7178221997ce525457c07d2f512e5a05e4d9bb23..0000000000000000000000000000000000000000
--- a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBCaloGeometry )
diff --git a/TestBeam/TBCnv/cmt/requirements b/TestBeam/TBCnv/cmt/requirements
deleted file mode 100644
index 55531cb2e32a707c58f626008fcdc9c3a43332cb..0000000000000000000000000000000000000000
--- a/TestBeam/TBCnv/cmt/requirements
+++ /dev/null
@@ -1,28 +0,0 @@
-package TBCnv
-
-author Walter Lampl <walter.lampl@cern.ch>
-author Rob McPherson <Robert.McPherson@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use ByteStreamCnvSvc ByteStreamCnvSvc-* Event
-use ByteStreamCnvSvcBase ByteStreamCnvSvcBase-* Event
-use ByteStreamData ByteStreamData-* Event
-use EventInfo EventInfo-* Event
-use StoreGate StoreGate-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use DataCollection DataCollection-* External
-use GaudiInterface GaudiInterface-* External
-use TBEvent TBEvent-* TestBeam
-use CaloIdentifier CaloIdentifier-* Calorimeter
-use LArCabling LArCabling-* LArCalorimeter
-use LArIdentifier LArIdentifier-* LArCalorimeter
-
-private
-
-use Identifier Identifier-* DetectorDescription
-use LArRawEvent LArRawEvent-* LArCalorimeter
-
-# create the regular dual_use_lib for all the converters
-apply_pattern dual_use_library files=*.cxx
-
-apply_pattern declare_joboptions files="*.txt *.py"
diff --git a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
index 0d4e523f8a20d3a950dc833175182b3916b5fc46..b9ac61b6b81a338b31a279f24c29dced5fba679b 100644
--- a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
+++ b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TBCnv/TBDataCnv.h"
#include "TBCnv/TBByteStreamCnvTool.h"
#include "TBCnv/ReadTBLArDigits.h"
@@ -29,7 +27,7 @@ typedef TBDataCnv<TBTriggerPatternUnit> TBTriggerPatternUnitCnv;
typedef TBDataCnv<TBTailCatcherRaw> TBTailCatcherRawCnv;
typedef TBDataCnv<TBEventInfo> TBEventInfoCnv;
-DECLARE_TOOL_FACTORY( TBByteStreamCnvTool )
+DECLARE_COMPONENT( TBByteStreamCnvTool )
DECLARE_CONVERTER_FACTORY( TBTDCCnv )
DECLARE_CONVERTER_FACTORY( TBTDCRawContCnv )
DECLARE_CONVERTER_FACTORY( TBLArDigitContainerCnv )
@@ -40,24 +38,8 @@ DECLARE_CONVERTER_FACTORY( TBScintillatorRawContCnv )
DECLARE_CONVERTER_FACTORY( TBTriggerPatternUnitCnv )
DECLARE_CONVERTER_FACTORY( TBTailCatcherRawCnv )
DECLARE_CONVERTER_FACTORY( TBEventInfoCnv )
-DECLARE_ALGORITHM_FACTORY( ReadTBLArDigits )
-DECLARE_ALGORITHM_FACTORY( ReadTBLArCalibDigits )
-DECLARE_ALGORITHM_FACTORY( TBCheckBCIDs )
+DECLARE_COMPONENT( ReadTBLArDigits )
+DECLARE_COMPONENT( ReadTBLArCalibDigits )
+DECLARE_COMPONENT( TBCheckBCIDs )
-DECLARE_FACTORY_ENTRIES( TBCnv ) {
- DECLARE_TOOL( TBByteStreamCnvTool )
- DECLARE_CONVERTER( TBTDCCnv )
- DECLARE_CONVERTER( TBTDCRawContCnv )
- DECLARE_CONVERTER( TBLArDigitContainerCnv )
- DECLARE_CONVERTER( TBLArCalibDigitContainerCnv )
- DECLARE_CONVERTER( TBADCRawContCnv )
- DECLARE_CONVERTER( TBBPCRawContCnv )
- DECLARE_CONVERTER( TBScintillatorRawContCnv )
- DECLARE_CONVERTER( TBTriggerPatternUnitCnv )
- DECLARE_CONVERTER( TBTailCatcherRawCnv )
- DECLARE_CONVERTER( TBEventInfoCnv )
- DECLARE_ALGORITHM( ReadTBLArDigits )
- DECLARE_ALGORITHM( ReadTBLArCalibDigits )
- DECLARE_ALGORITHM( TBCheckBCIDs )
-}
diff --git a/TestBeam/TBCnv/src/components/TBCnv_load.cxx b/TestBeam/TBCnv/src/components/TBCnv_load.cxx
deleted file mode 100644
index 9ed0e0b3c326542f381a0f373013f76f2738ea58..0000000000000000000000000000000000000000
--- a/TestBeam/TBCnv/src/components/TBCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBCnv)
diff --git a/TestBeam/TBConditions/TBCaloConditions/cmt/requirements b/TestBeam/TBConditions/TBCaloConditions/cmt/requirements
deleted file mode 100755
index 2327dc09e810043e8cf7bd39990b5d87f3050d69..0000000000000000000000000000000000000000
--- a/TestBeam/TBConditions/TBCaloConditions/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package TBCaloConditions
-
-author Hong Ma <hma@bnl.gov>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-private
-
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use CondDBObjects CondDBObjects-* Database
-use EventInfo EventInfo-* Event
-use StoreGate StoreGate-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-
-public
-
-include_dirs $(TBCaloConditions_root)/TBCaloConditions
-
-# make component lib
-apply_pattern dual_use_library files=*.cxx
-
-apply_pattern declare_joboptions files="*.py"
-
-
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
old mode 100755
new mode 100644
index 24a9975504d0bd2986a05e01e015ba0bc6861ef5..fec5d99610c89388e34edbf57ce2866008835e5e
--- a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
@@ -1,13 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Tool
#include "../TBCaloPosTool.h"
#include "../TBCaloCoolPosTool.h"
-DECLARE_TOOL_FACTORY( TBCaloPosTool )
-DECLARE_TOOL_FACTORY( TBCaloCoolPosTool )
-
-DECLARE_FACTORY_ENTRIES(TBCaloConditions) {
- DECLARE_TOOL ( TBCaloPosTool )
- DECLARE_TOOL ( TBCaloCoolPosTool )
-}
+DECLARE_COMPONENT( TBCaloPosTool )
+DECLARE_COMPONENT( TBCaloCoolPosTool )
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx
deleted file mode 100755
index 7df8173324f9b3a464c4fb5f54037a3e525a360e..0000000000000000000000000000000000000000
--- a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBCaloConditions)
diff --git a/TestBeam/TBConditions/TBCondRunPar/cmt/requirements b/TestBeam/TBConditions/TBCondRunPar/cmt/requirements
deleted file mode 100755
index b83f80cc4087774ab15e0531743adf42a3f2098e..0000000000000000000000000000000000000000
--- a/TestBeam/TBConditions/TBCondRunPar/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package TBCondRunPar
-#############################################################################
-# provide access to RunParams data in combined testbeam data
-#
-#############################################################################
-
-author Richard Hawkings <richard.hawkings@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-
-private
-use EventInfo EventInfo-* Event
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-public
-
-apply_pattern dual_use_library files="TBCondRunParTool.cxx"
-
-#library TBCondRunPar TBCondRunParTool.cxx
-
-apply_pattern declare_joboptions files="*.py"
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
old mode 100755
new mode 100644
index e07e8e0c92d958624057bb8108685a7ca5c99ae1..e5b068d13d47825d56e9a1e092f9be0101cd7c1e
--- a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
+++ b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBCondRunPar/TBCondRunParTool.h"
-DECLARE_TOOL_FACTORY( TBCondRunParTool )
+DECLARE_COMPONENT( TBCondRunParTool )
-DECLARE_FACTORY_ENTRIES( TBCondRunPar )
-{
- DECLARE_TOOL( TBCondRunParTool )
-}
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx
deleted file mode 100755
index f6e529a4058711b7f0a27bcd92d612d0b12c5f76..0000000000000000000000000000000000000000
--- a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBCondRunPar )
diff --git a/TestBeam/TBDetDescr/cmt/requirements b/TestBeam/TBDetDescr/cmt/requirements
deleted file mode 100755
index 18ae7e9666964406ee0927ed027705bb6a90b830..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescr/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package TBDetDescr
-
-author Alexander Solodkov <Sanya.Solodkov@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use DataModel DataModel-* Control
-use CLIDSvc CLIDSvc-* Control
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-apply_pattern installed_library
-
-library TBDetDescr TB*.cxx
-
-private
-use GaudiInterface GaudiInterface-* External
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=TBDetDescr selectionfile=selection.xml headerfiles="../TBDetDescr/TBDetDescrDict.h"
-
diff --git a/TestBeam/TBDetDescrAlg/cmt/requirements b/TestBeam/TBDetDescrAlg/cmt/requirements
deleted file mode 100755
index 9d8bd000e914fc9c89b870852741d8df185734e8..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescrAlg/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package TBDetDescrAlg
-
-author Alexander Solodkov <Sanya.Solodkov@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-
-apply_pattern dual_use_library files=TB*.cxx
-
-apply_pattern declare_joboptions files="*.py"
-
-private
-use GaudiInterface GaudiInterface-* External
-use DetDescrCnvSvc DetDescrCnvSvc-* DetectorDescription
-use TBDetDescr TBDetDescr-* TestBeam
diff --git a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
old mode 100755
new mode 100644
index 32c854e0617218d5bdb6bd55d67b8aaf779b0ecb..46b2dc3b6471e68129a31348edb302866a978077
--- a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
+++ b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
@@ -1,9 +1,5 @@
#include "TBDetDescrAlg/TBDetDescrLoader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( TBDetDescrLoader )
+DECLARE_COMPONENT( TBDetDescrLoader )
-DECLARE_FACTORY_ENTRIES(TBDetDescrAlg) {
- DECLARE_ALGORITHM( TBDetDescrLoader )
-}
diff --git a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx
deleted file mode 100755
index 9a1357b73f0671aef0e87dce136636416c33f74f..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBDetDescrAlg)
diff --git a/TestBeam/TBDetDescrAthenaPool/cmt/requirements b/TestBeam/TBDetDescrAthenaPool/cmt/requirements
deleted file mode 100755
index cbc0837a987d03fe0ccb302cba4ce1d1a8eec279..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescrAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,11 +0,0 @@
-package TBDetDescrAthenaPool
-
-author Alexander Solodkov <Sanya.Solodkov@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-apply_pattern poolcnv files="-s=${TBDetDescr_root}/TBDetDescr TBElementContainer.h"
-
-private
-use TBDetDescr TBDetDescr-* TestBeam
diff --git a/TestBeam/TBDetDescrCnv/cmt/requirements b/TestBeam/TBDetDescrCnv/cmt/requirements
deleted file mode 100755
index 5cb4263af953f9e4c40eaba3d0d27eb12b6a31bb..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescrCnv/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package TBDetDescrCnv
-
-author Alexander Solodkov <Sanya.Solodkov@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use DetDescrCnvSvc DetDescrCnvSvc-* DetectorDescription
-
-private
-use AtlasCLHEP AtlasCLHEP-* External
-use Geant4 Geant4-* External
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use StoreGate StoreGate-* Control
-use TBDetDescr TBDetDescr-* TestBeam
-end_private
-
-apply_pattern component_library
-
-library TBDetDescrCnv TB*.cxx
-
-apply_pattern declare_joboptions files="*.py"
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index 202160b08f2056e212bbd1c4bf1beb8cd9bdaef6..3e672a92ad2d29a596513fc257f8c4a56b6c5632
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
@@ -1,14 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBDetDescrCnv/TBDetDescrCnv.h"
-DECLARE_CONVERTER_FACTORY(TBDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( TBDetDescrCnv ) {
- DECLARE_CONVERTER ( TBDetDescrCnv );
-}
+DECLARE_CONVERTER_FACTORY( TBDetDescrCnv )
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx
deleted file mode 100755
index c581626d7325816a0c9ea30adf5cdeed551ca395..0000000000000000000000000000000000000000
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBDetDescrCnv )
diff --git a/TestBeam/TBEvent/cmt/requirements b/TestBeam/TBEvent/cmt/requirements
deleted file mode 100755
index a4fb1328b006c3c7bfa8ce0a30f420d683a8edbf..0000000000000000000000000000000000000000
--- a/TestBeam/TBEvent/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-
-package TBEvent
-
-author Peter Loch <loch@physics.arizona.edu>
-use AtlasPolicy AtlasPolicy-*
-
-use GaudiInterface GaudiInterface-* External
-use AtlasCLHEP AtlasCLHEP-* External
-use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
-
-use LArRawEvent LArRawEvent-* LArCalorimeter
-
-
-
-#apply_pattern dual_use_library files="TBBPC.cxx TBBPCRaw.cxx TBMWPC.cxx TBMWPCRaw.cxx TBTrack.cxx TBTDC.cxx TBTailCatcher.cxx"
-
-library TBEvent *.cxx
-apply_pattern installed_library
-
-apply_pattern declare_joboptions files="*.txt *.py"
-
-# dictionary
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-
-apply_pattern lcgdict dict=TBEvent selectionfile=selection.xml \
- headerfiles="../TBEvent/TBEventDict.h"
-end_private
-
diff --git a/TestBeam/TBEventAthenaPool/cmt/requirements b/TestBeam/TBEventAthenaPool/cmt/requirements
deleted file mode 100755
index fdeb338bfaf7a3517d86940ac7560de24b59a912..0000000000000000000000000000000000000000
--- a/TestBeam/TBEventAthenaPool/cmt/requirements
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-package TBEventAthenaPool
-
-author Rolf Seuster <seuster@cern.ch>
-use AtlasPolicy AtlasPolicy-*
-
-# for converter
-use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-
-private
-use TBEvent TBEvent-* TestBeam
-use TBTPCnv TBTPCnv-* TestBeam
-use SGTools SGTools-* Control
-use GaudiInterface GaudiInterface-* External
-
-public
-# converter
-apply_pattern poolcnv files="-s=${TBEvent_root}/TBEvent TBADCRawCont.h \
- -s=${TBEvent_root}/TBEvent TBBPCCont.h \
- -s=${TBEvent_root}/TBEvent TBBPCRawCont.h \
- -s=${TBEvent_root}/TBEvent TBEventInfo.h \
- -s=${TBEvent_root}/TBEvent TBHitCont.h \
- -s=${TBEvent_root}/TBEvent TBHitPlaneCont.h \
- -s=${TBEvent_root}/TBEvent TBIdentifiedParticle.h \
- -s=${TBEvent_root}/TBEvent TBLArCalibDigitContainer.h \
- -s=${TBEvent_root}/TBEvent TBLArDigitContainer.h \
- -s=${TBEvent_root}/TBEvent TBMWPCCont.h \
- -s=${TBEvent_root}/TBEvent TBMWPCRawCont.h \
- -s=${TBEvent_root}/TBEvent TBPhase.h \
- -s=${TBEvent_root}/TBEvent TBScintillatorCont.h \
- -s=${TBEvent_root}/TBEvent TBScintillatorRawCont.h \
- -s=${TBEvent_root}/TBEvent TBTDC.h \
- -s=${TBEvent_root}/TBEvent TBTDCRawCont.h \
- -s=${TBEvent_root}/TBEvent TBTailCatcher.h \
- -s=${TBEvent_root}/TBEvent TBTailCatcherRaw.h \
- -s=${TBEvent_root}/TBEvent TBTrack.h \
- -s=${TBEvent_root}/TBEvent TBTriggerPatternUnit.h \
- -s=${TBEvent_root}/TBEvent TBTrackInfo.h"
-
-
-
-
-
-### use AthenaPoolCnvSvc AthenaPoolCnvSvc-00-* Database/AthenaPOOL
-### apply_pattern poolcnv files=${converters}
-### macro_append TBEventAthenaPoolPoolCnv_shlibflags "$(TBEventAthenaPool_dict_linkopts)"
-
diff --git a/TestBeam/TBMonitoring/cmt/requirements b/TestBeam/TBMonitoring/cmt/requirements
deleted file mode 100755
index aeeaeb959968bb4b4fa2b7a10decbac6cb1f3fc6..0000000000000000000000000000000000000000
--- a/TestBeam/TBMonitoring/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package TBMonitoring
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AthenaMonitoring AthenaMonitoring-* Control
-use AtlasAIDA AtlasAIDA-* External
-use CaloIdentifier CaloIdentifier-* Calorimeter
-use GaudiInterface GaudiInterface-* External
-use Identifier Identifier-* DetectorDescription
-use StoreGate StoreGate-* Control
-use TBEvent TBEvent-* TestBeam
-use TBUtils TBUtils-* TestBeam
-use CaloGeoHelpers CaloGeoHelpers-* Calorimeter
-private
-use AtlasCLHEP AtlasCLHEP-* External
-use AthenaKernel AthenaKernel-* Control
-use CaloEvent CaloEvent-* Calorimeter
-use CaloUtils CaloUtils-* Calorimeter
-use EventInfo EventInfo-* Event
-use LArIdentifier LArIdentifier-* LArCalorimeter
-use LArCabling LArCabling-* LArCalorimeter
-end_private
-
-apply_pattern declare_joboptions files="*.txt *.py"
-
-apply_pattern dual_use_library files=*.cxx
-apply_pattern declare_runtime
diff --git a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
old mode 100755
new mode 100644
index f28646be713934a0470ccc01d82eee14808a3c1f..bf73cf76abe775045897c5316d35dfcdf6f75298
--- a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
+++ b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
@@ -1,5 +1,3 @@
-
-
#include "TBMonitoring/TBBPCMonTool.h"
#include "TBMonitoring/TBMWPCMonTool.h"
#include "TBMonitoring/TBPhaseMonTool.h"
@@ -11,29 +9,16 @@
#include "TBMonitoring/TBCaloResponseMonTool.h"
#include "TBMonitoring/TBBeamQualityDoubleHitsMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_TOOL_FACTORY(TBBPCMonTool)
-DECLARE_TOOL_FACTORY(TBMWPCMonTool)
-DECLARE_TOOL_FACTORY(TBPhaseMonTool)
-DECLARE_TOOL_FACTORY(TBScintillatorMonTool)
-DECLARE_TOOL_FACTORY(TBTailCatcherRawMonTool)
-DECLARE_TOOL_FACTORY(TBTriggerPatternUnitMonTool)
-DECLARE_TOOL_FACTORY(TBTDCRawMonTool)
-DECLARE_TOOL_FACTORY(TBADCRawMonTool)
-DECLARE_TOOL_FACTORY(TBCaloResponseMonTool)
-DECLARE_TOOL_FACTORY(TBBeamQualityDoubleHitsMonTool)
+DECLARE_COMPONENT( TBBPCMonTool )
+DECLARE_COMPONENT( TBMWPCMonTool )
+DECLARE_COMPONENT( TBPhaseMonTool )
+DECLARE_COMPONENT( TBScintillatorMonTool )
+DECLARE_COMPONENT( TBTailCatcherRawMonTool )
+DECLARE_COMPONENT( TBTriggerPatternUnitMonTool )
+DECLARE_COMPONENT( TBTDCRawMonTool )
+DECLARE_COMPONENT( TBADCRawMonTool )
+DECLARE_COMPONENT( TBCaloResponseMonTool )
+DECLARE_COMPONENT( TBBeamQualityDoubleHitsMonTool )
-DECLARE_FACTORY_ENTRIES(TBMonitoring) {
- DECLARE_ALGTOOL(TBBPCMonTool)
- DECLARE_ALGTOOL(TBMWPCMonTool)
- DECLARE_ALGTOOL(TBPhaseMonTool)
- DECLARE_ALGTOOL(TBScintillatorMonTool)
- DECLARE_ALGTOOL(TBTailCatcherRawMonTool)
- DECLARE_ALGTOOL(TBTriggerPatternUnitMonTool)
- DECLARE_ALGTOOL(TBTDCRawMonTool)
- DECLARE_ALGTOOL(TBADCRawMonTool)
- DECLARE_ALGTOOL(TBCaloResponseMonTool)
- DECLARE_ALGTOOL(TBBeamQualityDoubleHitsMonTool)
-}
diff --git a/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx b/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx
deleted file mode 100755
index 623ee234bfb468860153b5b3b68e08840c112c56..0000000000000000000000000000000000000000
--- a/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBMonitoring)
diff --git a/TestBeam/TBRec/cmt/requirements b/TestBeam/TBRec/cmt/requirements
deleted file mode 100755
index b087e907d758cef61667bbdde0ad2b86b9898752..0000000000000000000000000000000000000000
--- a/TestBeam/TBRec/cmt/requirements
+++ /dev/null
@@ -1,66 +0,0 @@
-package TBRec
-
-author Peter Loch <loch@physics.arizona.edu>
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaKernel AthenaKernel-* Control
-use AthenaBaseComps AthenaBaseComps-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasROOT AtlasROOT-* External
-use CaloEvent CaloEvent-* Calorimeter
-use CaloIdentifier CaloIdentifier-* Calorimeter
-use CaloInterface CaloInterface-* Calorimeter
-use CaloRec CaloRec-* Calorimeter
-use CaloUtils CaloUtils-* Calorimeter
-use GaudiInterface GaudiInterface-* External
-use Identifier Identifier-* DetectorDescription
-use LArElecCalib LArElecCalib-* LArCalorimeter
-use LArIdentifier LArIdentifier-* LArCalorimeter
-use LArRawEvent LArRawEvent-* LArCalorimeter
-use LArRawUtils LArRawUtils-* LArCalorimeter
-use LArCabling LArCabling-* LArCalorimeter
-use StoreGate StoreGate-* Control
-use TBEvent TBEvent-* TestBeam
-use AthenaBaseComps AthenaBaseComps-* Control
-use TrkParameters TrkParameters-* Tracking/TrkEvent
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use CLIDSvc CLIDSvc-* Control
-use AthContainers AthContainers-* Control
-use EventInfo EventInfo-* Event
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use xAODTracking xAODTracking-* Event/xAOD
-use CaloGeoHelpers CaloGeoHelpers-* Calorimeter
-use TrkDetDescrUtils TrkDetDescrUtils-* Tracking/TrkDetDescr
-
-private
-use AtlasBoost AtlasBoost-* External
-use PathResolver PathResolver-* Tools
-use TrackRecord TrackRecord-* Simulation/G4Sim
-use LArG4TBSimEvent LArG4TBSimEvent-* LArCalorimeter/LArG4TB
-use TBCondRunPar TBCondRunPar-* TestBeam/TBConditions
-use TBCaloGeometry TBCaloGeometry-* TestBeam
-use CondDBObjects CondDBObjects-* Database
-use CaloDmDetDescr CaloDmDetDescr-* Calorimeter
-use CaloSimEvent CaloSimEvent-* Calorimeter
-use Particle Particle-* Reconstruction
-use CaloTrackingGeometry CaloTrackingGeometry-* Calorimeter
-use TrkExInterfaces TrkExInterfaces-* Tracking/TrkExtrapolation
-use TrkEventPrimitives TrkEventPrimitives-* Tracking/TrkEvent
-use TrkSurfaces TrkSurfaces-* Tracking/TrkDetDescr
-use xAODCaloEvent xAODCaloEvent-* Event/xAOD
-use CaloDetDescr CaloDetDescr-* Calorimeter
-
-public
-apply_pattern dual_use_library files="*.cxx"
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_runtime files="*.txt *.xml"
-apply_pattern declare_python_modules files="*.py"
-
-
-apply_pattern have_root_headers root_headers=" TBH6RunHeader.h LinkDef.h" headers_lib=TBRecLib
-
-private
-macro_append TBRecLib_dependencies " TBRecLibDict "
-#macro_append TBRec_linkopts " -L$(bin) -lTBRecLibDict"
diff --git a/TestBeam/TBRec/src/components/TBRec_entries.cxx b/TestBeam/TBRec/src/components/TBRec_entries.cxx
old mode 100755
new mode 100644
index 1cc3aa758fd71dec1366cb6a36ed2693ddab7979..ad9244c6747758fab254200294956e6497d7159f
--- a/TestBeam/TBRec/src/components/TBRec_entries.cxx
+++ b/TestBeam/TBRec/src/components/TBRec_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TBRec/TBAlgoSequencer.h"
#include "TBRec/TBXMLWriter.h"
@@ -50,106 +48,57 @@
#include "TBRec/TBExtrapolTrackToCaloTool.h"
#include "TBRec/TBTrackToCaloAlg.h"
-DECLARE_ALGORITHM_FACTORY( TBXMLWriter )
-DECLARE_ALGORITHM_FACTORY( TBAlgoSequencer )
-DECLARE_ALGORITHM_FACTORY( TBBPCRec )
-DECLARE_ALGORITHM_FACTORY( TBMWPCRec )
-DECLARE_ALGORITHM_FACTORY( TBScintillatorRec )
-DECLARE_ALGORITHM_FACTORY( TBTailCatcherRec )
-DECLARE_ALGORITHM_FACTORY( TBPlaneTrackingAlgo )
-DECLARE_ALGORITHM_FACTORY( TBPhaseRec )
-DECLARE_ALGORITHM_FACTORY( TBLArRawChannelBuilder )
-DECLARE_ALGORITHM_FACTORY( TBECLArRawChannelBuilder )
-DECLARE_ALGORITHM_FACTORY( TBEventStreamer )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_BeamInstrumentation )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBADCRaw )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBTDCRaw )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBInfo )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBTrack )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBScint )
-DECLARE_ALGORITHM_FACTORY( CBNT_Timing )
-DECLARE_ALGORITHM_FACTORY( CBNT_CaloH6 )
-DECLARE_ALGORITHM_FACTORY( CBNT_UpstreamMat )
-DECLARE_ALGORITHM_FACTORY( TBPartIDCherenkovMuTag )
+DECLARE_COMPONENT( TBXMLWriter )
+DECLARE_COMPONENT( TBAlgoSequencer )
+DECLARE_COMPONENT( TBBPCRec )
+DECLARE_COMPONENT( TBMWPCRec )
+DECLARE_COMPONENT( TBScintillatorRec )
+DECLARE_COMPONENT( TBTailCatcherRec )
+DECLARE_COMPONENT( TBPlaneTrackingAlgo )
+DECLARE_COMPONENT( TBPhaseRec )
+DECLARE_COMPONENT( TBLArRawChannelBuilder )
+DECLARE_COMPONENT( TBECLArRawChannelBuilder )
+DECLARE_COMPONENT( TBEventStreamer )
+DECLARE_COMPONENT( CBNTAA_BeamInstrumentation )
+DECLARE_COMPONENT( CBNTAA_TBADCRaw )
+DECLARE_COMPONENT( CBNTAA_TBTDCRaw )
+DECLARE_COMPONENT( CBNTAA_TBInfo )
+DECLARE_COMPONENT( CBNTAA_TBTrack )
+DECLARE_COMPONENT( CBNTAA_TBScint )
+DECLARE_COMPONENT( CBNT_Timing )
+DECLARE_COMPONENT( CBNT_CaloH6 )
+DECLARE_COMPONENT( CBNT_UpstreamMat )
+DECLARE_COMPONENT( TBPartIDCherenkovMuTag )
-DECLARE_ALGORITHM_FACTORY( TBBeamQuality )
-DECLARE_ALGORITHM_FACTORY( TBNoiseWrite )
-DECLARE_ALGORITHM_FACTORY( TBTree_CaloClusterH6 )
-DECLARE_ALGORITHM_FACTORY( CBNTAA_TBTPValidation )
-DECLARE_ALGORITHM_FACTORY( TBTrackInfoFromTag )
-DECLARE_ALGORITHM_FACTORY( TBBeamQualityMC )
-DECLARE_ALGORITHM_FACTORY( TBXCryYTableRead )
-DECLARE_ALGORITHM_FACTORY( TBDMContainerSplitter )
+DECLARE_COMPONENT( TBBeamQuality )
+DECLARE_COMPONENT( TBNoiseWrite )
+DECLARE_COMPONENT( TBTree_CaloClusterH6 )
+DECLARE_COMPONENT( CBNTAA_TBTPValidation )
+DECLARE_COMPONENT( TBTrackInfoFromTag )
+DECLARE_COMPONENT( TBBeamQualityMC )
+DECLARE_COMPONENT( TBXCryYTableRead )
+DECLARE_COMPONENT( TBDMContainerSplitter )
-DECLARE_ALGORITHM_FACTORY( TBTrackToCaloAlg )
+DECLARE_COMPONENT( TBTrackToCaloAlg )
-DECLARE_TOOL_FACTORY( TBXMLEventWriterTool )
-DECLARE_TOOL_FACTORY( TBXMLCaloCellWriterTool )
-DECLARE_TOOL_FACTORY( TBPatternUnitStreamerTool )
-DECLARE_TOOL_FACTORY( TBPatternUnitStreamerToolH8 )
-DECLARE_TOOL_FACTORY( TBEventInfoStreamerTool )
-DECLARE_TOOL_FACTORY( TBPreScalerStreamerTool )
+DECLARE_COMPONENT( TBXMLEventWriterTool )
+DECLARE_COMPONENT( TBXMLCaloCellWriterTool )
+DECLARE_COMPONENT( TBPatternUnitStreamerTool )
+DECLARE_COMPONENT( TBPatternUnitStreamerToolH8 )
+DECLARE_COMPONENT( TBEventInfoStreamerTool )
+DECLARE_COMPONENT( TBPreScalerStreamerTool )
-DECLARE_TOOL_FACTORY( TBBeamQualityDoubleHitsTool )
-DECLARE_TOOL_FACTORY( TBBeamQualityMuonToolH6 )
-DECLARE_TOOL_FACTORY( TBBeamQualityEMFractionTool )
-DECLARE_TOOL_FACTORY( TBBeamQualityTrackingTool )
+DECLARE_COMPONENT( TBBeamQualityDoubleHitsTool )
+DECLARE_COMPONENT( TBBeamQualityMuonToolH6 )
+DECLARE_COMPONENT( TBBeamQualityEMFractionTool )
+DECLARE_COMPONENT( TBBeamQualityTrackingTool )
-DECLARE_TOOL_FACTORY( TBPhaseStreamerTool )
-DECLARE_TOOL_FACTORY( TBEMECCellEtaCorrection )
-DECLARE_TOOL_FACTORY( TBClusterMaker )
-DECLARE_TOOL_FACTORY( TBCellNoiseCorrection )
-DECLARE_TOOL_FACTORY( TBCellContainerFillerTool )
-DECLARE_TOOL_FACTORY( TBEMECXTalkToyModel )
+DECLARE_COMPONENT( TBPhaseStreamerTool )
+DECLARE_COMPONENT( TBEMECCellEtaCorrection )
+DECLARE_COMPONENT( TBClusterMaker )
+DECLARE_COMPONENT( TBCellNoiseCorrection )
+DECLARE_COMPONENT( TBCellContainerFillerTool )
+DECLARE_COMPONENT( TBEMECXTalkToyModel )
-DECLARE_TOOL_FACTORY( TBExtrapolTrackToCaloTool )
+DECLARE_COMPONENT( TBExtrapolTrackToCaloTool )
-DECLARE_FACTORY_ENTRIES( TBRec ) {
- DECLARE_ALGORITHM( TBXMLWriter )
- DECLARE_ALGORITHM( TBAlgoSequencer )
- DECLARE_ALGORITHM( TBBPCRec )
- DECLARE_ALGORITHM( TBMWPCRec )
- DECLARE_ALGORITHM( TBScintillatorRec )
- DECLARE_ALGORITHM( TBTailCatcherRec )
- DECLARE_ALGORITHM( TBPlaneTrackingAlgo )
- DECLARE_ALGORITHM( TBPhaseRec )
- DECLARE_ALGORITHM( TBLArRawChannelBuilder )
- DECLARE_ALGORITHM( TBECLArRawChannelBuilder )
- DECLARE_ALGORITHM( TBEventStreamer )
- DECLARE_ALGORITHM( CBNTAA_BeamInstrumentation )
- DECLARE_ALGORITHM( CBNTAA_TBADCRaw )
- DECLARE_ALGORITHM( CBNTAA_TBTDCRaw )
- DECLARE_ALGORITHM( CBNTAA_TBInfo )
- DECLARE_ALGORITHM( CBNTAA_TBTrack )
- DECLARE_ALGORITHM( CBNTAA_TBScint )
- DECLARE_ALGORITHM( CBNT_Timing )
- DECLARE_ALGORITHM( CBNT_CaloH6 )
- DECLARE_ALGORITHM( CBNT_UpstreamMat )
- DECLARE_ALGORITHM( TBPartIDCherenkovMuTag )
- DECLARE_ALGORITHM( TBBeamQuality )
- DECLARE_ALGORITHM( TBTree_CaloClusterH6 )
- DECLARE_ALGORITHM( TBNoiseWrite )
- DECLARE_ALGORITHM( TBBeamQualityMC )
- DECLARE_ALGORITHM( TBXCryYTableRead )
- DECLARE_ALGORITHM( TBDMContainerSplitter )
- DECLARE_ALGORITHM( CBNTAA_TBTPValidation )
- DECLARE_ALGORITHM( TBTrackInfoFromTag )
- DECLARE_ALGORITHM( TBTrackToCaloAlg )
- DECLARE_TOOL( TBXMLEventWriterTool )
- DECLARE_TOOL( TBXMLCaloCellWriterTool )
- DECLARE_TOOL( TBPatternUnitStreamerTool )
- DECLARE_TOOL( TBPatternUnitStreamerToolH8 )
- DECLARE_TOOL( TBEventInfoStreamerTool )
- DECLARE_TOOL( TBPreScalerStreamerTool )
- DECLARE_TOOL( TBBeamQualityDoubleHitsTool )
- DECLARE_TOOL( TBBeamQualityMuonToolH6 )
- DECLARE_TOOL( TBBeamQualityEMFractionTool )
- DECLARE_TOOL( TBBeamQualityTrackingTool )
- DECLARE_TOOL( TBPhaseStreamerTool )
- DECLARE_TOOL( TBEMECCellEtaCorrection )
- DECLARE_TOOL( TBClusterMaker )
- DECLARE_TOOL( TBCellNoiseCorrection )
- DECLARE_TOOL( TBCellContainerFillerTool )
- DECLARE_TOOL( TBEMECXTalkToyModel )
- DECLARE_TOOL( TBExtrapolTrackToCaloTool )
-}
diff --git a/TestBeam/TBRec/src/components/TBRec_load.cxx b/TestBeam/TBRec/src/components/TBRec_load.cxx
deleted file mode 100755
index a017f5d2d436df2a929f2e4a91e0b2e3694cc1d7..0000000000000000000000000000000000000000
--- a/TestBeam/TBRec/src/components/TBRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBRec)
diff --git a/TestBeam/TBTPCnv/cmt/requirements b/TestBeam/TBTPCnv/cmt/requirements
deleted file mode 100644
index bf5442e3fede52d92c163a0182db019d4d37f10d..0000000000000000000000000000000000000000
--- a/TestBeam/TBTPCnv/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-# Package for transient/persistent converters for the TestBeam
-# 15-02-2010 Iftach Sadeh <iftach.sadeh@NOSPAMTODAYcern.ch>
-
-package TBTPCnv
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasReflex AtlasReflex-* External
-
-
-use TBEvent TBEvent-* TestBeam
-
-private
-
-use Identifier Identifier-* DetectorDescription
-
-public
-
-apply_pattern lcgdict dict=TBTPCnv selectionfile=selection.xml headerfiles="../TBTPCnv/TBTPCnvDict.h"
-
-use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
-library TBTPCnv *.cxx
-apply_pattern installed_library
-
diff --git a/TestBeam/TBUtils/cmt/requirements b/TestBeam/TBUtils/cmt/requirements
deleted file mode 100755
index 8dd645d1678050ece88263dd4f6d4faffa091dff..0000000000000000000000000000000000000000
--- a/TestBeam/TBUtils/cmt/requirements
+++ /dev/null
@@ -1,6 +0,0 @@
-package TBUtils
-
-author Peter Loch <loch@physics.arizona.edu>
-
-use AtlasPolicy AtlasPolicy-*
-use TBEvent TBEvent-* TestBeam
diff --git a/Tools/AlgorithmToolSetup/cmt/requirements b/Tools/AlgorithmToolSetup/cmt/requirements
deleted file mode 100755
index 2b915da8357bfdd852ab25e7ac67c7b6cc573086..0000000000000000000000000000000000000000
--- a/Tools/AlgorithmToolSetup/cmt/requirements
+++ /dev/null
@@ -1,14 +0,0 @@
-package AlgorithmToolSetup
-
-author Martin Siebel <Martin.Siebel@CERN.ch>
-
-# Description:-
-#
-# AlgorithmToolSetup package sets up the basic files
-# for writing new Algorithms or Tools. After calling
-# the setupCode shell script, all necessary information
-# will be inquired interactively.
-
-use AtlasPolicy AtlasPolicy-*
-apply_pattern declare_scripts files="-s=../share *.csh *.h *.sh"
-apply_pattern declare_runtime files="-s=../src *.templ *.txt -s=../share AlgorithmToolSetup.sh"
diff --git a/Tools/ChkLib/cmt/requirements b/Tools/ChkLib/cmt/requirements
deleted file mode 100755
index 4aa931d3dea74f82fd80f4056591eb6bf50ddb09..0000000000000000000000000000000000000000
--- a/Tools/ChkLib/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package ChkLib
-
-author Fredrik Akesson <fredrik.akesson@cern.ch>
-
-# Description:-
-#
-# ChkLib is a tool to check for unresolved symbols in the local directory.
-# Use it in your InstallArea/i686-*/lib directory.
-
-use AtlasPolicy AtlasPolicy-*
-
-application ChkLib ChkLib.cxx
-
-apply_pattern declare_runtime files="-s=../share *.files *.symbols"
-
diff --git a/Tools/CodeCheck/cmt/fragments/rulechecker b/Tools/CodeCheck/cmt/fragments/rulechecker
deleted file mode 100755
index f360c588f98c8595e15283197c471e23fd7de3dd..0000000000000000000000000000000000000000
--- a/Tools/CodeCheck/cmt/fragments/rulechecker
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$(${CONSTITUENT}_output)${NAME}.viol :: ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.i
- @echo removing ${NAME}.viol;
- $(cpp_silent) if test -f $(${CONSTITUENT}_output)${NAME}.viol; then /bin/rm -f $(${CONSTITUENT}_output)${NAME}.viol; fi;
- $(cpp_silent) if test -f ${PACKAGE_ROOT}/$(package)/${NAME}.h ; then\
- if test -d ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP} ;then ${mkdir} -p ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}${CMTINSTALLAREA}/include/$(package)/$(package);fi;\
- /bin/ln -fs ${PACKAGE_ROOT}/$(package)/${NAME}.h ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}${CMTINSTALLAREA}/include/$(package)/$(package)/${NAME}.h;\
- fi;
-
- $(cpp_silent) if test -f ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.i;then\
- cd ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP};\
- $(atlas_checker_command) ${NAME}.i ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP} > $(${CONSTITUENT}_output)${NAME}.viol; \
- fi;
-
- $(cpp_silent) cd $(mgr);if test -f ${NAME}.d; then /bin/rm -f ${NAME}.d; fi;
-
-
-${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.i::
- $(cpp_silent) if test -f ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.cxx; then \
- $(cppcomp) -E $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(app_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags)$(${CONSTITUENT}_cppflags)$(app_${CONSTITUENT}_cppflags)$(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} -o ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.i ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.cxx;\
- $(atlas_patch_command) ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.i ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.tmp;\
- /bin/cp ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.tmp ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.i;\
- /bin/mv ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}/${NAME}.tmp ${CODECHECK_OUTPUT_DIRECTORY}${DOTI}/${NAME}.i;\
- fi;
-
-
diff --git a/Tools/CodeCheck/cmt/fragments/rulechecker_header b/Tools/CodeCheck/cmt/fragments/rulechecker_header
deleted file mode 100755
index 62216cc201cff9982758833984d6e7e692fcd812..0000000000000000000000000000000000000000
--- a/Tools/CodeCheck/cmt/fragments/rulechecker_header
+++ /dev/null
@@ -1,52 +0,0 @@
-ifeq ($(CODECHECK_STRATEGY), release)
- CODECHECK_OUTPUT_DIRECTORY = ${CODECHECK_RELEASE_OUTPUT_DIRECTORY}
- RULECHECKER_SUFFIX = /${version}/
-endif
-ifeq ($(CODECHECK_STRATEGY), package)
- CODECHECK_OUTPUT_DIRECTORY = ${PACKAGE_ROOT}${RELATIVE_CODECHECK_OUTPUT_DIRECTORY}
-endif
-
-SELECTED_RULES_FILE = all_RULES
-ACTUAL_CONFIG = ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}
-ifeq ($(SELECTED_RULES), naming)
- SELECTED_RULES_FILE = naming_RULES
-
-endif
-ifeq ($(SELECTED_RULES), required)
- SELECTED_RULES_FILE = required_RULES
-
-endif
-ifeq ($(SELECTED_RULES), recommended)
- SELECTED_RULES_FILE = recommended_RULES
-
-endif
-
-${CONSTITUENT}_output = ${CODECHECK_OUTPUT_DIRECTORY}${RULECHECKER}${RULECHECKER_SUFFIX}
-
-FILES = $(shell python ${CODECHECKROOT}/share/truncate.py )
-
-
-${CONSTITUENT} :: create ${OBJS} finish
-
-create :: setup ${FILES}
-
- $(cpp_silent) $(foreach file_to_copy,${FILES},$(shell /bin/cp ${PACKAGE_ROOT}/src/$(file_to_copy) ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}))
-
-setup:: ${CODECHECK_OUTPUT_DIRECTORY}
- $(cpp_echo) $@
- $(cpp_silent) cd $(bin);
- $(cpp_silent) if test -d ${PACKAGE_ROOT}/src/; then \
- if test ! -d $(CODECHECK_OUTPUT_DIRECTORY) ; then ${mkdir} $(CODECHECK_OUTPUT_DIRECTORY); fi;\
- if test ! -d $(CODECHECK_OUTPUT_DIRECTORY)${RULECHECKER} ; then ${mkdir} $(CODECHECK_OUTPUT_DIRECTORY)${RULECHECKER}; fi;\
- if test ! -d $(${CONSTITUENT}_output) ; then ${mkdir} $(${CONSTITUENT}_output); fi;\
- if test ! -d ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP} ; then ${mkdir} ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP}; fi;\
- if test ! -d ${CODECHECK_OUTPUT_DIRECTORY}${DOTI} ; then ${mkdir} ${CODECHECK_OUTPUT_DIRECTORY}${DOTI}; fi;\
- /bin/cp ${IRST_CONFIG_DIR}/config* ${ACTUAL_CONFIG}; \
- /bin/cp ${IRST_CONFIG_DIR}/${SELECTED_RULES_FILE} ${ACTUAL_CONFIG}/config_RULES; \
- fi;
-
-
-
-
-
-
diff --git a/Tools/CodeCheck/cmt/fragments/rulechecker_trailer b/Tools/CodeCheck/cmt/fragments/rulechecker_trailer
deleted file mode 100755
index 410fcb8bae53842927bb0bdd319d6cfa2930bcbe..0000000000000000000000000000000000000000
--- a/Tools/CodeCheck/cmt/fragments/rulechecker_trailer
+++ /dev/null
@@ -1,14 +0,0 @@
-
-finish::
- $(cpp_silent) if test -d ${PACKAGE_ROOT}/src/; then \
- echo cleaning up ;\
- /bin/rm -rf ${CODECHECK_OUTPUT_DIRECTORY}${CCTMP};\
- fi;
- @echo cleaning up done;
-
-${CONSTITUENT}clean::
- $(cpp_echo) $@@ ;
- @echo removing ${NAME}.i;
- $(cpp_silent) /bin/rm -f ${FILEPATH}${NAME}.i ;
- @echo removing ${NAME}.viol;
- $(cpp_silent) /bin/rm -f $(${CONSTITUENT}_output)${NAME}.viol;
diff --git a/Tools/CodeCheck/cmt/requirements b/Tools/CodeCheck/cmt/requirements
deleted file mode 100755
index 4eceed38f4701dba04b6c4ee07835dab78838cf3..0000000000000000000000000000000000000000
--- a/Tools/CodeCheck/cmt/requirements
+++ /dev/null
@@ -1,120 +0,0 @@
-package CodeCheck
-
-author Albrand Solveig <albrand@isn.in2p3.fr>
-
-## uses codewizard - from Parasoft
-## modifications from Christian's mail of 18th July 2001
-##
-## modifications October 2001 - make fragments for document style.
-## modifcation December 2001 - remove useless lines
-## February 2002 - into CVS
-## August 2002 add rulechecker
-## November - December 2002 - get rulechecker and codewizard working for release.
-## Christian Arnault December 2004 - see below - macro use_JavaSDK added
-## April 2005 removed codewizard, and corrected the selection of rule sets
-
-# This package is called CodeCheck and not "rulechecker" because
-# it maybe could use othertools.
-
-## usage : gmake [CODECHECK_STRATEGY="release"] rulechecker
-## gmake [SELECTED_RULES="naming"] rulechecker
-##
-
-
-#------------------------------------------------------
-# All settings defined by this package should be selectively valued
-# only when the CodeCheck tag is active
-#
-# This tag is activated only when gmake rulechecker is run.
-# And this is actually triggered by the special target_xxx tag associated with the constituents.
-#
-# This specific tag is therefore automatically associated with the generic CodeCheck tag so as
-# to have a generic format in this requirements
-#
-#------------------------------------------------------
-
-
-#
-# get a java for RuleChecker
-
-macro use_JavaSDK "" CodeCheck "JavaSDK JavaSDK-01-* External"
-use $(use_JavaSDK)
-
-
-
-#
-# But do not add anything to the -I path
-#
-include_path none
-
-
-
-
-# Now define the default path to put the results
- macro RELATIVE_CODECHECK_OUTPUT_DIRECTORY "" CodeCheck "/CodeCheck"
-
- macro RULECHECKER "" CodeCheck "/rulechecker"
-
-# If CODECHECK_STRATEGY is put to "release" then output directory will be changed
-# by the make file, but any other value will be leave them untouched.
-# The value "release" puts them all in the same place,
-# under a subdirectory with the package version tag
-
- macro CODECHECK_STRATEGY "" CodeCheck "package"
-
-# It does this by changing the value of the following macro
-
- macro RULECHECKER_SUFFIX "" CodeCheck "/"
-
-# and then calculating the value of the output directory, either from the
-# package root, or from the value of the CODECHECK_RELEASE_OUTPUT_DIRECTORY
-# The directory for grouping all the output together
-
- macro CODECHECK_RELEASE_OUTPUT_DIRECTORY "" CodeCheck "/afs/cern.ch/user/a/albrand/www/CodeCheck"
-
-# Other possible values of SELECTED_RULES are "naming", "required", "recommended"
-# The make file fragment makes a symbolic link between the selected rules file
-# and the file "config_RULES" which is used by rulechecker
-
- macro SELECTED_RULES "" CodeCheck "all"
-
- macro CCTMP "" CodeCheck "/CCTMP"
- macro DOTI "" CodeCheck "/DOTI"
-
-
-
-
-
-
-##### For Rule Checker (do not override the next two unless you know what you are doing!)
-## This is the directory where the tool is installed
- macro IRST_DIR ""\
- CERN&CodeCheck "/afs/cern.ch/user/a/albrand/public/IRST2.5"
-
-## CERN "/afs/cern.ch/sw/lcg/contrib/rulechecker"
-## IRST_CONFIG_DIR is the place where rulechecker looks to find its configuration files
-
- macro IRST_CONFIG_DIR "" CodeCheck "${IRST_DIR}/userConfig/ATLAS"
-
-##
-
-
-set atlas_checker_command "" CodeCheck "java -classpath ${IRST_DIR} rules.ATLAS.ATLASRuleChecker "
-set atlas_patch_command "" CodeCheck "${IRST_DIR}/patch/patch4atlas.prl"
-
-
-pattern -global rulechecker \
- tag target_<package>rchk CodeCheck ; \
- document rulechecker <package>rchk -target_tag $(src)*.cxx -group=rulechecker
-
-macro rulechecker_header_fragment "" CodeCheck ""
-macro rulechecker_fragment "" CodeCheck ""
-macro rulechecker_trailer_fragment "" CodeCheck ""
-
-make_fragment rulechecker_header -suffix=viol
-make_fragment rulechecker -suffix=viol -header=rulechecker_header -dependencies -trailer=rulechecker_trailer
-make_fragment rulechecker_trailer
-
-ignore_pattern doxygen
-ignore_pattern rulechecker
-
diff --git a/Tools/CoolDozer/cmt/requirements b/Tools/CoolDozer/cmt/requirements
deleted file mode 100644
index 04cb3a0822a8e9738d693eeedc814dfc9def7562..0000000000000000000000000000000000000000
--- a/Tools/CoolDozer/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package CoolDozer
-author Brinick Simmons <brinick.simmons@NOSPAMgmail.com>
-
-private
-use TestPolicy TestPolicy-*
-apply_pattern validate_xml
-
-public
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_joboptions files="../share/CoolDozer_jobOptions.py ../share/CoolDozer_fakePerfMon_jobOptions.py"
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_runtime extras="../test/CoolDozer_TestConfiguration.xml ../share/RandomDozerAppStandalone.py ../share/RTTRandomDozerApp.py"
-
-apply_pattern declare_scripts files="../share/dozerReader.py ../share/perfMonDozer.py"
-
-macro CoolDozer_TestConfiguration "../test/CoolDozer_TestConfiguration.xml"
-
-apply_pattern declare_xmls extras="../config/CoolDozerConfig.xml"
-
-macro DOXYGEN_IMAGE_PATH "../doc/images"
-macro DOXYGEN_EXAMPLE_PATH "" Doxygen "../doc ../cmt ../share ../doc"
-macro DOXYGEN_EXAMPLE_PATTERNS "" Doxygen "*.cxx *.html requirements *.py *.css"
-
diff --git a/Tools/DCubeClient/cmt/requirements b/Tools/DCubeClient/cmt/requirements
deleted file mode 100644
index 5f5ed2edec33bba2eba0999245f31def3a98f712..0000000000000000000000000000000000000000
--- a/Tools/DCubeClient/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package DCubeClient
-author Krzysztof Daniel Ciba <Krzysztof.Ciba@NOSPAMgmail.com>
-
-# packages used to build this one
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_runtime extras="../test/DCubeClient_TestConfiguration.xml ../test/*.C ../share/DCubeValid.xml"
-apply_pattern declare_joboptions files="../share/DCubeClient_jobOptions.py"
-
-apply_pattern declare_scripts files="../python/dcube.py ../python/dcubeConvert.py"
-apply_pattern declare_xmls extras="../share/DCubeValid.xml"
-
-macro DCubeClient_TestConfiguration "../test/DCubeClient_TestConfiguration.xml"
-
-
-
diff --git a/Tools/FullChainTests/cmt/requirements b/Tools/FullChainTests/cmt/requirements
deleted file mode 100644
index 5a441c257be83fc8a233f643c56a6776a2ceba21..0000000000000000000000000000000000000000
--- a/Tools/FullChainTests/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package FullChainTests
-
-author Simon Owen <simon.owen@shef.ac.uk>
-
-use AtlasPolicy AtlasPolicy-*
-private
-use TestPolicy TestPolicy-*
-public
-
-apply_pattern declare_scripts files="../scripts/*.py ../scripts/*.sh"
-apply_pattern declare_python_modules files="../python/*.py"
-macro FullChainTests_TestConfiguration "../test/FullChainTests_TestConfiguration.xml"
-apply_pattern declare_runtime extras="../test/FullChainTests_TestConfiguration.xml ../test/*.cfg"
-#apply_pattern declare_joboptions files="*.py"
-
-private
-apply_pattern validate_xml
-public
\ No newline at end of file
diff --git a/Tools/FullChainTransforms/cmt/requirements b/Tools/FullChainTransforms/cmt/requirements
deleted file mode 100644
index 6f52a7a3f4b04a7b82dfb0725e038998dda0aa1c..0000000000000000000000000000000000000000
--- a/Tools/FullChainTransforms/cmt/requirements
+++ /dev/null
@@ -1,12 +0,0 @@
-package FullChainTransforms
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPython AtlasPython-* External -no_auto_imports
-use PyJobTransforms PyJobTransforms-* Tools
-use PATJobTransforms PATJobTransforms-* PhysicsAnalysis
-use RecJobTransforms RecJobTransforms-* Reconstruction
-use SimuJobTransforms SimuJobTransforms-* Simulation
-
-apply_pattern declare_python_modules files="*.py"
-
-apply_pattern declare_job_transforms tfs='*.py' jo='*.py'
diff --git a/Tools/JobTransforms/cmt/requirements b/Tools/JobTransforms/cmt/requirements
deleted file mode 100755
index 24d725010fe2ebffda34044e5d18734f363d7a32..0000000000000000000000000000000000000000
--- a/Tools/JobTransforms/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-package JobTransforms
-
-
-author Alessandro De Salvo Alessandro.DeSalvo@roma1.infn.it
-
-#------------------------------------------------------------------
-#
-# Job Transformations for AtlasRelease
-#
-#------------------------------------------------------------------
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPython * External
-
-macro JobTransforms_KV_config "../share/*"
-macro JobTransforms_JT_logutils "../include/athenaCheckLog.*"
-
-pattern declare_JT_tools \
- apply_pattern generic_declare_for_link kind=tools files='<files>' prefix=share/JT/include name=<name>
-
-pattern declare_JT_src_patch \
- apply_pattern generic_declare_for_link kind=srcpatch files='<files>' prefix=share/JT/src name=<name>
-
-pattern declare_JT_jo_patch \
- apply_pattern generic_declare_for_link kind=jopatch files='<files>' prefix=share/JT/jobOptions name=<name>
-
-pattern declare_transforms \
- apply_pattern generic_declare_for_link kind=transforms files='<files>' prefix=share/JT/share name=<name>
-
-apply_pattern declare_JT_tools files="$(JobTransforms_JT_logutils) ../include/*.def"
-apply_pattern declare_JT_src_patch files="../src/*.gz"
-apply_pattern declare_JT_jo_patch files="../jobOptions/*"
-apply_pattern declare_transforms files="$(JobTransforms_KV_config) ../share/*.trf ../share/*.kvt"
-
-set T_INCPATH ${CMTINSTALLAREA}/share/JT/include
-set T_RELEASE ${JobTransforms_project_release}
diff --git a/Tools/KitValidation/cmt/requirements b/Tools/KitValidation/cmt/requirements
deleted file mode 100755
index bf19924fc84c808cff2f511b5b2f5e0b75be8c98..0000000000000000000000000000000000000000
--- a/Tools/KitValidation/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package KitValidation
-
-
-author Alessandro De Salvo Alessandro.DeSalvo@roma1.infn.it
-
-#------------------------------------------------------------------
-#
-# Validation package for the Atlas Software Distribution Kit
-#
-#------------------------------------------------------------------
-
-use JobTransforms * Tools
-#use DC3_joboptions * Generators
-#use SimulationProdScripts * Simulation
-#use RecExCommon * Reconstruction/RecExample
-#use TriggerRelease * Trigger
-
-apply_pattern declare_scripts files="kvpost.py"
-apply_pattern declare_joboptions files="kv_perfmon.py kv_reflex.py"
diff --git a/Tools/LWHists/cmt/requirements b/Tools/LWHists/cmt/requirements
deleted file mode 100644
index 9b75ceb81ef26f79adb62f0799a94fcff0e1a3fc..0000000000000000000000000000000000000000
--- a/Tools/LWHists/cmt/requirements
+++ /dev/null
@@ -1,64 +0,0 @@
-package LWHists
-
-author Thomas Kittelmann <thomas.kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use AtlasROOT AtlasROOT-* External
-
-# Add cmake compatibility (doesn't do anything on CMT side of things)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Hist RIO)"
-
-#Various compilation options:
-#
-#*3 lines to get this lib compiled in debug mode (private tests only):
-#macro cppdebugflags '$(cppdebugflags_s)'
-#macro_remove componentshr_linkopts "-Wl,-s"
-#macro_remove AtlasCxxPolicy_pp_cppflags "-DNDEBUG"
-#
-#Update: seems that recently these four do the trick instead:
-#macro_remove componentshr_linkopts "-Wl,-s"
-#macro_remove AtlasCxxPolicy_pp_cppflags "-DNDEBUG"
-#macro_remove AtlasCxxPolicy_pp_cppflags "-O2"
-#macro_append AtlasCxxPolicy_pp_cppflags " -g "
-#
-#*For cachegrind we might want to add this again:"
-#macro_append AtlasCxxPolicy_pp_cppflags "-O2"
-#
-#*To let valgrind look for problems:
-#macro_append AtlasCxxPolicy_pp_cppflags " -DLW_DEBUG_POOLS_USE_NEW"
-#
-#*To make the pools monitor acquire/release ("mini-valgrind"):
-#macro_append AtlasCxxPolicy_pp_cppflags " -DLW_DEBUG_POOLS_DEBUG_USAGE"
-#
-#*Jump through extra hoops to reproduce obscure ROOT behaviour:
-macro_append LWHists_pp_cppflags " -DLW_STRICT_ROOT_BEHAVIOUR"
-
-#*To find users who really maybe shouldn't use LW histograms:
-#macro_append AtlasCxxPolicy_pp_cppflags " -DLW_DEBUG_HEAVY_USERS"
-
-#*To compile an extra symbol for better ROOTSPY performance:
-#macro_append AtlasCxxPolicy_pp_cppflags " -DLW_DEBUG_ROOTSPY_SYMB"
-
-public
-
-
-
-library LWHists *.cxx
-apply_pattern installed_library
-
-application lwhists_validate "-s=tests/validation *.cxx"
-application lwhists_benchmark "-s=tests/benchmarking *.cxx"
-application lwhists_comphistfiles "-s=tests/comphistfiles *.cxx"
-private
-
-macro_append LWHists_cppflags " -fno-tree-vectorize "
-
-macro_append lwhists_validate_dependencies "$(LWHists_library_dependencies)"
-macro_append lwhists_benchmark_dependencies "$(LWHists_library_dependencies)"
-#NB: The next line IS needed for the nightly build system, despite the
-#lwhists_comphistfiles appliction not depending on the LWHists
-#library. Don't remove!!!:
-macro_append lwhists_comphistfiles_dependencies "$(LWHists_library_dependencies)"
-public
diff --git a/Tools/OnlineRecoTests/cmt/requirements b/Tools/OnlineRecoTests/cmt/requirements
deleted file mode 100644
index 1eacdc1797cf5b2186803ae19ddbf924ee6dbe57..0000000000000000000000000000000000000000
--- a/Tools/OnlineRecoTests/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package OnlineRecoTests
-
-author Max Baak <mbaak@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-#use GaudiInterface GaudiInterface-* External
-#use AthenaKernel AthenaKernel-* Control
-use AtlasROOT AtlasROOT-* External
-#use AthenaPoolKernel AthenaPoolKernel-* Database/AthenaPOOL
-
-#use Tier0ChainTests Tier0ChainTests-* Tools
-
-apply_pattern declare_scripts files="../scripts/ort_*.py ../scripts/ort_*.sh"
-apply_pattern declare_joboptions files="../share/*.py"
-apply_pattern declare_python_modules files="../python/*.py"
-
-## note that the cut command is picking arguments 6 and 7, need for the built directory
-## /build/atnight/localbuilds/nightlies/14.5.X.Y-T0/AtlasTier0/rel_0
-path_append ORTXMLFILE "../test/OnlineRecoTests_`echo $CMTPATH | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 6,7 | sed 's/\//_/'`.xml"
-macro OnlineRecoTests_TestConfiguration "../../../InstallArea/share/OnlineRecoTests_DefaultConfiguration.xml"
-apply_pattern declare_runtime extras="`if [ -f ${ORTXMLFILE} ]; then cp -f $ORTXMLFILE ../OnlineRecoTests_DefaultConfiguration.xml ; echo ../OnlineRecoTests_DefaultConfiguration.xml; else echo ../test/OnlineRecoTests_DefaultConfiguration.xml; fi`"
-
-## For example, for $CMTPATH=/afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasOffline/rel_4, the following command:
-## > echo "../test/OnlineRecoTests_`echo $AtlasArea | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 8,9 | sed 's/\//_/'`.xml"
-## will result in: ../test/OnlineRecoTests_devval_AtlasOffline.xml
-## if this file is not found, the fall-back file is: ../test/OnlineRecoTests_DefaultConfiguration.xml
diff --git a/Tools/PROCTools/cmt/requirements b/Tools/PROCTools/cmt/requirements
deleted file mode 100644
index 5ab5fb3457b16edd3b35293e661eec58e60272ef..0000000000000000000000000000000000000000
--- a/Tools/PROCTools/cmt/requirements
+++ /dev/null
@@ -1,11 +0,0 @@
-package PROCTools
-
-author Walter Lampl <walter.lampl@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-#use PyUtils PyUtils-* Tools
-
-private
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="-s=$(PROCTools_root)/python compareTCTs.py UploadAMITag.py UploadTfAMITag.py getCurrentCOMCONDTag.py RunTier0Tests.py ExtractEvents.py checkUPD1.py runDiffRootOnChanged.py provideTwikiSummary.py evaluateDiffRoot.py outputTest_v2.py CreateTierZeroArgdict.py root_lsr_rank.py"
-end_private
diff --git a/Tools/PathResolver/cmt/Makefile.RootCore b/Tools/PathResolver/cmt/Makefile.RootCore
deleted file mode 100644
index 6cf281b8e6a1b20eb01898f1150c08e3895cb914..0000000000000000000000000000000000000000
--- a/Tools/PathResolver/cmt/Makefile.RootCore
+++ /dev/null
@@ -1,8 +0,0 @@
-PACKAGE = PathResolver
-PACKAGE_CXXFLAGS =
-PACKAGE_LDFLAGS =
-PACKAGE_PRELOAD = Hist boost_filesystem
-PACKAGE_DEP = Asg_Boost CxxUtils AsgTools
-PACKAGE_REFLEX = 1
-
-include $(ROOTCOREDIR)/Makefile-common
diff --git a/Tools/PathResolver/cmt/requirements b/Tools/PathResolver/cmt/requirements
deleted file mode 100644
index 712416533d1495f52f1c6782af382353baba84a5..0000000000000000000000000000000000000000
--- a/Tools/PathResolver/cmt/requirements
+++ /dev/null
@@ -1,58 +0,0 @@
-package PathResolver
-author NLAA
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-
-use AsgTools AsgTools-* Control/AthToolSupport
-
-##Define the CALIBPATH environment variable ... should be DATAPATH plus a few extra paths
-cmtpath_pattern \
- path_prepend CALIBPATH "" \
- <project>_with_installarea&Unix "<path>/$(cmt_installarea_prefix)/share" ; \
-#must remove the following path, which tends to appear before the testarea installarea, and we want testarea to be the first search location
-path_remove CALIBPATH "/cvmfs/atlas.cern.ch/repo/tools/slc6/cmt"
-
-#add the extra paths: cvmfs/afs/http for everything except point1, which has a special sw location
-macro CheckAtlasP1 "`env | grep -q ^ATLAS_P1_SETUP= && echo AtlasP1 || echo NotAtlasP1`"
-apply_tag $(CheckAtlasP1)
-path_append CALIBPATH "/sw/DbData/GroupData" NotAtlasP1 ""
-path_append CALIBPATH "/cvmfs/atlas.cern.ch/repo/sw/database/GroupData" AtlasP1 ""
-path_append CALIBPATH "/afs/cern.ch/atlas/www/GROUPS/DATABASE/GroupData" AtlasP1 ""
-path_append CALIBPATH "http//atlas.web.cern.ch/Atlas/GROUPS/DATABASE/GroupData" AtlasP1 ""
-
-
-
-private
-use AtlasBoost AtlasBoost-* External
-use AtlasROOT AtlasROOT-* External
-
-#unit test code... kept in case something depends on it
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=PathResolver
-path_prepend DATAPATH ../test
-path_prepend DATAPATH ../test/B
-path_prepend DATAPATH ../test/A
-
-end_private
-
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS RIO)"
-
-library PathResolver ../Root/*.cxx
-apply_pattern installed_library
-
-branches python
-
-apply_pattern declare_python_modules files="*.py"
-
-apply_pattern declare_scripts files=" -s=$(PathResolver_root)/python showReleaseNotes.py"
-
-#Next three lines kept for possible future developments
-#macro_append pp_cppflags " '-DPACKAGE_NAME=$(q2)$(package)$(q2)' '-DPACKAGE_OFFSET=$(q2)$($(package)_offset)$(q2)' "
-#pattern declare_calib \
-# apply_pattern generic_declare_for_link files="<files>" prefix="share/atlasoff/$(<package>_offset)/<package>/<version>" name="<name>"
-
-private
-use AtlasReflex AtlasReflex-* External -no_auto_imports
-apply_pattern lcgdict dict=PathResolver selectionfile=selection.xml headerfiles="../PathResolver/PathResolverDict.h"
-end_private
diff --git a/Tools/PerformanceReports/cmt/requirements b/Tools/PerformanceReports/cmt/requirements
deleted file mode 100644
index e4f06a919e6c22edcc40c20c61d66ce9c0a42d28..0000000000000000000000000000000000000000
--- a/Tools/PerformanceReports/cmt/requirements
+++ /dev/null
@@ -1,8 +0,0 @@
-package PerformanceReports
-author Ilija Vukotic <ilija@vukotic.me>
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="*.py"
-
diff --git a/Tools/PerformanceReports/cmt/version.cmt b/Tools/PerformanceReports/cmt/version.cmt
deleted file mode 100644
index 61099f5ab958cf9a10680e9145b6601975864738..0000000000000000000000000000000000000000
--- a/Tools/PerformanceReports/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-PerformanceReports-00-00-23
diff --git a/Tools/PmbCxxUtils/cmt/requirements b/Tools/PmbCxxUtils/cmt/requirements
deleted file mode 100644
index 141c32eadd10f830a75721b14d3c65dcc2ec1301..0000000000000000000000000000000000000000
--- a/Tools/PmbCxxUtils/cmt/requirements
+++ /dev/null
@@ -1,9 +0,0 @@
-package PmbCxxUtils
-
-author Thomas Kittelmann <thomas.kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCxxPolicy AtlasCxxPolicy-*
-
-library PmbCxxUtils *.cxx
-apply_pattern installed_library
diff --git a/Tools/PmbUtils/cmt/requirements b/Tools/PmbUtils/cmt/requirements
deleted file mode 100644
index 7f4952a06763041568ec2089e9ed7f7c89da307b..0000000000000000000000000000000000000000
--- a/Tools/PmbUtils/cmt/requirements
+++ /dev/null
@@ -1,10 +0,0 @@
-package PmbUtils
-
-use AtlasPolicy AtlasPolicy-*
-use CoolDozer CoolDozer-* Tools -no_auto_imports
-use PyUtils PyUtils-* Tools -no_auto_imports
-
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="*.py pmb-rtt-domain-callgrind"
-
diff --git a/Tools/PyJobTransforms/cmt/requirements b/Tools/PyJobTransforms/cmt/requirements
deleted file mode 100755
index b22c79120e9a769dbf251b83529e4ba9cc7ac4ca..0000000000000000000000000000000000000000
--- a/Tools/PyJobTransforms/cmt/requirements
+++ /dev/null
@@ -1,54 +0,0 @@
-package PyJobTransforms
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPython AtlasPython-* External -no_auto_imports
-use AtlasPyFwdBwdPorts * External -no_auto_imports
-
-apply_pattern declare_python_modules files="*.py"
-
-# default directory in current package to look for trf's.
-macro tfs_dir '../scripts'
-
-apply_pattern declare_scripts files="${expand_files_cmd} find_*.py -s=../python"
-apply_pattern generic_declare_for_link kind=runtime files='-s=../share *.db' prefix=share name=trf
-
-# Pattern to declare python job transforms.
-# Each job transform normally has 2 components:
-# - The python script (*_tf.py), defining the trf
-# - The corresponding skeleton job options file (at least for athena transforms)
-# The pattern takes 2 arguments:
-# tfs = list of job transforms, by default taken from ../scripts
-# These scripts will be installed in InstallArea/share/bin
-# jo = list of skeleton joboptions files belonging to the job transforms
-# By default taken from ../share
-# These will be installed in the Installarea/jobOptions/<package>
-#
-#
-pattern declare_job_transforms \
- private ; \
- apply_pattern generic_declare_for_link kind=tfs_exe files='-s=${tfs_dir} <tfs>' prefix=share/bin ; \
- apply_pattern generic_declare_for_link kind=tfs_pyt files='-s=${tfs_dir} <tfs>' prefix=python/<package> ; \
- apply_pattern generic_declare_for_link kind=tfs_jop files='-s=../share <jo>' prefix=jobOptions/<package> ; \
- macro <package>_job_transforms "`${expand_files_cmd} -r=$(<PACKAGE>ROOT) -d=<package> -s=${tfs_dir} <tfs>`" ; \
- apply_pattern install_python_init ; \
- macro_append <package>_python_init_dependencies " install_tfs_pyt " ; \
- end_private ; \
- macro_append all_job_transforms " ${<package>_job_transforms}"
-
-# For sample/utility tfs we need to do this after the pattern def
-apply_pattern declare_job_transforms tfs='*_tf.py' jo='*.py'
-
-# RTT tests
-apply_pattern generic_declare_for_link kind=test files='-s=../test test_*.py' prefix=share/JobTransforms/test
-macro PyJobTransforms_TestConfiguration "../test/PyJobTransforms_TestConfiguration.xml"
-apply_pattern declare_runtime_extras extras="../test/PyJobTransforms_TestConfiguration.xml"
-
-# Now make sure we generate the signature file with transform arguments in it
-## DEPRECATED
-#apply_pattern generic_declare_for_link kind=json files="../share/$(package)Signatures.json" prefix=share/JobTransforms
-#
-#private
-#action makeTrfSignatures "../scripts/makeTrfSignatures.py --output ../share/$(package)Signatures.json"
-#macro_append makeTrfSignatures_dependencies " install_tfs_jop install_python_modules "
-#macro_append all_dependencies " makeTrfSignatures "
-#macro_append check_install_json_dependencies " makeTrfSignatures "
diff --git a/Tools/PyJobTransformsCore/cmt/requirements b/Tools/PyJobTransformsCore/cmt/requirements
deleted file mode 100755
index c9eb20cefd80dfa12e1fe3b639918ee4ee17b862..0000000000000000000000000000000000000000
--- a/Tools/PyJobTransformsCore/cmt/requirements
+++ /dev/null
@@ -1,40 +0,0 @@
-package PyJobTransformsCore
-author Alvin Tan <clat@hep.ph.bham.ac.uk>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPython AtlasPython-* External -no_auto_imports
-
-
-# default directory in current package to look for trf's.
-macro trfs_dir '../scripts'
-
-# command used to expand filenames to include package name
-macro expand_files_cmd expand_files.py
-
-apply_pattern declare_python_modules files="*.py"
-
-apply_pattern declare_scripts files="${expand_files_cmd} slimmetadata checklog.py find_*.py trf_ls -s=../python envutil.py"
-apply_pattern generic_declare_for_link kind=runtime files='-s=../share *.db' prefix=share name=trf
-
-# Pattern to declare python jobtransforms.
-# Each jobtransform normally has 2 components:
-# - The python script (*_trf.py) defining the trf
-# - The corresponding skeleton joboptions file(s)
-# The pattern takes 2 arguments:
-# trfs = list of jobtransforms, by default taken from ../scripts
-# It will be installed in as python modules in InstallArea/python/<package>
-# and as executable scripts in InstallArea/share/bin
-# jo = list of skeleton joboptions files belonging to the jobtransforms (usually one).
-# By default taken from ../share
-# It will be installed in the Installarea/jobOptions/<package>
-#
-pattern declare_jobtransforms \
- private ; \
- apply_pattern generic_declare_for_link kind=trfs_exe files='-s=${trfs_dir} <trfs>' prefix=share/bin ; \
- apply_pattern generic_declare_for_link kind=trfs_pyt files='-s=${trfs_dir} <trfs>' prefix=python/<package> ; \
- apply_pattern generic_declare_for_link kind=trfs_jop files='-s=../share <jo>' prefix=jobOptions/<package> ; \
- macro <package>_jobtransforms "`${expand_files_cmd} -r=$(<PACKAGE>ROOT) -d=<package> -s=${trfs_dir} <trfs>`" ; \
- apply_pattern install_python_init ; \
- macro_append <package>_python_init_dependencies " install_trfs_pyt " ; \
- end_private ; \
- macro_append all_jobtransforms " ${<package>_jobtransforms}"
diff --git a/Tools/PyJobTransformsMisc/cmt/requirements b/Tools/PyJobTransformsMisc/cmt/requirements
deleted file mode 100644
index 084dd2542b883e22292173ecc1ea9454a9bf6779..0000000000000000000000000000000000000000
--- a/Tools/PyJobTransformsMisc/cmt/requirements
+++ /dev/null
@@ -1,12 +0,0 @@
-package PyJobTransformsMisc
-
-author Chun Lik Tan (Alvin)
-
-use AtlasPolicy AtlasPolicy-*
-use PyJobTransformsCore PyJobTransformsCore-* Tools
-use AtlasROOT AtlasROOT-* External -no_auto_imports
-
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="merge_trf.py"
-apply_pattern declare_jobtransforms trfs='*_trf.py' jo='*.py'
-
diff --git a/Tools/PyUtils/cmt/requirements b/Tools/PyUtils/cmt/requirements
deleted file mode 100644
index 237f7229829453f427e4b9cab77d2d9f20f86aaa..0000000000000000000000000000000000000000
--- a/Tools/PyUtils/cmt/requirements
+++ /dev/null
@@ -1,93 +0,0 @@
-package PyUtils
-
-author Sebastien Binet <binet@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasPython AtlasPython-* External -no_auto_imports
-use AtlasPyROOT AtlasPyROOT-* External -no_auto_imports
-use AtlasPyFwdBwdPorts AtlasPyFwdBwdPorts-* External -no_auto_imports
-use PyCmt PyCmt-* Tools -no_auto_imports
-use RootUtils RootUtils-* Control -no_auto_imports
-
-branches python bin
-
-## some handy aliases
-alias checkFile checkFile.py
-alias checkSG checkSG.py
-alias checkxAOD checkxAOD.py
-alias diffPoolFiles diffPoolFiles.py
-alias merge-poolfiles merge-poolfiles.py
-alias checkTag checkTag.py
-alias checkMetaSG checkMetaSG.py
-alias setupWorkArea setupWorkArea.py
-alias pyroot pyroot.py
-alias print_auditor_callgraph print_auditor_callgraph.py
-alias gen_klass gen_klass.py
-alias build_cmt_pkg_db build_cmt_pkg_db.py
-alias diffConfigs diffConfigs.py
-alias vmem-sz vmem-sz.py
-alias dso-stats dso-stats.py
-alias dump-athfile dump-athfile.py
-alias pkgco pkgco.py
-alias tabnanny-checker tabnanny-checker.py
-alias get-tag-diff get-tag-diff.py
-alias avn avn.py
-alias abootstrap-wkarea abootstrap-wkarea.py
-alias tc-submit-tag tcSubmitTag.py
-alias tcSubmitTag tcSubmitTag.py
-alias acmd acmd.py
-alias diff-jobo-cfg diff-jobo-cfg.py
-alias filter-and-merge-d3pd filter-and-merge-d3pd.py
-alias diffTAGTree diffTAGTree.py
-alias getMetadata getMetadata.py
-
-private
-
-apply_pattern declare_python_modules files="*.py AthFile scripts"
-apply_pattern declare_scripts files="\
- -s=$(PyUtils_root)/bin \
- abootstrap-wkarea.py \
- acmd.py \
- atl-gen-athena-d3pd-reader \
- avn.py \
- build_cmt_pkg_db.py \
- checkFile.py \
- checkPlugins.py \
- checkSG.py \
- checkMetaSG.py \
- checkTP.py \
- checkTag.py \
- checkxAOD.py \
- cmtClients.py \
- diff-athfile \
- diff-jobo-cfg.py \
- diffConfigs.py \
- diffPoolFiles.py \
- diffTAGTree.py \
- dlldep.py \
- dso-stats.py \
- dump-athfile.py \
- dumpAthfilelite.py \
- filter-and-merge-d3pd.py \
- getMetadata.py \
- gen-typereg-dso.py \
- gen_klass.py \
- get-tag-diff.py \
- gprof2dot \
- issues \
- lstags \
- magnifyPoolFile.py \
- merge-poolfiles.py \
- pep8.py \
- pkgco.py \
- pool_extractFileIdentifier.py \
- pool_insertFileToCatalog.py \
- print_auditor_callgraph.py \
- pyroot.py \
- setupWorkArea.py \
- tabnanny-checker.py \
- tcSubmitTag.py \
- vmem-sz.py \
-"
-
-end_private
diff --git a/Tools/RunTimeTester/cmt/requirements b/Tools/RunTimeTester/cmt/requirements
deleted file mode 100755
index 5af6e1674d2265cefe4e947cc92520804a84366f..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/cmt/requirements
+++ /dev/null
@@ -1,8 +0,0 @@
-package RunTimeTester
-author Peter Sherwood <Peter.Sherwood@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_runtime extras="../share/RunTimeTester_TestConfiguration.xml ../share/RttLibraryTools.py"
-
-macro RunTimeTester_TestConfiguration "../share/RunTimeTester_TestConfiguration.xml"
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/Makefile b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/cleanup.csh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/cleanup.csh
deleted file mode 100644
index d68b017950013f584e552365c4429275f6d6e185..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/cleanup.csh
+++ /dev/null
@@ -1,11 +0,0 @@
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r20p20080222
-endif
-source ${CMTROOT}/mgr/setup.csh
-set tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set tempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt cleanup -csh -pack=AthExHelloWorld -version=AthExHelloWorld-01-02-00 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive/Control/AthenaExamples $* >${tempfile}; source ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/cleanup.sh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/cleanup.sh
deleted file mode 100644
index 2520e37bd09b73d64bf06f9b05166f9616416b21..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/cleanup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r20p20080222; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt cleanup -sh -pack=AthExHelloWorld -version=AthExHelloWorld-01-02-00 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive/Control/AthenaExamples $* >${tempfile}; . ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/requirements b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/requirements
deleted file mode 100755
index b928ce3a14d0cdb1ce59a545843af31bd9df3f8b..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package AthExHelloWorld
-
-author Paolo Calafiura <Paolo.Calafiura@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-
-library AthExHelloWorld *.cxx -s=components *.cxx
-apply_pattern component_library
-#details about the component_library and dual_library patterns
-# at http://www.cern.ch/Atlas/GROUPS/SOFTWARE/OO/architecture/General/Documentation/PackageStructure.txt
-
-apply_pattern declare_joboptions files="HelloWorldOptions.py"
-
-apply_pattern declare_python_modules files="*.py"
-
-macro AthExHelloWorld_TestConfiguration "../test/AthExHelloWorld_TestConfiguration.xml"
-apply_pattern declare_runtime extras="../test/AthExHelloWorld_TestConfiguration.xml"
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/setup.csh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/setup.csh
deleted file mode 100644
index c2227b7d21c3185058b47ca8dec5daccfdbcd7af..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/setup.csh
+++ /dev/null
@@ -1,14 +0,0 @@
-# echo "Setting AthExHelloWorld AthExHelloWorld-01-02-00 in /afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive/Control/AthenaExamples"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r20p20080222
-endif
-source ${CMTROOT}/mgr/setup.csh
-
-set tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set tempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt setup -csh -pack=AthExHelloWorld -version=AthExHelloWorld-01-02-00 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive/Control/AthenaExamples -no_cleanup $* >${tempfile}; source ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/setup.sh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/setup.sh
deleted file mode 100644
index b792eeab4e1380566209d60f9e28ebb50416df1a..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# echo "Setting AthExHelloWorld AthExHelloWorld-01-02-00 in /afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive/Control/AthenaExamples"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r20p20080222; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-
-tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt setup -sh -pack=AthExHelloWorld -version=AthExHelloWorld-01-02-00 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive/Control/AthenaExamples -no_cleanup $* >${tempfile}; . ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/version.cmt b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/version.cmt
deleted file mode 100644
index a1ecd48d3f4e984b69db5175918b1cf23e340f07..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-AthExHelloWorld-01-02-00
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
old mode 100755
new mode 100644
index 69b515ac8c509b3ffee96247f71cbe38a7f5bcb9..2dc672dadc22a87b0e005f25e8f388010a6ebc79
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
+++ b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
@@ -1,12 +1,7 @@
#include "../HelloAlg.h"
#include "../HelloTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( HelloAlg )
-DECLARE_TOOL_FACTORY( HelloTool )
+DECLARE_COMPONENT( HelloAlg )
+DECLARE_COMPONENT( HelloTool )
-DECLARE_FACTORY_ENTRIES(AthExHelloWorld) {
- DECLARE_ALGORITHM( HelloAlg )
- DECLARE_TOOL( HelloTool )
-}
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx
deleted file mode 100755
index b4329e73aea5902970b0077a7e657691e665db47..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthExHelloWorld)
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/Makefile b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/Makefile
deleted file mode 100644
index c2c9dbbed79a7894e694cf7a0c7d1bf0756334c3..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CMTROOT)/src/Makefile.header
-
-include $(CMTROOT)/src/constituents.make
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/cleanup.csh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/cleanup.csh
deleted file mode 100644
index e142f99d2298284d6505a9d7e2a940b36e2f0798..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/cleanup.csh
+++ /dev/null
@@ -1,11 +0,0 @@
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r20p20080222
-endif
-source ${CMTROOT}/mgr/setup.csh
-set tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set tempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt cleanup -csh -pack=TestProject -version=TestProject-00-00-02 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive $* >${tempfile}; source ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/cleanup.sh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/cleanup.sh
deleted file mode 100644
index f33639ceedd7a7382639f661599e2e543edd4080..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/cleanup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r20p20080222; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt cleanup -sh -pack=TestProject -version=TestProject-00-00-02 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive $* >${tempfile}; . ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/requirements b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/requirements
deleted file mode 100755
index aca108d38d1e72edd74e1781f7f84a16bfc82b30..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/requirements
+++ /dev/null
@@ -1,81 +0,0 @@
-package TestProject
-
-author David Quarrie <David.Quarrie@cern.ch>
-
-# This is a skeleton package that is designed to help developers with
-# their test releases, by making it possible to broadcast build
-# commands to all packages that they have checked, and also to create
-# the necessary run-time environment. This package, TestProject, is
-# designed for use with ATLAS project builds, whereas the TestRelease
-# package is designed for use with full builds.
-#
-#---------------------------------------------------------------------
-# This line is necessary to ensure that the Atlas policies and patterns
-# are enforced and available.
-use AtlasPolicy AtlasPolicy-*
-
-#---------------------------------------------------------------------
-# Setup the build environment so that a "cmt broadcast ..." will be
-# propagated to all checked out packages. There are two different
-# approaches to doing this:
-#
-# 1. Add a dependency against the complete Atlas project. This will
-# automatically create dependencies against all packages within the
-# project, at the cost of a performance penalty for e.g. running
-# source setup.[c]sh. This is the simpler of the two alternatives
-# since in most cases only minor editting of this file is necessary
-# in order to specify which project is being worked against. Note
-# that there are potential "gotcha's" with this, especially if the
-# version tag of a checked out package is different from that in the
-# base release.
-#
-# 2. Add an explicit dependency against each checked out package. The
-# syntax is:
-#
-# use <Pkg> <tag> [<parent>]
-#
-# where:
-#
-# <Pkg> The name of the package
-# <tag> The package tag (e.g. MyPackage-00-01-02)
-# <parent> The parent packages if this is a sub-package
-#
-# e.g.
-#
-# use AthExHelloWorld AthExHelloWorld-00-* Control/AthenaExamples
-#
-# If you wish to use strategy 1. above, uncomment the appropriate
-# line below corresponding to the project that you're working against.
-#use AtlasAnalysisRelease AtlasAnalysisRelease-*
-#use AtlasConditionsRelease AtlasConditionsRelease-*
-#use AtlasCoreRelease AtlasCoreRelease-*
-#use AtlasEventRelease AtlasEventRelease-*
-#use AtlasProductionRelease AtlasProductionRelease-*
-#use AtlasOfflineRelease AtlasOfflineRelease-*
-#use AtlasReconstructionRelease AtlasReconstructionRelease-*
-#use AtlasSimulationRelease AtlasSimulationRelease-*
-#use AtlasTriggerRelease AtlasTriggerRelease-*
-
-# If you wish to use strategy 2. above, insert the relevant use statements for
-# your checked out packages here
-
-use AthExHelloWorld AthExHelloWorld-00-* Control/AthenaExamples
-
-#---------------------------------------------------------------------
-# Setup the run-time environment. Nothing needs to be done here if you
-# use alternative 1 above to setup the build time environment since
-# that is done automatically by the dependency on the <project>Release
-# package. However, if you are using alternative 2, you'll need to
-# uncomment one of the the following use statements, or add your
-# own in order to setup the run-time environment. There isn't a simple
-# way of doing this uniquely.
-#use AtlasAnalysisRunTime AtlasAnalysisRunTime-* -no_auto_imports
-#use AtlasConditionsRunTime AtlasConditionsRunTime-* -no_auto_imports
-use AtlasCoreRunTime AtlasCoreRunTime-* -no_auto_imports
-#use AtlasEventRunTime AtlasEventRunTime-* -no_auto_imports
-#use AtlasProductionRunTime AtlasProductionRunTime-* -no_auto_imports
-#use AtlasOfflineRunTime AtlasOfflineRunTime-* -no_auto_imports
-#use AtlasReconstructionRunTime AtlasReconstructionRunTime-* -no_auto_imports
-#use AtlasSimulationRunTime AtlasSimulationRunTime-* -no_auto_imports
-#use AtlasTriggerRunTime AtlasTriggerRunTime-* -no_auto_imports
-#use MinimalRunTime MinimalRunTime-* Control -no_auto_imports
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/setup.csh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/setup.csh
deleted file mode 100644
index 3b3939d07ec5a6bae58e34ca3136c412caa316ae..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/setup.csh
+++ /dev/null
@@ -1,14 +0,0 @@
-# echo "Setting TestProject TestProject-00-00-02 in /afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive"
-
-if ( $?CMTROOT == 0 ) then
- setenv CMTROOT /afs/cern.ch/sw/contrib/CMT/v1r20p20080222
-endif
-source ${CMTROOT}/mgr/setup.csh
-
-set tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if $status != 0 then
- set tempfile=/tmp/cmt.$$
-endif
-${CMTROOT}/mgr/cmt setup -csh -pack=TestProject -version=TestProject-00-00-02 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive -no_cleanup $* >${tempfile}; source ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/setup.sh b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/setup.sh
deleted file mode 100644
index e560074b62b2a6d63793f1f4df50694bba4d7ca9..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# echo "Setting TestProject TestProject-00-00-02 in /afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive"
-
-if test "${CMTROOT}" = ""; then
- CMTROOT=/afs/cern.ch/sw/contrib/CMT/v1r20p20080222; export CMTROOT
-fi
-. ${CMTROOT}/mgr/setup.sh
-
-tempfile=`${CMTROOT}/mgr/cmt -quiet build temporary_name`
-if test ! $? = 0 ; then tempfile=/tmp/cmt.$$; fi
-${CMTROOT}/mgr/cmt setup -sh -pack=TestProject -version=TestProject-00-00-02 -path=/afs/cern.ch/atlas/project/RTT/data/brinick/TestFrameWork2/testsuites/linuxinteractive -no_cleanup $* >${tempfile}; . ${tempfile}
-/bin/rm -f ${tempfile}
-
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/version.cmt b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/version.cmt
deleted file mode 100644
index d9a21b4d7d0cf8deada886321e41535ec91e9a2e..0000000000000000000000000000000000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/TestProject/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-TestProject-00-00-02
diff --git a/Tools/Scripts/cmt/requirements b/Tools/Scripts/cmt/requirements
deleted file mode 100755
index 7954c327cb60f2b6f2270d861a0d13b04c619951..0000000000000000000000000000000000000000
--- a/Tools/Scripts/cmt/requirements
+++ /dev/null
@@ -1,44 +0,0 @@
-package Scripts
-
-author Christian Arnault <arnault@lal.in2p3.fr>
-author Claire Bourdarios <Claire.Bourdarios@cern.ch>
-author Jakob Nielsen <langgard@alf.nbi.dk>
-author David Quarrie <David.Quarrie@cern.ch>
-
-# Description:-
-# This package contains the following release-related scripts:-
-#
-# checkreq.sh Checks requirements files
-# get_joboptions get jo files from installation area to the current directory
-# get_files get any file from installation area to the current directory
-# lookup_xxx.sh helper scripts for the auto-completion mechanisms
-#
-# Refer to the doc/README file for more details. The scripts
-# are installed in the InstallArea/share/bin directory within
-# a release.
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_scripts files="get_joboptions get_files \
- lookup_local_joboptions.sh \
- lookup_joboptions.sh lookup_scripts.sh lookup_xmls.sh lookup_data.sh \
- checkDbgSymbols.sh"
-
-# Source the tab completion script for jobOptions and other files
-# For athena tab completion, on can have either:
-# local completion - only look in '.' (default), or
-# global completion - look in '.' and JOBOPTIONSSEARCHPATH
-#
-# To turn on the expanded version for athena use one of the tags:
-#
-# apply_tag extended_athena_tab_completion
-# apply_tag ext_athena_tab_compl
-#
-
-set DO_EXT_ATHENA_TAB_COMPLETION "0" \
- extended_athena_tab_completion "1" \
- ext_athena_tab_compl "1"
-set SETUPCOMPLETIONROOT $(SCRIPTSROOT)
-
-setup_script $(SETUPCOMPLETIONROOT)/cmt/completion/setup_completion_main
-
diff --git a/Tools/Tier0ChainTests/cmt/requirements b/Tools/Tier0ChainTests/cmt/requirements
deleted file mode 100644
index 62c231d9911271d307d9397c5a644cc8ba042462..0000000000000000000000000000000000000000
--- a/Tools/Tier0ChainTests/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package Tier0ChainTests
-
-author Max Baak <mbaak@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_scripts files="../scripts/tct_*.py ../scripts/tct_*.sh"
-#apply_pattern declare_joboptions files="../share/*.py"
-apply_pattern declare_python_modules files="../python/*.py"
-
-# note that the cut command is picking arguments 6 and 7, need for the built directory
-# /build/atnight/localbuilds/nightlies/14.5.X.Y-T0/AtlasTier0/rel_0
-# path_append TCTXMLFILE "../test/Tier0ChainTests_`echo $CMTPATH | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 6,7 | sed 's/\//_/'`.xml"
-path_append TCTXMLFILE "../test/Tier0ChainTests_`echo $CMTPATH | awk -F "nightlies" '{ print $2 }' | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 2,3 | sed 's/\//_/'`.xml"
-macro Tier0ChainTests_TestConfiguration "../../../InstallArea/share/Tier0ChainTests_TestConfiguration.xml"
-apply_pattern declare_runtime extras="`if [ -f ${TCTXMLFILE} ]; then cp -f $TCTXMLFILE ../Tier0ChainTests_TestConfiguration.xml ; echo ../Tier0ChainTests_TestConfiguration.xml; else echo ../test/Tier0ChainTests_TestConfiguration.xml; fi`"
-
-# For example, for $CMTPATH=/afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasOffline/rel_4, the following command:
-# > echo "../test/Tier0ChainTests_`echo $AtlasArea | sed 's/-VAL//' | sed 's/-T0//' | sed 's/-Prod//' | cut -d "/" -f 8,9 | sed 's/\//_/'`.xml"
-# will result in: ../test/Tier0ChainTests_devval_AtlasOffline.xml
-# if this file is not found, the fall-back file is: ../test/Tier0ChainTests_TestConfiguration.xml
-
-private
-use TestPolicy TestPolicy-*
-public
-
-private
-apply_pattern validate_xml
-public
diff --git a/Tools/ValgrindRTTJobs/cmt/requirements b/Tools/ValgrindRTTJobs/cmt/requirements
deleted file mode 100755
index 70e12f42921e7ff754149a9ccd1cfc450273340f..0000000000000000000000000000000000000000
--- a/Tools/ValgrindRTTJobs/cmt/requirements
+++ /dev/null
@@ -1,29 +0,0 @@
-package ValgrindRTTJobs
-
-author Rolf Seuster <seuster AT cern.ch>
-
-private
-
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use AtlasPolicy AtlasPolicy-*
-# use AtlasPython AtlasPython-* External
-use PyJobTransformsCore PyJobTransformsCore-* Tools
-#use AtlasValgrind AtlasValgrind-* External
-
-use TestPolicy TestPolicy-*
-apply_pattern validate_xml
-
-public
-
-#apply_pattern declare_jobtransforms trfs='valgrind_trf.py' jo='*.py'
-
-public
-
-library ValgrindRTTJobs *.cxx components/*.cxx
-apply_pattern component_library
-
-macro ValgrindRTTJobs_TestConfiguration "../test/ValgrindRTTJobs_TestConfiguration.xml"
-
-apply_pattern declare_runtime extras="../test/ValgrindRTTJobs_TestConfiguration.xml PostProcessValgrind.py memConsumption.C historyNightlies.C *.supp processValgrindOutput.sh dhat-postprocess.pl"
-
diff --git a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
index 29de337628d0a0d9077d0e6a61a301e9773c5a72..eba40429787cc481f8f6233f3b4db80ef3ce8dd9 100644
--- a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
+++ b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
@@ -1,9 +1,5 @@
#include "../ValgrindHelperAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-DECLARE_ALGORITHM_FACTORY( ValgrindHelperAlg )
+DECLARE_COMPONENT( ValgrindHelperAlg )
-DECLARE_FACTORY_ENTRIES( ValgrindRTTJobs ) {
- DECLARE_ALGORITHM( ValgrindHelperAlg ) ;
-}
diff --git a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx
deleted file mode 100644
index 47092cf57541556e4b74337d3eb5b73aad424a47..0000000000000000000000000000000000000000
--- a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ValgrindRTTJobs)
diff --git a/Tools/XMLCoreParser/cmt/requirements b/Tools/XMLCoreParser/cmt/requirements
deleted file mode 100755
index dee651ae9ca0c444a05004f7faf91b569d5b3c5a..0000000000000000000000000000000000000000
--- a/Tools/XMLCoreParser/cmt/requirements
+++ /dev/null
@@ -1,33 +0,0 @@
-package XMLCoreParser
-
-author Christian Arnault <arnault@lal.in2p3.fr>
-
-use AtlasPolicy AtlasPolicy-*
-
-library XMLCoreParser XMLCoreParser.cxx DOMNode.cxx ExpatCoreParser.cxx
-apply_pattern installed_library
-
-private
-use AtlasExpat AtlasExpat-* External
-
-ignore_pattern config
-
-macro check_args "../data/ATLAS_AGDD.xml"
-
-use TestTools TestTools-* AtlasTest
-apply_pattern UnitTest_run unit_test=example1
-apply_pattern UnitTest_run unit_test=example2
-
-#macro example3_check_args "$(check_args)"
-#macro example3_dependencies XMLCoreParser
-#application example3 -check -s=../doc example3.cxx
-
-macro example4_dependencies XMLCoreParser
-application example4 -s=../doc example4.cxx
-
-path_prepend XMLPATH "../data"
-
-macro texpatlinkopts "" WIN32 " $(cmt_installarea_linkopts) $(Expat_linkopts) "
-
-application texpat texpat.cxx DOMNode.cxx ExpatCoreParser.cxx
-macro texpat_dependencies XMLCoreParser
diff --git a/graphics/AtlantisJava/cmt/requirements b/graphics/AtlantisJava/cmt/requirements
deleted file mode 100755
index 9c7282c2734414ab700814c67a9e837bcd166a4f..0000000000000000000000000000000000000000
--- a/graphics/AtlantisJava/cmt/requirements
+++ /dev/null
@@ -1,31 +0,0 @@
-package AtlantisJava
-
-use AtlasPolicy AtlasPolicy-*
-use JavaSDK JavaSDK-* External
-use Ant Ant-* External
-
-macro_append install_jar_dependencies " buildTask"
-
-document ant buildTask ../ant/build.xml anttarget=jar-atlantis properties="-DtargetDir=."
-
-apply_pattern declare_scripts files=" atlantis atlantis_online "
-
-apply_pattern declare_joboptions files=" InteractiveServer.py "
-
-apply_pattern generic_declare_for_copy kind=jar prefix="share/AtlantisJava" \
- files=" ../atlantis.jar "
-apply_pattern generic_declare_for_copy kind=lib prefix="share/AtlantisJava/lib" \
- files=" -s=../lib *.jar "
-apply_pattern generic_declare_for_copy kind=img prefix="share/AtlantisJava/img" \
- files=" -s=../img *.gif *.png *.jpg "
-
-apply_pattern generic_declare_for_copy kind=configuration prefix="share/AtlantisJava/configuration" \
- files=" -s=../configuration *.xml *.csv PSProlog.txt "
-apply_pattern generic_declare_for_copy kind=events prefix="share/AtlantisJava/events" \
- files=" -s=../events event.dtd *.zip "
-apply_pattern generic_declare_for_copy kind=geometry prefix="share/AtlantisJava/geometry" \
- files=" -s=../geometry *.xml "
-apply_pattern generic_declare_for_copy kind=help prefix="share/AtlantisJava/help" \
- files=" -s=../help help.jar online.xml *.png "
-
-set ANT_OPTS "-Xms64m -Xmx64m"
diff --git a/graphics/EventDisplayFilters/cmt/requirements b/graphics/EventDisplayFilters/cmt/requirements
deleted file mode 100644
index f75925714a8a758a548aa86855bc6d6efc212fa5..0000000000000000000000000000000000000000
--- a/graphics/EventDisplayFilters/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-#################################################
-package EventDisplayFilters
-author Sebastian Boeser, Brian Thomas Martin
-
-use AtlasPolicy AtlasPolicy*
-use GaudiInterface GaudiInterface-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use StoreGate StoreGate-* Control
-
-library EventDisplayFilters *.cxx -s=components *.cxx
-apply_pattern component_library
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-private
-use TrigT1Result TrigT1Result-* Trigger/TrigT1
-use TrkSpacePoint TrkSpacePoint-* Tracking/TrkEvent
-use TileIdentifier TileIdentifier-* TileCalorimeter
-use TileEvent TileEvent-* TileCalorimeter
-#################################################
-
diff --git a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
index 8bb72a9eee1ae4e1e80720e76aa18f5ff73f20d9..9e28eb1c01d3ebb68b89b0c11c7fcac20c629984 100644
--- a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
+++ b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
@@ -1,11 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "EventDisplayFilters/FilterUsingMBTS.h"
#include "EventDisplayFilters/FilterUsingMBTSTiming.h"
#include "EventDisplayFilters/FilterUsingSpacePoints.h"
-DECLARE_ALGORITHM_FACTORY( FilterUsingMBTS )
-DECLARE_ALGORITHM_FACTORY( FilterUsingMBTSTiming )
-DECLARE_ALGORITHM_FACTORY( FilterUsingSpacePoints )
-DECLARE_FACTORY_ENTRIES( EventDisplayFilters ) {
- DECLARE_ALGORITHM( FilterUsingMBTSTiming )
- DECLARE_ALGORITHM( FilterUsingSpacePoints )
-}
+DECLARE_COMPONENT( FilterUsingMBTS )
+DECLARE_COMPONENT( FilterUsingMBTSTiming )
+DECLARE_COMPONENT( FilterUsingSpacePoints )
+
diff --git a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx
deleted file mode 100644
index c83aa3a0c56678ae8b3726be0479f7510a17e310..0000000000000000000000000000000000000000
--- a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(EventDisplayFilters)
diff --git a/graphics/EventDisplaysOnline/cmt/requirements b/graphics/EventDisplaysOnline/cmt/requirements
deleted file mode 100755
index 6a08603d3f964d6324970b6ec35339d16801ef00..0000000000000000000000000000000000000000
--- a/graphics/EventDisplaysOnline/cmt/requirements
+++ /dev/null
@@ -1,10 +0,0 @@
-package EventDisplaysOnline
-
-author Sebastian Boeser <sboeser@hep.ucl.ac.uk>
-
-use AtlasPolicy AtlasPolicy-*
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-apply_pattern declare_scripts files="../scripts/*.sh"
-
diff --git a/graphics/GeometryJiveXML/cmt/requirements b/graphics/GeometryJiveXML/cmt/requirements
deleted file mode 100755
index e3cb39af7813ad21da922c0b806042d79b363fc7..0000000000000000000000000000000000000000
--- a/graphics/GeometryJiveXML/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package GeometryJiveXML
-
-public
-
-use AtlasPolicy AtlasPolicy-*
-
-use AtlasCLHEP AtlasCLHEP-* External
-use AthenaBaseComps AthenaBaseComps-* Control
-
-use JiveXML JiveXML-* graphics
-
-private
-
-use StoreGate StoreGate-* Control
-use GaudiInterface GaudiInterface-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-
-use CaloDetDescr CaloDetDescr-* Calorimeter
-use TileDetDescr TileDetDescr-* TileCalorimeter
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
-use LArReadoutGeometry LArReadoutGeometry-* LArCalorimeter/LArGeoModel
-
-public
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern component_library
-library GeometryJiveXML *.cxx components/*.cxx
diff --git a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
old mode 100755
new mode 100644
index 47a2075ad8d121dab1372bc3401ec8b9d402cd6c..068f3a518e55a2e5b4e7c0de8bf9c86ea0df6e20
--- a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
+++ b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
@@ -1,13 +1,8 @@
#include "GeometryJiveXML/GeometryWriter.h"
#include "GeometryJiveXML/MuonGeometryWriter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
-DECLARE_TOOL_FACTORY(GeometryWriter)
-DECLARE_TOOL_FACTORY(MuonGeometryWriter)
+DECLARE_COMPONENT( GeometryWriter )
+DECLARE_COMPONENT( MuonGeometryWriter )
-DECLARE_FACTORY_ENTRIES(GeometryJiveXML) {
- DECLARE_ALGTOOL(GeometryWriter)
- DECLARE_ALGTOOL(MuonGeometryWriter)
-}
diff --git a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx
deleted file mode 100755
index 0552edae8871d36840bf2200f1d5b54cf0edf1e4..0000000000000000000000000000000000000000
--- a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeometryJiveXML)
diff --git a/graphics/JiveXML/cmt/requirements b/graphics/JiveXML/cmt/requirements
deleted file mode 100755
index 846ff1dd87f41a0c06b09b4b14f9860df7280b29..0000000000000000000000000000000000000000
--- a/graphics/JiveXML/cmt/requirements
+++ /dev/null
@@ -1,38 +0,0 @@
-package JiveXML
-
-author Nikos Konstantinidis <N.Konstantinidis@cern.ch>
-author Sebastian Boeser <sboeser@hep.ucl.ac.uk>
-
-## These requirements are public, i.e. all packages depending
-## on this package will have these included automatically
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-
-## These requirements are private i.e. these packages are
-## only available for this package
-private
-use EventInfo EventInfo-* Event
-use StoreGate StoreGate-* Control
-
-# xAOD package(s):
-use xAODEventInfo xAODEventInfo-* Event/xAOD
-
-use GaudiKernel v* -no_auto_imports
-
-macro_append JiveXMLLib_shlibflags "" Darwin " -lrpcsvc"
-macro_append JiveXMLLib_shlibflags " -lpthread"
-
-use TestPolicy TestPolicy-*
-apply_pattern validate_xml
-
-## All patterns are declared publicly
-public
-
-macro jivexml_src "*.cxx" Darwin "AlgoJiveXML.cxx ONCRPCThreadCollection.cxx DataType.cxx ONCRPCXDRProcs.cxx ExternalONCRPCServerSvc.cxx StreamToFileTool.cxx ONCRPCServerProcs.cxx StreamToServerTool.cxx ONCRPCServerSvc.cxx ONCRPCServerThreads.cxx"
-
-apply_pattern dual_use_library files="$(jivexml_src)"
-apply_pattern declare_joboptions files="*.py"
-
-macro JiveXML_TestConfiguration "../test/JiveXML_TestConfiguration.xml"
-apply_pattern declare_runtime extras="../test/*.cfg ../test/*.xml ../test/*.xsl"
diff --git a/graphics/JiveXML/src/components/JiveXML_entries.cxx b/graphics/JiveXML/src/components/JiveXML_entries.cxx
old mode 100755
new mode 100644
index 9eb325bf0acfdf5b0452393bbaafa481b1890de5..783e60e0b466de3a705c76b6631c16054811292a
--- a/graphics/JiveXML/src/components/JiveXML_entries.cxx
+++ b/graphics/JiveXML/src/components/JiveXML_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JiveXML/AlgoJiveXML.h"
#include "JiveXML/StreamToFileTool.h"
#include "JiveXML/StreamToServerTool.h"
@@ -8,23 +7,12 @@
#include "JiveXML/XMLFormatTool.h"
#endif
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( JiveXML , AlgoJiveXML )
-DECLARE_NAMESPACE_SERVICE_FACTORY( JiveXML, ONCRPCServerSvc )
-DECLARE_NAMESPACE_SERVICE_FACTORY( JiveXML, ExternalONCRPCServerSvc )
-DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , StreamToFileTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , StreamToServerTool )
+DECLARE_COMPONENT( JiveXML::AlgoJiveXML )
+DECLARE_COMPONENT( JiveXML::ONCRPCServerSvc )
+DECLARE_COMPONENT( JiveXML::ExternalONCRPCServerSvc )
+DECLARE_COMPONENT( JiveXML::StreamToFileTool )
+DECLARE_COMPONENT( JiveXML::StreamToServerTool )
#ifndef __APPLE__
-DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , XMLFormatTool )
+DECLARE_COMPONENT( JiveXML::XMLFormatTool )
#endif
-DECLARE_FACTORY_ENTRIES( JiveXML ) {
- DECLARE_NAMESPACE_ALGORITHM( JiveXML , AlgoJiveXML)
- DECLARE_NAMESPACE_SERVICE( JiveXML, ONCRPCServerSvc )
- DECLARE_NAMESPACE_SERVICE( JiveXML, ExternalONCRPCServerSvc )
- DECLARE_NAMESPACE_TOOL ( JiveXML , StreamToFileTool )
- DECLARE_NAMESPACE_TOOL ( JiveXML , StreamToServerTool )
-#ifndef __APPLE__
- DECLARE_NAMESPACE_TOOL ( JiveXML , XMLFormatTool )
-#endif
-}
-
diff --git a/graphics/JiveXML/src/components/JiveXML_load.cxx b/graphics/JiveXML/src/components/JiveXML_load.cxx
deleted file mode 100755
index 15d999fc278da09b97f157af52f4fe110560c48f..0000000000000000000000000000000000000000
--- a/graphics/JiveXML/src/components/JiveXML_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JiveXML)
-
diff --git a/graphics/Qat/QatAnnotationSystem/cmt/requirements b/graphics/Qat/QatAnnotationSystem/cmt/requirements
deleted file mode 100644
index f7848db9cc300e40b5cfb6955878ac0f507da9b6..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatAnnotationSystem/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package QatAnnotationSystem
-
-author Joe Boudreau
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-use QatBase QatBase-* graphics/Qat
-use QatPlotWidgets QatPlotWidgets-* graphics/Qat
-use QatSystemInterfaces QatSystemInterfaces-* graphics/Qat
-
-
-apply_tag notAsNeeded
-apply_pattern qatplugin
-
-
diff --git a/graphics/Qat/QatBase/cmt/requirements b/graphics/Qat/QatBase/cmt/requirements
deleted file mode 100755
index 1ecd14af768c961898020e68db512ef02509d162..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatBase/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-package QatBase
-
-author Joe Boudreau <Joseph.Boudreau@cern.ch>
-manager Joe Boudreau <Joseph.Boudreau@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-# needed for the definition of the 'qt4based_library' pattern, defined in VP1Qt's 'requirements' file. The flag '-no_auto_imports' prevents CHECKREQ errors.
-use VP1Qt VP1Qt-* graphics/VP1 -no_auto_imports
-
-apply_tag notAsNeeded
-
-macro QatBase_qt4options "need:opengl"
-apply_pattern qt4based_library
-
-#Pattern and plugin factory code generation for Qat plugins:
-apply_pattern declare_scripts files="generate-qat-factory-code generate-qat-visfunctions"
-
-## macro_prepend QatBase_linkopts "" \
-## notAsNeeded "" \
-## asNeeded " -Wl,--no-as-needed "
-## macro_append QatBase_linkopts "" \
-## notAsNeeded "" \
-## asNeeded " -Wl,--as-needed "
-
-pattern qatplugin \
- action generateqatfactorycode "generate-qat-factory-code" ; \
- private ; \
- macro_append all_dependencies " generateqatfactorycode " ; \
- end_private ; \
- macro_append <package>_qt4options " instsubdir:qatplugins qtplugin " ; \
- apply_pattern qt4based_library ; \
- apply_pattern declare_runtime_extras extras="*.qat" ; \
- path_remove DYLD_LIBRARY_PATH "" host-darwin "$(<package>_cmtpath)/InstallArea/${CMTCONFIG}/lib/qatplugins" ; \
- path_append DYLD_LIBRARY_PATH "" host-darwin "$(<package>_cmtpath)/InstallArea/${CMTCONFIG}/lib/qatplugins"
-
-pattern qatvisfunctions \
- action generateqatvisfunctions "generate-qat-visfunctions" ; \
- macro_append <package>_dependencies " generateqatvisfunctions " ;
-
diff --git a/graphics/Qat/QatDataAnalysis/cmt/requirements b/graphics/Qat/QatDataAnalysis/cmt/requirements
deleted file mode 100644
index 813b70a4f9296ecb4b4fdc0b2d08731c1e3bd509..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatDataAnalysis/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package QatDataAnalysis
-
-author Joe Boudreau
-author Vakho Tsulaia
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-
-# Add the -ldl linkopts for cmake
-apply_pattern cmake_add_libraries target=QatDataAnalysis libraries=dl
-
-library QatDataAnalysis *.cpp
-
-apply_pattern installed_library
-
-macro_remove CLHEP_linkopts "-lCLHEP-Exceptions-$(CLHEP_native_version)"
-
-#macro_append QatDataAnalysis_cppflags " -g -O0 "
-#macro_remove componentshr_linkopts " -Wl,-s"
diff --git a/graphics/Qat/QatDataModeling/cmt/requirements b/graphics/Qat/QatDataModeling/cmt/requirements
deleted file mode 100644
index 625c9d3b12a3a2cf47eb9c38aa3449ba7adf7082..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatDataModeling/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package QatDataModeling
-
-author Joe Boudreau <boudreau@pitt.edu>
-author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasFortranPolicy AtlasFortranPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-
-private
-use QatDataAnalysis QatDataAnalysis-* graphics/Qat
-
-public
-
-library QatDataModeling *.cpp *.cc *.F
-macro_remove fflags "-Wall"
-macro_remove CLHEP_linkopts "-lCLHEP-Exceptions-$(CLHEP_native_version)"
-apply_pattern installed_library
-
diff --git a/graphics/Qat/QatPlotSystem/cmt/requirements b/graphics/Qat/QatPlotSystem/cmt/requirements
deleted file mode 100644
index 2d9e9a4c552682dfb5eacf18b107ea1452e96299..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatPlotSystem/cmt/requirements
+++ /dev/null
@@ -1,15 +0,0 @@
-package QatPlotSystem
-
-author Joe Boudreau
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-use QatBase QatBase-* graphics/Qat
-use QatSystemInterfaces QatSystemInterfaces-* graphics/Qat
-use QatPlotting QatPlotting-* graphics/Qat
-use QatPlotWidgets QatPlotWidgets-* graphics/Qat
-
-apply_tag notAsNeeded
-apply_pattern qatplugin
-
-
diff --git a/graphics/Qat/QatPlotWidgets/cmt/requirements b/graphics/Qat/QatPlotWidgets/cmt/requirements
deleted file mode 100644
index 4e47bee3078fcb05a8c1d2c4bad2a69f807178ab..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatPlotWidgets/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package QatPlotWidgets
-
-author Joe Boudreau
-author Vakho Tsulaia
-manager Riccardo Maria Bianchi
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-use QatPlotting QatPlotting-* graphics/Qat
-use AtlasCLHEP AtlasCLHEP-* External
-
-macro_remove CLHEP_linkopts "-lCLHEP-Exceptions-$(CLHEP_native_version)"
-macro QatPlotWidgets_qt4options "need:svg"
-
-apply_tag notAsNeeded
-apply_pattern qt4based_library
-
-
diff --git a/graphics/Qat/QatPlotting/cmt/requirements b/graphics/Qat/QatPlotting/cmt/requirements
deleted file mode 100644
index 1a3e520b7675cb331e926bec33e0e6f8bb4432a5..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatPlotting/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package QatPlotting
-
-author Joe Boudreau
-author Vakho Tsulaia
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-use QatDataAnalysis QatDataAnalysis-* graphics/Qat
-use VP1Qt VP1Qt-* graphics/VP1
-
-
-macro_remove CLHEP_linkopts "-lCLHEP-Exceptions-$(CLHEP_native_version)"
-
-apply_tag notAsNeeded
-
-apply_pattern qt4based_library
-
-private
-
diff --git a/graphics/Qat/QatPresenter/cmt/requirements b/graphics/Qat/QatPresenter/cmt/requirements
deleted file mode 100644
index 86ebb891430f51ad8a2419cc3f111103bad6b729..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatPresenter/cmt/requirements
+++ /dev/null
@@ -1,14 +0,0 @@
-package QatPresenter
-
-author Joe Boudreau
-manager Riccardo Maria Bianchi
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-use QatDataAnalysis QatDataAnalysis-* graphics/Qat
-use QatSystemInterfaces QatSystemInterfaces-* graphics/Qat
-use QatPlotWidgets QatPlotWidgets-* graphics/Qat
-
-apply_tag notAsNeeded
-apply_pattern qt4based_library
-
diff --git a/graphics/Qat/QatPresenterApp/cmt/requirements b/graphics/Qat/QatPresenterApp/cmt/requirements
deleted file mode 100644
index cc16366f1e5289c1defc153189a583b8998e554b..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatPresenterApp/cmt/requirements
+++ /dev/null
@@ -1,14 +0,0 @@
-package QatPresenterApp
-
-author Joe Boudreau
-manager Riccardo Maria Bianchi
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-use QatPresenter QatPresenter-* graphics/Qat
-
-application present ../src/present.cpp
-
-apply_tag notAsNeeded
-
-macro QatPresenterApp_cppflags "-g -O0"
diff --git a/graphics/Qat/QatSpreadsheetSystem/cmt/requirements b/graphics/Qat/QatSpreadsheetSystem/cmt/requirements
deleted file mode 100644
index 1d8fa3f0d3a45ab0e262ee76c9b6b637a5fbddf4..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatSpreadsheetSystem/cmt/requirements
+++ /dev/null
@@ -1,14 +0,0 @@
-package QatSpreadsheetSystem
-
-author Joe Boudreau <boudreau@pitt.edu>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-use QatBase QatBase-* graphics/Qat
-use QatSystemInterfaces QatSystemInterfaces-* graphics/Qat
-use QatDataAnalysis QatDataAnalysis-* graphics/Qat
-
-apply_tag notAsNeeded
-apply_pattern qatplugin
-
-
diff --git a/graphics/Qat/QatSystemInterfaces/cmt/requirements b/graphics/Qat/QatSystemInterfaces/cmt/requirements
deleted file mode 100644
index 624bbb3c7f57f1bcd0f7ffa30d90740769e36b88..0000000000000000000000000000000000000000
--- a/graphics/Qat/QatSystemInterfaces/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package QatSystemInterfaces
-
-author Joe Boudreau <boudreau@pitt.edu>
-author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
-manager Riccardo Maria Bianchi <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-
-apply_tag notAsNeeded
-apply_pattern qt4based_library
-
-private
-use QatPlotWidgets QatPlotWidgets-* graphics/Qat
-use QatPlotting QatPlotting-* graphics/Qat
-
-
diff --git a/graphics/Qat/Qoot/cmt/requirements b/graphics/Qat/Qoot/cmt/requirements
deleted file mode 100644
index 6094222646510c5167343320040353d4185a5345..0000000000000000000000000000000000000000
--- a/graphics/Qat/Qoot/cmt/requirements
+++ /dev/null
@@ -1,25 +0,0 @@
-package Qoot
-
-author Joe Boudreau
-author Vakho Tsulaia
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-
-use AtlasROOT AtlasROOT-* External
-use QatDataAnalysis QatDataAnalysis-* graphics/Qat
-
-# Specify the required ROOT components for cmake (transparent to CMT)
-apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS Hist Tree RIO)"
-
-library Qoot *.cpp
-
-path_remove DYLD_LIBRARY_PATH "" host-darwin "$(<package>_cmtpath)/InstallArea/${CMTCONFIG}/lib/qatplugins" ; \
-path_append DYLD_LIBRARY_PATH "" host-darwin "$(<package>_cmtpath)/InstallArea/${CMTCONFIG}/lib/qatplugins"
-
-apply_pattern installed_library
-
-
-#macro_append Qoot_cppflags " -g -O0 "
-#macro_remove componentshr_linkopts " -Wl,-s"
diff --git a/graphics/VP1/VP1Algs/cmt/requirements b/graphics/VP1/VP1Algs/cmt/requirements
deleted file mode 100755
index d74ac3dfe2a7386332132c11679a2fbdd5b40d8f..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Algs/cmt/requirements
+++ /dev/null
@@ -1,60 +0,0 @@
-package VP1Algs
-
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-#use PoolSvc PoolSvc-* Database/AthenaPOOL
-
-library VP1Algs *.cxx components/*.cxx
-
-#Hack (fixme):
-#macro VP1Algs_linkopts "-lVP1Gui "
-
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_scripts files="vp1"
-apply_pattern declare_python_modules files="*.py"
-
-
-
-# this declares the script in share/
-apply_pattern declare_scripts files="clear-bash-hash-table-vp1"
-# this defines an action to be used in the pattern defined below
-macro VP1Algs_clearBash "clear-bash-hash-table-vp1"
-
-pattern clearbash_vp1_executable \
- private ; \
- action clear_bash_vp1 "$(VP1Algs_clearBash)" ; \
- end_private
-
-apply_pattern clearbash_vp1_executable
-
-
-
-# TEST ACTION
-#action directory "ls $(dir_options)" WIN32 "dir $(dir_options)" # can be run with "cmt do directory"; can be seen with "cmt show actions"
-
-
-
-
-#For genconfs sake we get the LD_LIBRARY_PATH to include external libs:
-#private
-#use VP1Qt VP1Qt-* graphics/VP1
-#use AtlasCoinInventor AtlasCoinInventor-* External
-#use AtlasSoQt AtlasSoQt-* External
-#path_remove LD_LIBRARY_PATH "/CoinInventor/"
-#path_append LD_LIBRARY_PATH "$(AtlasCoinInventor_home)/lib"
-#path_remove LD_LIBRARY_PATH "/SoQt/"
-#path_append LD_LIBRARY_PATH "$(AtlasSoQt_home)/lib"
-
-private
-use VP1Gui VP1Gui-* graphics/VP1
-use VP1UtilsBase VP1UtilsBase-* graphics/VP1
-
-use EventInfo EventInfo-* Event
-use PathResolver PathResolver-* Tools
-#use AtlasPOOL AtlasPOOL-* External
-
diff --git a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
old mode 100755
new mode 100644
index 87fc0ce11e3106ccc6f7623b95b242817fb6dc69..f0e37d2d022f4b7497d916f1e8b9f96aa1bda8d0
--- a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
+++ b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
@@ -4,15 +4,10 @@
// 22 May Riccardo-Maria BIANCHI <rbianchi@cern.ch>
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "VP1Algs/VP1Alg.h"
//#include "VP1Algs/VP1EventProd.h"
-DECLARE_ALGORITHM_FACTORY(VP1Alg)
-//DECLARE_ALGORITHM_FACTORY(VP1EventProd)
+DECLARE_COMPONENT( VP1Alg )
+//DECLARE_COMPONENT( VP1EventProd )
-DECLARE_FACTORY_ENTRIES(VP1Algs) {
- DECLARE_ALGORITHM( VP1Alg );
- //DECLARE_ALGORITHM( VP1EventProd );
-}
diff --git a/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx b/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx
deleted file mode 100755
index b0d1e5e22862e05f7658d848f5ec35f9656aa439..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1Algs)
diff --git a/graphics/VP1/VP1AlgsBatch/cmt/requirements b/graphics/VP1/VP1AlgsBatch/cmt/requirements
deleted file mode 100644
index 3d1b4b07dcf1094965283baefa823f4fd6e3e30c..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1AlgsBatch/cmt/requirements
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package VP1AlgsBatch
-
-author Riccardo Maria BIANCHI <rbianchi@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-
-library VP1AlgsBatch *.cxx components/*.cxx
-
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-# install to InstallArea the *.vp1 configuration files stored in share/
-apply_pattern declare_runtime_extras extras="*.vp1" ;
-
-
-#For genconfs sake we get the LD_LIBRARY_PATH to include external libs:
-#private
-#use VP1Qt VP1Qt-* graphics/VP1
-#use AtlasCoinInventor AtlasCoinInventor-* External
-#use AtlasSoQt AtlasSoQt-* External
-#path_remove LD_LIBRARY_PATH "/CoinInventor/"
-#path_append LD_LIBRARY_PATH "$(AtlasCoinInventor_home)/lib"
-#path_remove LD_LIBRARY_PATH "/SoQt/"
-#path_append LD_LIBRARY_PATH "$(AtlasSoQt_home)/lib"
-
-private
-use VP1Qt VP1Qt-* graphics/VP1 -no_auto_imports # Needed for linker. The flag '-no_auto_imports' avoids CHECKREQ errors.
-use VP1UtilsBase VP1UtilsBase-* graphics/VP1
-use EventInfo EventInfo-* Event
-use PathResolver PathResolver-* Tools
-use AtlasPOOL AtlasPOOL-* External
-
-
-
diff --git a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
old mode 100755
new mode 100644
index 11cd0e7cf0ef3205e69eb2df2188a0d7feb1f464..b7c276a4c4fedc2991bed9dbac46ded992c7c966
--- a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
+++ b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
@@ -1,9 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "VP1AlgsBatch/VP1BatchOnLatestEvent.h"
-DECLARE_ALGORITHM_FACTORY(VP1BatchOnLatestEvent)
+DECLARE_COMPONENT( VP1BatchOnLatestEvent )
-DECLARE_FACTORY_ENTRIES(VP1AlgsBatch) {
- DECLARE_ALGORITHM( VP1BatchOnLatestEvent );
-}
diff --git a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx
deleted file mode 100755
index 3eb732217bac3780377bfa7e9736d6badd69d6e1..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1AlgsBatch)
diff --git a/graphics/VP1/VP1AlgsEventProd/cmt/requirements b/graphics/VP1/VP1AlgsEventProd/cmt/requirements
deleted file mode 100644
index 2bae5dc771162f7ff4a80e77982334f036ba77da..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1AlgsEventProd/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-
-package VP1AlgsEventProd
-
-author Riccardo Maria BIANCHI <rbianchi@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use GaudiInterface GaudiInterface-* External
-use PoolSvc PoolSvc-* Database/AthenaPOOL
-
-library VP1AlgsEventProd *.cxx components/*.cxx
-
-apply_pattern component_library
-
-apply_pattern declare_joboptions files="*.py"
-apply_pattern declare_python_modules files="*.py"
-
-#For genconfs sake we get the LD_LIBRARY_PATH to include external libs:
-#private
-#use VP1Qt VP1Qt-* graphics/VP1
-#use AtlasCoinInventor AtlasCoinInventor-* External
-#use AtlasSoQt AtlasSoQt-* External
-#path_remove LD_LIBRARY_PATH "/CoinInventor/"
-#path_append LD_LIBRARY_PATH "$(AtlasCoinInventor_home)/lib"
-#path_remove LD_LIBRARY_PATH "/SoQt/"
-#path_append LD_LIBRARY_PATH "$(AtlasSoQt_home)/lib"
-
-private
-use VP1Qt VP1Qt-* graphics/VP1 -no_auto_imports # Needed for linker. The flag '-no_auto_imports' avoids CHECKREQ errors.
-use VP1UtilsBase VP1UtilsBase-* graphics/VP1 # needs to be placed AFTER VP1Qt... I don't know why, but CMT gives errors in linking if it's before!!!
-use EventInfo EventInfo-* Event
-use PathResolver PathResolver-* Tools
-use AtlasPOOL AtlasPOOL-* External
-
-
-
diff --git a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
old mode 100755
new mode 100644
index 94e1d6f529418522a3da7d0aa87c1cc74b54176c..e9e5aff52c41c60ca3a5e96f9776f4fd40e8e7e8
--- a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
+++ b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "VP1AlgsEventProd/VP1EventProd.h"
-DECLARE_ALGORITHM_FACTORY(VP1EventProd)
+DECLARE_COMPONENT( VP1EventProd )
-DECLARE_FACTORY_ENTRIES(VP1AlgsEventProd) {
- DECLARE_ALGORITHM( VP1EventProd );
-}
diff --git a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx
deleted file mode 100755
index 4a56002be0f710b55b6c61a2f9e8001d5a7701ba..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1AlgsEventProd)
diff --git a/graphics/VP1/VP1Base/cmt/requirements b/graphics/VP1/VP1Base/cmt/requirements
deleted file mode 100644
index f2db8684a387b8c51d2b2ddb5bb0d53d95f25880..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Base/cmt/requirements
+++ /dev/null
@@ -1,51 +0,0 @@
-package VP1Base
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Qt VP1Qt-* graphics/VP1
-use AtlasCoinInventor AtlasCoinInventor-* External
-use AtlasSoQt AtlasSoQt-* External
-
-private
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-
-
-public
-
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-
-
-apply_tag notAsNeeded
-
-macro VP1Base_qt4options "need:opengl"
-apply_pattern qt4based_library
-
-
-#Pattern and plugin factory code generation for VP1 plugins:
-apply_pattern declare_scripts files="generate-vp1-factory-code"
-
-## macro_prepend VP1Base_linkopts "" \
-## notAsNeeded "" \
-## asNeeded " -Wl,--no-as-needed "
-## macro_append VP1Base_linkopts "" \
-## notAsNeeded "" \
-## asNeeded " -Wl,--as-needed "
-
-private
-#macro_append cppflags "-std=c++0x -fPIC" # not needed, we comment it out
-#macro_append cppflags "-Wall -Wconversion" # to check implicit conversions; but it triggers many warnings from Inventor and Qt 'moc' files
-public
-
-pattern vp1plugin \
- action generatevp1factorycode "generate-vp1-factory-code" ; \
- private ; \
- macro_append all_dependencies " generatevp1factorycode " ; \
- end_private ; \
- macro_append <package>_qt4options " instsubdir:vp1plugins qtplugin " ; \
- apply_pattern qt4based_library ; \
- apply_pattern declare_runtime_extras extras="*.vp1" ; \
- path_remove DYLD_LIBRARY_PATH "" host-darwin "$(<package>_cmtpath)/InstallArea/${CMTCONFIG}/lib/vp1plugins" ; \
- path_append DYLD_LIBRARY_PATH "" host-darwin "$(<package>_cmtpath)/InstallArea/${CMTCONFIG}/lib/vp1plugins"
diff --git a/graphics/VP1/VP1Gui/cmt/requirements b/graphics/VP1/VP1Gui/cmt/requirements
deleted file mode 100644
index 891025ff05b68e10f66a1fa27f93cd86bfa50198..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Gui/cmt/requirements
+++ /dev/null
@@ -1,32 +0,0 @@
-package VP1Gui
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-author Riccardo Maria BIANCHI <rbianchi@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-public
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use AtlasSoQt AtlasSoQt-* External
-use VP1UtilsBase VP1UtilsBase-* graphics/VP1
-
-public
-# We use QtNetwork and QtWebKit module
-macro VP1Gui_qt4options "need:network need:webkit need:opengl"
-
-private
-# prevent GCC raise an error about QtWebKit
-macro_remove cppflags "-pedantic" # pedantic makes GCC complain about a non C89 standard syntax in QtWebKit
-#macro_append cppflags "-std=c++0x -fPIC" # not needed, we comment it out
-
-public
-apply_pattern qt4based_library
-
-# install to InstallArea the ATLAS logo image stored in share/
-apply_pattern declare_runtime_extras extras="ATLAS-Logo-New_300pixels.png" ;
-
-
diff --git a/graphics/VP1/VP1HEPVis/cmt/requirements b/graphics/VP1/VP1HEPVis/cmt/requirements
deleted file mode 100644
index b43b04604d174e7d94d0b9d6e573e6c7d15af680..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1HEPVis/cmt/requirements
+++ /dev/null
@@ -1,32 +0,0 @@
-package VP1HEPVis
-
-author Joe Boudreau (Importer)
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use AtlasCoinInventor AtlasCoinInventor-* External
-
-# if you want to use VP1Msg messages
-#use VP1Base VP1Base-* graphics/VP1
-
-library VP1HEPVis *.cxx
-
-apply_pattern installed_library
-
-#Fixme: The flags (apart from the first) come from a run of coin-config --cppflags. We should call this instead of hardcoding!!
-macro VP1HEPVis_cppflags " -ansi -D_REENTRANT -I/usr/X11R6/include" \
- target-darwin " -ansi -D_REENTRANT"
-
-#Fixme: The linkopts (apart from the first) come from a run of coin-config --libs. We should call this instead of hardcoding!!
-# ORIGINAL
-#macro VP1HEPVis_linkopts " -lVP1HEPVis -lGL -lXext -lSM -lICE -lX11 -ldl -lpthread -lm" \
-# target-darwin " -lVP1HEPVis -lpthread"
-# TEST
-macro VP1HEPVis_linkopts " -lVP1HEPVis -lGL -lXext -lICE -lX11 -ldl -lpthread -lm" \
- target-darwin " -lVP1HEPVis -lpthread"
-
-macro VP1HEPVis_shlibflags_toBeAppended " -lGL " \
- target-darwin " "
-
-macro_append VP1HEPVis_shlibflags " $(VP1HEPVis_shlibflags_toBeAppended) "
-
diff --git a/graphics/VP1/VP1Plugins/VP12DGeometryPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP12DGeometryPlugin/cmt/requirements
deleted file mode 100755
index abb6a23064fec83b2b267e278da435b62d5d4fa1..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP12DGeometryPlugin/cmt/requirements
+++ /dev/null
@@ -1,12 +0,0 @@
-package VP12DGeometryPlugin
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use VP12DGeometrySystems VP12DGeometrySystems-* graphics/VP1/VP1Systems
-public
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/cmt/requirements
deleted file mode 100755
index 4f385ac3f1fdd785f6fbc6c63dbf166e052962c9..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/cmt/requirements
+++ /dev/null
@@ -1,30 +0,0 @@
-package VP13DCocktailPlugin
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo-Maria BIANCHI <rbianchi@cern.ch>
-
-
-public
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-private
-use VP1AODSystems VP1AODSystems-* graphics/VP1/VP1Systems
-use VP1BPhysSystems VP1BPhysSystems-* graphics/VP1/VP1Systems
-use VP1CaloClusterSystems VP1CaloClusterSystems-* graphics/VP1/VP1Systems
-use VP1CaloReadoutSystems VP1CaloReadoutSystems-* graphics/VP1/VP1Systems
-use VP1CaloSystems VP1CaloSystems-* graphics/VP1/VP1Systems
-use VP1GeometrySystems VP1GeometrySystems-* graphics/VP1/VP1Systems
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-use VP1PRDSystems VP1PRDSystems-* graphics/VP1/VP1Systems
-use VP1PlugUtils VP1PlugUtils-* graphics/VP1/VP1Plugins
-use VP1Qt VP1Qt-* graphics/VP1
-use VP1RawDataSystems VP1RawDataSystems-* graphics/VP1/VP1Systems
-use VP1SimHitSystems VP1SimHitSystems-* graphics/VP1/VP1Systems
-use VP1TrackSystems VP1TrackSystems-* graphics/VP1/VP1Systems
-use VP1TrackingGeometrySystems VP1TrackingGeometrySystems-* graphics/VP1/VP1Systems
-use VP1UtilitySystems VP1UtilitySystems-* graphics/VP1/VP1Systems
-end_private
-
-public
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1AODPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1AODPlugin/cmt/requirements
deleted file mode 100644
index 436db24791ddcc9dd407bd819af6e9592cc62a71..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1AODPlugin/cmt/requirements
+++ /dev/null
@@ -1,11 +0,0 @@
-package VP1AODPlugin
-
-public
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-private
-use VP1AODSystems VP1AODSystems-* graphics/VP1/VP1Systems
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-end_private
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1BanksPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1BanksPlugin/cmt/requirements
deleted file mode 100755
index 50123c040ece18f6557740767019d4d8bb23dd14..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1BanksPlugin/cmt/requirements
+++ /dev/null
@@ -1,9 +0,0 @@
-package VP1BanksPlugin
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1BanksSystems VP1BanksSystems-* graphics/VP1/VP1Systems
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1CaloPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1CaloPlugin/cmt/requirements
deleted file mode 100755
index ca1ed35b2dc206f023048d6fdf1cac62c5a2ad69..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1CaloPlugin/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package VP1CaloPlugin
-
-author Vakho Tsulaia <tsulaia@mail.cern.ch>
-manager Riccardo-Maria BIANCHI <rbianchi@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use VP1CaloSystems VP1CaloSystems-* graphics/VP1/VP1Systems
-use VP1GeometrySystems VP1GeometrySystems-* graphics/VP1/VP1Systems
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-use VP1CaloReadoutSystems VP1CaloReadoutSystems-* graphics/VP1/VP1Systems
-use VP1CaloClusterSystems VP1CaloClusterSystems-* graphics/VP1/VP1Systems
-
-### TODO: to be replaced with the new VP1AODSystems Jet class
-#use VP1JetSystems VP1JetSystems-* graphics/VP1/VP1Systems
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/cmt/requirements
deleted file mode 100755
index 761f1353dd771421b70a0db78c17b5921cb98efc..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/cmt/requirements
+++ /dev/null
@@ -1,13 +0,0 @@
-package VP1GeometryPlugin
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use VP1GeometrySystems VP1GeometrySystems-* graphics/VP1/VP1Systems
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-public
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1LegoPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1LegoPlugin/cmt/requirements
deleted file mode 100755
index c57c9f7bbd52324ad27e928884175fa749e9a9fc..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1LegoPlugin/cmt/requirements
+++ /dev/null
@@ -1,9 +0,0 @@
-package VP1LegoPlugin
-
-
-author Joe Boudreau <boudreau@pitt.edu>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1LegoSystems VP1LegoSystems-* graphics/VP1/VP1Systems
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1MCPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1MCPlugin/cmt/requirements
deleted file mode 100755
index 3ec4606a135ae53fba453181509f55c1663b5e6d..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1MCPlugin/cmt/requirements
+++ /dev/null
@@ -1,9 +0,0 @@
-package VP1MCPlugin
-
-author Joe Boudreau <Joseph.Boudreau@cern.ch>
-manager Joe Boudreau <Joseph.Boudreau@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1MCSystems VP1MCSystems-* graphics/VP1/VP1Systems
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1PlugUtils/cmt/requirements b/graphics/VP1/VP1Plugins/VP1PlugUtils/cmt/requirements
deleted file mode 100644
index ab6122689bfea8070eeea23d77f7d982018da6ba..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1PlugUtils/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package VP1PlugUtils
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-private
-use VP1Base VP1Base-* graphics/VP1
-use VP1TrackSystems VP1TrackSystems-* graphics/VP1/VP1Systems
-use VP1PRDSystems VP1PRDSystems-* graphics/VP1/VP1Systems
-use VP1GeometrySystems VP1GeometrySystems-* graphics/VP1/VP1Systems
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-use VP1VertexSystems VP1VertexSystems-* graphics/VP1/VP1Systems
-#use VP1JetSystems VP1JetSystems-* graphics/VP1/VP1Systems
-public
-
-apply_pattern qt4based_library
-
-
diff --git a/graphics/VP1/VP1Plugins/VP1TestPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1TestPlugin/cmt/requirements
deleted file mode 100755
index 97ce9cff836f50253c1a2020f1ad2a1d33c6eebd..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1TestPlugin/cmt/requirements
+++ /dev/null
@@ -1,13 +0,0 @@
-package VP1TestPlugin
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use VP1TestSystems VP1TestSystems-* graphics/VP1/VP1Systems
-use VP1GeometrySystems VP1GeometrySystems-* graphics/VP1/VP1Systems
-public
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1TrackPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1TrackPlugin/cmt/requirements
deleted file mode 100644
index f0cb8b2d028d0c4b79db0d4dc266763a17aa75ac..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1TrackPlugin/cmt/requirements
+++ /dev/null
@@ -1,22 +0,0 @@
-package VP1TrackPlugin
-
-author edward.moyse@cern.ch
-
-public
-use AtlasPolicy AtlasPolicy-*
-
-private
-use VP1Base VP1Base-* graphics/VP1
-use VP1PlugUtils VP1PlugUtils-* graphics/VP1/VP1Plugins
-use VP1TrackSystems VP1TrackSystems-* graphics/VP1/VP1Systems
-use VP1PRDSystems VP1PRDSystems-* graphics/VP1/VP1Systems
-use VP1GeometrySystems VP1GeometrySystems-* graphics/VP1/VP1Systems
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-use VP1SimHitSystems VP1SimHitSystems-* graphics/VP1/VP1Systems
-use VP1VertexSystems VP1VertexSystems-* graphics/VP1/VP1Systems
-#use VP1FatrasSystems VP1FatrasSystems-* graphics/VP1/VP1Systems
-use VP1RawDataSystems VP1RawDataSystems-* graphics/VP1/VP1Systems
-public
-
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP1TriggerDecisionPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP1TriggerDecisionPlugin/cmt/requirements
deleted file mode 100644
index 37b41202ee93508b73d36857f5fba766fb209a80..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Plugins/VP1TriggerDecisionPlugin/cmt/requirements
+++ /dev/null
@@ -1,8 +0,0 @@
-package VP1TriggerDecisionPlugin
-
-author Weiyi Zhang <wyizhang@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1TriggerDecisionSystems VP1TriggerDecisionSystems-* graphics/VP1/VP1Systems
-
-apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Systems/VP12DGeometrySystems/cmt/requirements b/graphics/VP1/VP1Systems/VP12DGeometrySystems/cmt/requirements
deleted file mode 100755
index db38bb18347a4f89bc8ac89c031c5d3cfde9c85b..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP12DGeometrySystems/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package VP12DGeometrySystems
-
-author Brock Greman <bgreman@gmail.com>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-#use AtlasCLHEP AtlasCLHEP-* External
-use StoreGate StoreGate-* Control
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-private
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use IdDictDetDescr IdDictDetDescr-* DetectorDescription
-use CaloDetDescr CaloDetDescr-* Calorimeter
-use TileDetDescr TileDetDescr-* TileCalorimeter
-use LArReadoutGeometry LArReadoutGeometry-* LArCalorimeter/LArGeoModel
-use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-
-
-public
-
-apply_pattern qt4based_library
-
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1AODSystems/cmt/requirements
deleted file mode 100644
index 9a03eb21664be1c79ff8406d625ed8d4117efa72..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1AODSystems/cmt/requirements
+++ /dev/null
@@ -1,37 +0,0 @@
-package VP1AODSystems
-
-author Edward Moyse
-author Riccardo Maria BIANCHI <rbianchi@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use VP1Base VP1Base-* graphics/VP1
-use VP1Qt VP1Qt-* graphics/VP1
-use xAODMuon xAODMuon-* Event/xAOD
-use xAODTracking xAODTracking-* Event/xAOD
-
-
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use EventPrimitives EventPrimitives-* Event
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use PathResolver PathResolver-* Tools
-use StoreGate StoreGate-* Control
-use TrkExInterfaces TrkExInterfaces-* Tracking/TrkExtrapolation
-use VP1Utils VP1Utils-* graphics/VP1
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use xAODBase xAODBase-* Event/xAOD
-use xAODJet xAODJet-* Event/xAOD
-use xAODMissingET xAODMissingET-* Event/xAOD
-use xAODCaloEvent xAODCaloEvent-* Event/xAOD
-end_private
-
-
-public
-
-apply_pattern qt4based_library
-
-# install textures for the jets' b-tagging rendering
-apply_pattern declare_runtime extras = "../textures/*.png"
diff --git a/graphics/VP1/VP1Systems/VP1BPhysSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1BPhysSystems/cmt/requirements
deleted file mode 100644
index 1582e1c1f583e4a7e7bdccc1c5d77f5bb875ce67..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1BPhysSystems/cmt/requirements
+++ /dev/null
@@ -1,33 +0,0 @@
-package VP1BPhysSystems
-
-author Daniel Scheirich <Daniel.Scheirich@cern.ch>
-author R.M. BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use VP1TrackSystems VP1TrackSystems-* graphics/VP1/VP1Systems
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-private
-
-use AtlasCoinInventor AtlasCoinInventor-* External
-use VP1Utils VP1Utils-* graphics/VP1
-use AtlasROOT AtlasROOT-* External
-use StoreGate StoreGate-* Control
-#use AtlasCLHEP AtlasCLHEP-* External
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use TrkParameters TrkParameters-* Tracking/TrkEvent
-use TrkExInterfaces TrkExInterfaces-* Tracking/TrkExtrapolation
-use Particle Particle-* Reconstruction
-use EventInfo EventInfo-* Event
-
-apply_tag ROOTMathLibs
-apply_tag ROOTSTLDictLibs
-apply_tag ROOTGraphicsLibs
-apply_tag ROOTTableLibs
-apply_tag ROOTBasicLibs
-
-public
-
-apply_pattern qt4based_library
-
diff --git a/graphics/VP1/VP1Systems/VP1BanksSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1BanksSystems/cmt/requirements
deleted file mode 100644
index dc2eeeae0ed6b5184fdcfbfa27d330ea9f2c7354..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1BanksSystems/cmt/requirements
+++ /dev/null
@@ -1,16 +0,0 @@
-package VP1BanksSystems
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-private
-use VP1Utils VP1Utils-* graphics/VP1
-use AthenaKernel AthenaKernel-* Control
-#use GaudiKernel GaudiKernel-*
-use CLIDSvc CLIDSvc-* Control -no_auto_imports # The flag '-no_auto_imports' prevents CHECKREQ errors.
-use GaudiInterface GaudiInterface-* External
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1CaloClusterSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1CaloClusterSystems/cmt/requirements
deleted file mode 100644
index ed95f1e0f26b16cf6ad7a9265ea8aea6a62f511b..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1CaloClusterSystems/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package VP1CaloClusterSystems
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use VP1Utils VP1Utils-* graphics/VP1
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use AtlasCLHEP AtlasCLHEP-* External
-use CaloEvent CaloEvent-* Calorimeter
-public
-
-apply_pattern qt4based_library
-
-
diff --git a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/cmt/requirements
deleted file mode 100755
index ac557e0c8c7c14f4c782b9c899f34c7339dea7dd..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1CaloReadoutSystems/cmt/requirements
+++ /dev/null
@@ -1,19 +0,0 @@
-package VP1CaloReadoutSystems
-
-author Joe Boudreau <boudreau@pitt.edu>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-#use VP1HEPVis VP1HEPVis-* graphics/VP1
-use LArReadoutGeometry LArReadoutGeometry-* LArCalorimeter/LArGeoModel
-use LArHV LArHV-* LArCalorimeter/LArGeoModel
-use VP1Utils VP1Utils-* graphics/VP1
-#use StoreGate StoreGate-* Control
-public
-
-apply_pattern qt4based_library
-#macro VP1CaloReadoutSystems_cppflags " -g -O0 "
diff --git a/graphics/VP1/VP1Systems/VP1CaloSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1CaloSystems/cmt/requirements
deleted file mode 100644
index 9eef24352fc305f169c27ea2be98fcad45cc9722..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1CaloSystems/cmt/requirements
+++ /dev/null
@@ -1,36 +0,0 @@
-package VP1CaloSystems
-
-author vakho tsulaia <tsulaia@mail.cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use AtlasCLHEP AtlasCLHEP-* External
-use Identifier Identifier-* DetectorDescription
-
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use VP1Utils VP1Utils-* graphics/VP1
-use StoreGate StoreGate-* Control
-use GaudiInterface GaudiInterface-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-
-use CaloIdentifier CaloIdentifier-* Calorimeter
-use CaloDetDescr CaloDetDescr-* Calorimeter
-use CaloEvent CaloEvent-* Calorimeter
-use CaloConditions CaloConditions-* Calorimeter
-
-use TileDetDescr TileDetDescr-* TileCalorimeter
-use TileEvent TileEvent-* TileCalorimeter
-use TileConditions TileConditions-* TileCalorimeter
-use TileIdentifier TileIdentifier-* TileCalorimeter
-
-use LArTools LArTools-* LArCalorimeter
-use LArRawEvent LArRawEvent-* LArCalorimeter
-use LArIdentifier LArIdentifier-* LArCalorimeter
-use VP1Qwt VP1Qwt-* graphics/VP1 Â# Needed despite checkreq warning (get undefined symbol error otherwise)
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1GeometrySystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1GeometrySystems/cmt/requirements
deleted file mode 100644
index 7a152048bd4c8c2242d0f273dc6c3ba91403a122..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1GeometrySystems/cmt/requirements
+++ /dev/null
@@ -1,20 +0,0 @@
-package VP1GeometrySystems
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use AtlasCoinInventor AtlasCoinInventor-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
-private
-use VP1Utils VP1Utils-* graphics/VP1
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use AtlasCLHEP AtlasCLHEP-* External
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-public
-
-apply_pattern qt4based_library
-
-
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1GuideLineSystems/cmt/requirements
deleted file mode 100644
index a45d869735e128e5ebe5b3b750270315c7468b12..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1GuideLineSystems/cmt/requirements
+++ /dev/null
@@ -1,21 +0,0 @@
-package VP1GuideLineSystems
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use VP1Utils VP1Utils-* graphics/VP1
-use AtlasCoinInventor AtlasCoinInventor-* External
-
-private
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use GaudiInterface GaudiInterface-* External
-
-
-public
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-
-apply_pattern qt4based_library
-
diff --git a/graphics/VP1/VP1Systems/VP1LegoSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1LegoSystems/cmt/requirements
deleted file mode 100755
index 47ce1d355eebaebfa82643eb4caa13c9490183b4..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1LegoSystems/cmt/requirements
+++ /dev/null
@@ -1,18 +0,0 @@
-package VP1LegoSystems
-
-author Joe Boudreau <boudreau@pitt.edu>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use AtlasCoinInventor AtlasCoinInventor-* External
-private
-use VP1Utils VP1Utils-* graphics/VP1
-use LArReadoutGeometry LArReadoutGeometry-* LArCalorimeter/LArGeoModel
-use CaloDetDescr CaloDetDescr-* Calorimeter
-use CaloEvent CaloEvent-* Calorimeter
-use LArIdentifier LArIdentifier-* LArCalorimeter
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1MCSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1MCSystems/cmt/requirements
deleted file mode 100755
index 93f2649c880803709fa8ba44b5b15a30d62b4f25..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1MCSystems/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package VP1MCSystems
-
-author Joe Boudreau <Joseph.Boudreau@cern.ch>
-manager Joe Boudreau <Joseph.Boudreau@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-private
-
-use VP1Utils VP1Utils-* graphics/VP1
-use AthenaKernel AthenaKernel-* Control
-
-use HepPDT v* LCG_Interfaces
-use GeneratorObjects GeneratorObjects-* Generators
-use GaudiInterface GaudiInterface-* External
-
-use StoreGate StoreGate-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasHepMC AtlasHepMC-* External
-
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1MissingEtSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1MissingEtSystems/cmt/requirements
deleted file mode 100755
index 09297ced7e277ef79751c8d0db793a0b57df393d..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1MissingEtSystems/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package VP1MissingEtSystems
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use AtlasCoinInventor AtlasCoinInventor-* External
-private
-use VP1Utils VP1Utils-* graphics/VP1
-#use StoreGate StoreGate-* Control
-use AtlasCLHEP AtlasCLHEP-* External
-use MissingETEvent MissingETEvent-* Reconstruction
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1PRDSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1PRDSystems/cmt/requirements
deleted file mode 100644
index acb602b83f49446fd4c317a592b716dc91805679..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1PRDSystems/cmt/requirements
+++ /dev/null
@@ -1,45 +0,0 @@
-package VP1PRDSystems
-
-author Edward Moyse <Edward.Moyse@cern.ch>
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-#use AtlasCLHEP AtlasCLHEP-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use MuonPrepRawData MuonPrepRawData-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-use TrkPrepRawData TrkPrepRawData-* Tracking/TrkEvent
-use TrkSpacePoint TrkSpacePoint-* Tracking/TrkEvent
-use VP1Base VP1Base-* graphics/VP1
-use VP1Qt VP1Qt-* graphics/VP1
-use VP1Utils VP1Utils-* graphics/VP1
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use DataModel DataModel-* Control
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-#use MuonGeoModel MuonGeoModel-* MuonSpectrometer
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
-#use TrkEventPrimitives TrkEventPrimitives-* Tracking/TrkEvent
-use TrkMeasurementBase TrkMeasurementBase-* Tracking/TrkEvent
-use TrkRIO_OnTrack TrkRIO_OnTrack-* Tracking/TrkEvent
-use TrkCompetingRIOsOnTrack TrkCompetingRIOsOnTrack-* Tracking/TrkEvent
-use TrkSegment TrkSegment-* Tracking/TrkEvent
-use TrkSurfaces TrkSurfaces-* Tracking/TrkDetDescr
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use EventPrimitives EventPrimitives-* Event
-
-
-public
-
-apply_pattern qt4based_library
-
-
diff --git a/graphics/VP1/VP1Systems/VP1RawDataSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1RawDataSystems/cmt/requirements
deleted file mode 100644
index d9a959b337ef475dfd1f3fcdb3e933e76bee6f92..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1RawDataSystems/cmt/requirements
+++ /dev/null
@@ -1,26 +0,0 @@
-package VP1RawDataSystems
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-
-private
-use VP1Utils VP1Utils-* graphics/VP1
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use AtlasCoinInventor AtlasCoinInventor-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use InDetRawData InDetRawData-* InnerDetector/InDetRawEvent
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use InDetBCM_RawData InDetBCM_RawData-* InnerDetector/InDetRawEvent
-use LUCID_RawEvent LUCID_RawEvent-* ForwardDetectors/LUCID
-use EventPrimitives EventPrimitives-* Event
-use GaudiInterface GaudiInterface-* External
-
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1SimHitSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1SimHitSystems/cmt/requirements
deleted file mode 100755
index 83a6c2384f949787149730a25da9bfee9d6b4e03..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1SimHitSystems/cmt/requirements
+++ /dev/null
@@ -1,23 +0,0 @@
-package VP1SimHitSystems
-
-author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
-manager Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use GeoAdaptors GeoAdaptors-* DetectorDescription/GeoModel
-use InDetSimEvent InDetSimEvent-* InnerDetector
-use MuonSimEvent MuonSimEvent-* MuonSpectrometer
-use ForwardRegion_SimEv ForwardRegion_SimEv-* ForwardDetectors/ForwardSimulation
-use StoreGate StoreGate-* Control
-use VP1Qt VP1Qt-* graphics/VP1
-use VP1Utils VP1Utils-* graphics/VP1
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-end_private
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1TestSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1TestSystems/cmt/requirements
deleted file mode 100755
index a5681f59beb74fe5fe12bb22e6fd890498ce6020..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1TestSystems/cmt/requirements
+++ /dev/null
@@ -1,24 +0,0 @@
-package VP1TestSystems
-
-author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-public
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use VP1Utils VP1Utils-* graphics/VP1
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use GaudiInterface GaudiInterface-* External
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use StoreGate StoreGate-* Control
-use TrkParameters TrkParameters-* Tracking/TrkEvent
-use TrkSurfaces TrkSurfaces-* Tracking/TrkDetDescr
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use VP1Qt VP1Qt-* graphics/VP1
-end_private
-
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1TrackSystems/cmt/requirements
deleted file mode 100644
index 57614374bf3f41e33ddecea506a264d5a5bdc2ca..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/cmt/requirements
+++ /dev/null
@@ -1,65 +0,0 @@
-package VP1TrackSystems
-
-author Edward Moyse
-
-public
-use AtlasPolicy AtlasPolicy-*
-use GaudiInterface GaudiInterface-* External
-use GeneratorObjects GeneratorObjects-* Generators
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use Identifier Identifier-* DetectorDescription
-use TrackRecord TrackRecord-* Simulation/G4Sim
-use TrkDetDescrInterfaces TrkDetDescrInterfaces-* Tracking/TrkDetDescr
-use TrkEventPrimitives TrkEventPrimitives-* Tracking/TrkEvent
-use TrkParameters TrkParameters-* Tracking/TrkEvent
-use TrkSurfaces TrkSurfaces-* Tracking/TrkDetDescr
-use VP1Base VP1Base-* graphics/VP1
-use VP1Qt VP1Qt-* graphics/VP1
-use VP1Utils VP1Utils-* graphics/VP1
-use xAODTracking xAODTracking-* Event/xAOD
-private
-use AtlasCLHEP AtlasCLHEP-* External
-use AtlasCoinInventor AtlasCoinInventor-* External
-use AtlasDetDescr AtlasDetDescr-* DetectorDescription
-use AtlasHepMC AtlasHepMC-* External
-use AthContainers AthContainers-* Control
-use EventPrimitives EventPrimitives-* Event
-use ForwardRegion_SimEv ForwardRegion_SimEv-* ForwardDetectors/ForwardSimulation
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use InDetPrepRawData InDetPrepRawData-* InnerDetector/InDetRecEvent
-use InDetRIO_OnTrack InDetRIO_OnTrack-* InnerDetector/InDetRecEvent
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use InDetSimEvent InDetSimEvent-* InnerDetector
-use MuonChamberT0s MuonChamberT0s-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-use MuonPrepRawData MuonPrepRawData-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-use MuonRIO_OnTrack MuonRIO_OnTrack-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
-use MuonRecHelperTools MuonRecHelperTools-* MuonSpectrometer/MuonReconstruction/MuonRecTools
-use MuonSegment MuonSegment-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-use MuonSimEvent MuonSimEvent-* MuonSpectrometer
-use Particle Particle-* Reconstruction
-use StoreGate StoreGate-* Control
-use TrkCompetingRIOsOnTrack TrkCompetingRIOsOnTrack-* Tracking/TrkEvent
-use TrkDetDescrUtils TrkDetDescrUtils-* Tracking/TrkDetDescr
-use TrkDetElementBase TrkDetElementBase-* Tracking/TrkDetDescr
-use TrkExInterfaces TrkExInterfaces-* Tracking/TrkExtrapolation
-use TrkFitterInterfaces TrkFitterInterfaces-* Tracking/TrkFitter
-use TrkMaterialOnTrack TrkMaterialOnTrack-* Tracking/TrkEvent
-use TrkMeasurementBase TrkMeasurementBase-* Tracking/TrkEvent
-use TrkPrepRawData TrkPrepRawData-* Tracking/TrkEvent
-use TrkPseudoMeasurementOnTrack TrkPseudoMeasurementOnTrack-* Tracking/TrkEvent
-use TrkRIO_OnTrack TrkRIO_OnTrack-* Tracking/TrkEvent
-use TrkSegment TrkSegment-* Tracking/TrkEvent
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use TrkTrackSummary TrkTrackSummary-* Tracking/TrkEvent
-use TrkVolumes TrkVolumes-* Tracking/TrkDetDescr
-use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use VP1PRDSystems VP1PRDSystems-* graphics/VP1/VP1Systems
-end_private
-
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/cmt/requirements
deleted file mode 100755
index ecef92d17822e5be3f966c8f5ad8f1edb3b2b3af..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/cmt/requirements
+++ /dev/null
@@ -1,27 +0,0 @@
-package VP1TrackingGeometrySystems
-
-author Andreas Salzburger <Andreas.Salzburger@cern.ch>
-manager Andreas Salzburger <Andreas.Salzburger@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use TrkVolumes TrkVolumes-* Tracking/TrkDetDescr
-
-private
-use VP1Utils VP1Utils-* graphics/VP1
-use StoreGate StoreGate-* Control
-use AtlasCoinInventor AtlasCoinInventor-* External
-use TrkGeometry TrkGeometry-* Tracking/TrkDetDescr
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-use TrkDetDescrUtils TrkDetDescrUtils-* Tracking/TrkDetDescr
-use TrkDetDescrInterfaces TrkDetDescrInterfaces-* Tracking/TrkDetDescr
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use GaudiInterface GaudiInterface-* External
-
-public
-
-apply_pattern qt4based_library
-
diff --git a/graphics/VP1/VP1Systems/VP1TriggerDecisionSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1TriggerDecisionSystems/cmt/requirements
deleted file mode 100644
index 8829cca8c11b41ac2ca9f85cfdf49db210c8b68c..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1TriggerDecisionSystems/cmt/requirements
+++ /dev/null
@@ -1,13 +0,0 @@
-package VP1TriggerDecisionSystems
-
-author Weiyi Zhang <wyizhang@cern.ch>
-manager Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-private
-use TrigDecisionTool TrigDecisionTool-* Trigger/TrigAnalysis
-use TrigSteeringEvent TrigSteeringEvent-* Trigger/TrigEvent
-public
-
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
deleted file mode 100644
index a091e22323d016d9c2c0e1407eeddddee6df18d6..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
+++ /dev/null
@@ -1,39 +0,0 @@
-package VP1TriggerSystems
-
-author Manuel Proissl <mproissl@cern.ch>
-manager Manuel Proissl <mproissl@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AnalysisTriggerEvent AnalysisTriggerEvent-* PhysicsAnalysis/AnalysisTrigger
-use GaudiInterface GaudiInterface-* External
-use StoreGate StoreGate-* Control
-use TrigDecisionTool TrigDecisionTool-* Trigger/TrigAnalysis
-use TrigMuonEvent TrigMuonEvent-* Trigger/TrigEvent
-use TrigObjectMatching TrigObjectMatching-* Trigger/TrigAnalysis
-#use TrigSteering TrigSteering-* Trigger/TrigSteer
-use TrigSteeringEvent TrigSteeringEvent-* Trigger/TrigEvent
-use VP1Base VP1Base-* graphics/VP1
-use VP1Qt VP1Qt-* graphics/VP1
-end_public
-
-private
-#use AtlasCLHEP AtlasCLHEP-* External
-use AtlasCoinInventor AtlasCoinInventor-* External
-use TrkParameters TrkParameters-* Tracking/TrkEvent
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use GaudiInterface GaudiInterface-* External
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-end_private
-
-public
-
-# NOTE: this line below is a workaround to solve a Qt bug appearing when using Qt < 5.0 together with BOOST > 1.52
-# In ATLAS we currently use Qt 4.8.4 and BOOST 1.55, so we are affected by the bug. This line could be removed when moving to Qt 5.
-# Details here: https://its.cern.ch/jira/browse/ATLASVPONE-184
-macro VP1TriggerSystems_qt4options "mocflags:-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED mocflags:-DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION"
-
-
-apply_pattern qt4based_library
-
diff --git a/graphics/VP1/VP1Systems/VP1UtilitySystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1UtilitySystems/cmt/requirements
deleted file mode 100755
index bf937cf815d274002c66be24fd602c1d2c72c2ac..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1UtilitySystems/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package VP1UtilitySystems
-
-author Joe Boudreau <boudreau@pitt.edu>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-
-apply_pattern qt4based_library
-
-private
-use AtlasCoinInventor AtlasCoinInventor-* External
-use AtlasROOT AtlasROOT-* External
-
-use QatPlotting QatPlotting-* graphics/Qat
-use QatPlotWidgets QatPlotWidgets-* graphics/Qat
-use QatDataAnalysis QatDataAnalysis-* graphics/Qat
diff --git a/graphics/VP1/VP1Systems/VP1VertexSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1VertexSystems/cmt/requirements
deleted file mode 100644
index 5cb8e6869c9028e1f4b2e9c1e40730294de6994a..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Systems/VP1VertexSystems/cmt/requirements
+++ /dev/null
@@ -1,31 +0,0 @@
-package VP1VertexSystems
-
-author Andreas Wildauer <Andreas.Wildauer@cern.ch>
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-
-public
-use AtlasPolicy AtlasPolicy-*
-use VP1Base VP1Base-* graphics/VP1
-use VP1Qt VP1Qt-* graphics/VP1
-
-
-private
-#use AtlasCLHEP AtlasCLHEP-* External
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use AtlasCoinInventor AtlasCoinInventor-* External
-use AtlasHepMC AtlasHepMC-* External
-use GeneratorObjects GeneratorObjects-* Generators
-#use TrkEventPrimitives TrkEventPrimitives-* Tracking/TrkEvent
-use TrkParticleBase TrkParticleBase-* Tracking/TrkEvent
-use TrkTrack TrkTrack-* Tracking/TrkEvent
-use TrkTrackLink TrkTrackLink-* Tracking/TrkEvent
-use VP1Utils VP1Utils-* graphics/VP1
-use VxVertex VxVertex-* Tracking/TrkEvent
-use GaudiInterface GaudiInterface-* External
-end_private
-
-
-
-public
-apply_pattern qt4based_library
diff --git a/graphics/VP1/VP1TrkAuxAlgs/cmt/requirements b/graphics/VP1/VP1TrkAuxAlgs/cmt/requirements
deleted file mode 100644
index dce32ceb1a4e268d08f30e95aeb7ee2751e53edf..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1TrkAuxAlgs/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package VP1TrkAuxAlgs
-
-use AtlasPolicy AtlasPolicy-*
-use AthenaBaseComps AthenaBaseComps-* Control
-use VP1Qt VP1Qt-* graphics/VP1
-
-library VP1TrkAuxAlgs *.cxx components/*.cxx
-
-apply_pattern component_library
-
-private
-use GaudiInterface GaudiInterface-* External
-use VP1Base VP1Base-* graphics/VP1
-use VP1Utils VP1Utils-* graphics/VP1
-
-use TrkExInterfaces TrkExInterfaces-* Tracking/TrkExtrapolation
-use TrkFitterInterfaces TrkFitterInterfaces-* Tracking/TrkFitter
diff --git a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
index f3d5b9e559f3e13aea1906dfb7914dcb0ba0104c..e572441e47a83ed4661471cfe6fda93a73b7554e 100644
--- a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
+++ b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "VP1TrkAuxAlgs/VP1TrkInitializer.h"
-DECLARE_ALGORITHM_FACTORY(VP1TrkInitializer)
+DECLARE_COMPONENT( VP1TrkInitializer )
-DECLARE_FACTORY_ENTRIES(VP1TrkAuxAlgs) {
- DECLARE_ALGORITHM( VP1TrkInitializer );
-}
diff --git a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx
deleted file mode 100644
index 7fd141963a3bd5cf751b02c6fa099f94fae17743..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1TrkAuxAlgs)
diff --git a/graphics/VP1/VP1Utils/cmt/requirements b/graphics/VP1/VP1Utils/cmt/requirements
deleted file mode 100644
index 4d3d70e905881f8d3edff95f956770b9077759e8..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1Utils/cmt/requirements
+++ /dev/null
@@ -1,48 +0,0 @@
-package VP1Utils
-
-author Thomas Kittelmann
-manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-public
-use AtlasPolicy AtlasPolicy-*
-use AtlasCLHEP AtlasCLHEP-* External
-use CLIDSvc CLIDSvc-* Control
-use GaudiInterface GaudiInterface-* External
-use GeoModelKernel GeoModelKernel-* DetectorDescription/GeoModel
-use StoreGate StoreGate-* Control
-#use TrkParameters TrkParameters-* Tracking/TrkEvent
-use VP1Base VP1Base-* graphics/VP1
-use VP1Qt VP1Qt-* graphics/VP1
-
-#Eigen migration
-#use TrkEventPrimitives TrkEventPrimitives-* Tracking/TrkEvent
-use GeoPrimitives GeoPrimitives-* DetectorDescription
-use EventPrimitives EventPrimitives-* Event
-
-
-private
-use AtlasEigen AtlasEigen-* External
-use AtlasCoinInventor AtlasCoinInventor-* External
-use AtlasDetDescr AtlasDetDescr-* DetectorDescription
-use CaloIdentifier CaloIdentifier-* Calorimeter
-use CaloTTDetDescr CaloTTDetDescr-* Calorimeter
-use CxxUtils CxxUtils-* Control
-use GeoModelUtilities GeoModelUtilities-* DetectorDescription/GeoModel
-use GeoSpecialShapes GeoSpecialShapes-* DetectorDescription/GeoModel
-use HepPDT v* LCG_Interfaces
-use Identifier Identifier-* DetectorDescription
-use InDetIdentifier InDetIdentifier-* InnerDetector/InDetDetDescr
-use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr
-use InDetRIO_OnTrack InDetRIO_OnTrack-* InnerDetector/InDetRecEvent
-use LArReadoutGeometry LArReadoutGeometry-* LArCalorimeter/LArGeoModel
-use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
-use MuonRIO_OnTrack MuonRIO_OnTrack-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
-use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
-use TileDetDescr TileDetDescr-* TileCalorimeter
-use TrkRIO_OnTrack TrkRIO_OnTrack-* Tracking/TrkEvent
-use TrkSurfaces TrkSurfaces-* Tracking/TrkDetDescr
-use VP1HEPVis VP1HEPVis-* graphics/VP1
-public
-
-apply_pattern qt4based_library
-
diff --git a/graphics/VP1/VP1UtilsBase/cmt/requirements b/graphics/VP1/VP1UtilsBase/cmt/requirements
deleted file mode 100644
index cf0ecf0d03d577f9bf74faae928764255d26a647..0000000000000000000000000000000000000000
--- a/graphics/VP1/VP1UtilsBase/cmt/requirements
+++ /dev/null
@@ -1,17 +0,0 @@
-package VP1UtilsBase
-
-####
-# This package gathers all the utilities not depending on openGL
-# and neither on VP1Gui or VP1Base (they also depend on openGL).
-####
-
-author Riccardo Maria BIANCHI <rbianchi@cern.ch>
-
-use AtlasPolicy AtlasPolicy-*
-
-private
-use VP1Qt VP1Qt-* graphics/VP1
-public
-
-apply_pattern qt4based_library
-