diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f20971582e2be6a028487f2fdad94409a88cd53..b891580e1b29fa415e86f402f9cf8bbdd7c13b25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,6 @@ include(DD4hep_XML_setup) add_subdirectory(DDSegmentation) add_subdirectory(DDParsers) add_subdirectory(DDCore) -add_subdirectory(DDSurfaces) add_subdirectory(DDRec) add_subdirectory(DDDetectors) add_subdirectory(DDG4) diff --git a/DDRec/CMakeLists.txt b/DDRec/CMakeLists.txt index 9ef9f2988771df68233078871d12ee8f6266d7db..1711c07a056fde0dee5a68534c80b186644d2522 100644 --- a/DDRec/CMakeLists.txt +++ b/DDRec/CMakeLists.txt @@ -11,7 +11,7 @@ # #========================================================================== dd4hep_package(DDRec - USES DDCore DDSurfaces boost + USES DDCore boost [ROOT REQUIRED COMPONENTS Geom] INCLUDE_DIRS include INSTALL_INCLUDES include/DDRec) diff --git a/DDSurfaces/CMakeLists.txt b/DDSurfaces/CMakeLists.txt deleted file mode 100644 index ca2004216acd3cb9b199cc9ccd57dd0c6e6da28a..0000000000000000000000000000000000000000 --- a/DDSurfaces/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# $Id: $ -#========================================================================== -# AIDA Detector description implementation -#-------------------------------------------------------------------------- -# Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -# All rights reserved. -# -# For the licensing terms see $DD4hepINSTALL/LICENSE. -# For the list of contributors see $DD4hepINSTALL/doc/CREDITS. -# -# Author: F.Gaede (Desy) -# -#========================================================================== -dd4hep_package(DDSurfaces - INCLUDE_DIRS include - INSTALL_INCLUDES include/DDSurfaces) diff --git a/DDSurfaces/include/DDSurfaces/IMaterial.h b/DDSurfaces/include/DDSurfaces/IMaterial.h deleted file mode 100644 index 24aec77fa69f9f8dfdd2b407aa3bb9c3791e6373..0000000000000000000000000000000000000000 --- a/DDSurfaces/include/DDSurfaces/IMaterial.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef DDSurfaces_IMaterial_H_ -#define DDSurfaces_IMaterial_H_ - -#include "DDRec/IMaterial.h" - -namespace DDSurfaces { - - using dd4hep::rec::IMaterial ; - -} - -#endif diff --git a/DDSurfaces/include/DDSurfaces/ISurface.h b/DDSurfaces/include/DDSurfaces/ISurface.h deleted file mode 100644 index 6d767f477403a685622daf9309e007e5f16034d3..0000000000000000000000000000000000000000 --- a/DDSurfaces/include/DDSurfaces/ISurface.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef DDSurfaces_ISurface_H -#define DDSurfaces_ISurface_H - -#include "DDSurfaces/IMaterial.h" -#include "DDSurfaces/Vector2D.h" -#include "DDSurfaces/Vector3D.h" - -#include "DDRec/ISurface.h" - -namespace DDSurfaces { - - using dd4hep::rec::ISurface ; - using dd4hep::rec::SurfaceType ; - using dd4hep::rec::ICylinder ; - using dd4hep::rec::ICone ; - -} - -#endif diff --git a/DDSurfaces/include/DDSurfaces/Vector2D.h b/DDSurfaces/include/DDSurfaces/Vector2D.h deleted file mode 100644 index 7b15f3fe63b8259dbfe390037516b788a25198a3..0000000000000000000000000000000000000000 --- a/DDSurfaces/include/DDSurfaces/Vector2D.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef DDSurfaces_Vector2D_h -#define DDSurfaces_Vector2D_h 1 - -#include "DDRec/Vector2D.h" - -namespace DDSurfaces { - - using dd4hep::rec::Vector2D ; - -} - -#endif diff --git a/DDSurfaces/include/DDSurfaces/Vector3D.h b/DDSurfaces/include/DDSurfaces/Vector3D.h deleted file mode 100644 index 5b17c73fc1967c2a42861649044f47b7263b0507..0000000000000000000000000000000000000000 --- a/DDSurfaces/include/DDSurfaces/Vector3D.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef DDSurfaces_Vector3D_h -#define DDSurfaces_Vector3D_h 1 - -#include "DDRec/Vector3D.h" - -namespace DDSurfaces { - - using dd4hep::rec::Vector3D ; - -} - -#endif