From d33feb28a4ee44a19fe85aa72b7de6247ab9a036 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Tue, 27 Mar 2018 16:12:43 +0200
Subject: [PATCH] Remove DDSurface folder since it was merged into DDRec

---
 CMakeLists.txt                            |  1 -
 DDRec/CMakeLists.txt                      |  2 +-
 DDSurfaces/CMakeLists.txt                 | 16 ----------------
 DDSurfaces/include/DDSurfaces/IMaterial.h | 12 ------------
 DDSurfaces/include/DDSurfaces/ISurface.h  | 19 -------------------
 DDSurfaces/include/DDSurfaces/Vector2D.h  | 12 ------------
 DDSurfaces/include/DDSurfaces/Vector3D.h  | 12 ------------
 7 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 DDSurfaces/CMakeLists.txt
 delete mode 100644 DDSurfaces/include/DDSurfaces/IMaterial.h
 delete mode 100644 DDSurfaces/include/DDSurfaces/ISurface.h
 delete mode 100644 DDSurfaces/include/DDSurfaces/Vector2D.h
 delete mode 100644 DDSurfaces/include/DDSurfaces/Vector3D.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f2097158..b891580e1 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 9ef9f2988..1711c07a0 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 ca2004216..000000000
--- 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 24aec77fa..000000000
--- 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 6d767f477..000000000
--- 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 7b15f3fe6..000000000
--- 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 5b17c73fc..000000000
--- 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 
-- 
GitLab