diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
index f3f6fe3c76c06c19324c361db52b7cb90bf5d16f..804901eb79a0d39e87bfd108248cb679e6d496b6 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
InnerDetector/InDetConditions/InDetConditionsSummaryService
InnerDetector/InDetConditions/TRT_ConditionsData
- Tracking/TrkEvent/TrkParameters
PRIVATE
Control/AthenaBaseComps
Control/StoreGate
@@ -29,27 +28,26 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetConditions/InDetCoolCoralClientUtils
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
+ InnerDetector/InDetRecTools/InDetRecToolInterfaces
Tools/PathResolver )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( COOL COMPONENTS CoolKernel )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( ROOT COMPONENTS RIO Core Tree MathCore Hist pthread )
# Component(s) in the package:
atlas_add_library( TRT_ConditionsServicesLib
src/*.cxx
PUBLIC_HEADERS TRT_ConditionsServices
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData TrkParameters StoreGateLib SGtests
+ LINK_LIBRARIES AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaBaseComps AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier EventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry PathResolver )
atlas_add_component( TRT_ConditionsServices
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData TrkParameters AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier EventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry PathResolver TRT_ConditionsServicesLib )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} AthenaKernel GeoPrimitives EventPrimitives GaudiKernel TRT_ConditionsData AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities DetDescrConditions GeoModelUtilities Identifier EventInfo InDetCoolCoralClientUtils InDetIdentifier InDetReadoutGeometry PathResolver TRT_ConditionsServicesLib )
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
index 1f76bc00519079ba4b2bc71cb1f9312121b9609f..678be9e606bbec21ee4770e28b6889713e6b39a4 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
@@ -10,7 +10,6 @@
#include "src/TRT_StrawStatusSummarySvc.h"
#include "src/TRT_ByteStream_ConditionsSvc.h"
#include "src/TRT_DAQ_ConditionsSvc.h"
-#include "src/TRT_ActiveFractionSvc.h"
DECLARE_SERVICE_FACTORY( TRT_ConditionsSummarySvc )
DECLARE_SERVICE_FACTORY( TRT_ConditionsTestSvc )
@@ -23,19 +22,3 @@ DECLARE_SERVICE_FACTORY( TRT_StrawNeighbourSvc )
DECLARE_SERVICE_FACTORY( TRT_StrawStatusSummarySvc )
DECLARE_SERVICE_FACTORY( TRT_ByteStream_ConditionsSvc )
DECLARE_SERVICE_FACTORY( TRT_DAQ_ConditionsSvc )
-DECLARE_SERVICE_FACTORY( TRT_ActiveFractionSvc )
-
-DECLARE_FACTORY_ENTRIES( TRT_ConditionsServices ) {
- DECLARE_SERVICE( TRT_ConditionsSummarySvc );
- DECLARE_SERVICE( TRT_ConditionsTestSvc );
- DECLARE_SERVICE( TRT_AlignDbSvc );
- DECLARE_SERVICE( TRT_CalDbSvc );
- DECLARE_SERVICE( TRT_StrawAlignDbSvc );
- DECLARE_SERVICE( TRT_DCS_ConditionsSvc );
- DECLARE_SERVICE( TRT_HWMappingSvc );
- DECLARE_SERVICE( TRT_StrawNeighbourSvc );
- DECLARE_SERVICE( TRT_StrawStatusSummarySvc );
- DECLARE_SERVICE( TRT_ByteStream_ConditionsSvc );
- DECLARE_SERVICE( TRT_DAQ_ConditionsSvc );
- DECLARE_SERVICE( TRT_ActiveFractionSvc );
-}
diff --git a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1b433159e82686e2fcf0b06a98762c38b1575fe2
--- /dev/null
+++ b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/CMakeLists.txt
@@ -0,0 +1,27 @@
+################################################################################
+# Package: TRT_RecoConditionsServices
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TRT_RecoConditionsServices )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ GaudiKernel
+ PRIVATE
+ Control/AthenaBaseComps
+ Control/StoreGate
+ InnerDetector/InDetConditions/TRT_ConditionsServices
+ InnerDetector/InDetDetDescr/InDetIdentifier
+ InnerDetector/InDetDetDescr/InDetReadoutGeometry
+ InnerDetector/InDetRecTools/InDetRecToolInterfaces
+ Tracking/TrkEvent/TrkParameters )
+
+# External dependencies:
+find_package( Eigen )
+
+# Component(s) in the package:
+atlas_add_component( TRT_RecoConditionsServices
+ src/*.cxx src/components/*.cxx
+ INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel TrkParameters AthenaBaseComps StoreGateLib SGtests InDetIdentifier InDetReadoutGeometry TRT_ConditionsServicesLib )
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ActiveFractionSvc.cxx b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/TRT_ActiveFractionSvc.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ActiveFractionSvc.cxx
rename to InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/TRT_ActiveFractionSvc.cxx
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ActiveFractionSvc.h b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/TRT_ActiveFractionSvc.h
similarity index 98%
rename from InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ActiveFractionSvc.h
rename to InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/TRT_ActiveFractionSvc.h
index c8d1797b17da4d6ea05ca104a44fdbfceeab4b0c..d51c454291123c31c20614ead6649f39fcde1942 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_ActiveFractionSvc.h
+++ b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/TRT_ActiveFractionSvc.h
@@ -13,7 +13,7 @@
*///-------------------------------------------------------
// Header Includes
-#include "TRT_ConditionsServices/ITRT_ActiveFractionSvc.h"
+#include "InDetRecToolInterfaces/ITRT_ActiveFractionSvc.h"
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..160952fc1c713284e690dd259a43b42e0e244584
--- /dev/null
+++ b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
@@ -0,0 +1,4 @@
+#include "GaudiKernel/DeclareFactoryEntries.h"
+#include "src/TRT_ActiveFractionSvc.h"
+
+DECLARE_SERVICE_FACTORY( TRT_ActiveFractionSvc )
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 7369f9408d03b3c47853a88015f2d449bba51091..a1a7efa92059cab369c2f91fed4352413036badf 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -471,7 +471,7 @@ if DetFlags.haveRIO.TRT_on():
if (InDetFlags.doPrintConfigurables()):
print InDetTRTConditionsSummaryService
- from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_ActiveFractionSvc
+ from TRT_RecoConditionsServices.TRT_RecoConditionsServicesConf import TRT_ActiveFractionSvc
InDetTRT_ActiveFractionSvc = TRT_ActiveFractionSvc(name = "InDetTRTActiveFractionSvc")
ServiceMgr += InDetTRT_ActiveFractionSvc
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index d67616dc4892b5bc0403be126f0753e7149c7c62..31b60ae5a463c5ccd76e621b68c2397d0d95a3c2 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -631,7 +631,7 @@ class TRTConditionsServicesSetup:
if self._print:
print InDetTRTConditionsSummaryService
- from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_ActiveFractionSvc
+ from TRT_RecoConditionsServices.TRT_RecoConditionsServicesConf import TRT_ActiveFractionSvc
InDetTRT_ActiveFractionSvc = TRT_ActiveFractionSvc(name=self.instanceName("InDetTRTActiveFractionSvc"),
#missing link to TRTSummarySvc
)
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/TRT_ConditionsServices/ITRT_ActiveFractionSvc.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ITRT_ActiveFractionSvc.h
similarity index 100%
rename from InnerDetector/InDetConditions/TRT_ConditionsServices/TRT_ConditionsServices/ITRT_ActiveFractionSvc.h
rename to InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ITRT_ActiveFractionSvc.h
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
index 87cb4913023e10b7bf1539fb4ad44094c8fd56be..9f96204c2694f554207e57085c06b38ed48dd1e4 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrtDriftCircleCutTool.cxx
@@ -3,7 +3,7 @@
*/
#include "InDetTrackSelectorTool/InDetTrtDriftCircleCutTool.h"
-#include "TRT_ConditionsServices/ITRT_ActiveFractionSvc.h"
+#include "InDetRecToolInterfaces/ITRT_ActiveFractionSvc.h"
StatusCode InDet::InDetTrtDriftCircleCutTool::initialize()
{
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 65fe36405a1cf97d747449b529f09155905ebfe6..811592ac650581bb531fb64bfbf901721fe96bac 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -355,7 +355,6 @@
+ Tracking/TrkDetDescr/TrkSurfaces
+ Tracking/TrkEvent/TrkEventPrimitives
+ Tracking/TrkEvent/TrkNeutralParameters
-+ Tracking/TrkEvent/TrkParameters
+ Tracking/TrkEvent/TrkParametersBase
+ Tracking/TrkEvent/TrkTrackLink