From cd2811a5f31c36fa3f753974e38685b2d4a96558 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Sat, 17 Jun 2017 01:57:40 +0200
Subject: [PATCH] Namespace re-organisation

---
 CMakeLists.txt                           | 6 +++---
 CTestConfig.cmake                        | 4 ++--
 DDCore/include/DD4hep/DetFactoryHelper.h | 4 ++--
 DDCore/include/DD4hep/Readout.h          | 4 ++--
 DDCore/include/DD4hep/VolumeManager.h    | 4 ++--
 DDCore/include/XML/Utilities.h           | 4 ++--
 DDCore/src/DetectorImp.h                 | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 278e710e3..bd13f58b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ option(DD4HEP_USE_GEANT4  "Enable the simulation part based on Geant4"    OFF)
 option(DD4HEP_USE_GEAR    "Build gear wrapper for backward compatibility" OFF)
 option(DD4HEP_USE_LCIO    "Build lcio extensions"    OFF)
 option(BUILD_TESTING      "Enable and build tests"   ON)
-option(DD4HEP_USE_CXX14   "Build dd4hep using c++14" OFF)
+option(DD4HEP_USE_CXX14   "Build DD4hep using c++14" OFF)
 option(CMAKE_MACOSX_RPATH "Build with rpath on macos" ON)
 #
 #-----------------------------------------------------------------------------------------------------
@@ -59,7 +59,7 @@ message ( STATUS "ROOT_VERSION: ${ROOT_VERSION}" )
 dd4hep_set_compiler_flags()
 
 add_subdirectory ( GaudiPluginService)
-#---dd4hep functions and macros -------------------------------------------------------
+#---DD4hep functions and macros -------------------------------------------------------
 include(DD4hep)
 include(DD4hepMacros) 
 
@@ -138,7 +138,7 @@ OPTION( INSTALL_DOC "Set to OFF to skip build/install Documentation" OFF )
 IF( INSTALL_DOC )
   INSTALL( CODE "EXECUTE_PROCESS( COMMAND ${CMAKE_BUILD_TOOL} doc)" )
   include ( GlobalSVNRevision )
-  include ( dd4hepDoxygen )
+  include ( DD4hepDoxygen )
 ENDIF()
 
 #---Configuration-------------------------------------------------------------------
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index ba0548265..d69479965 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -4,10 +4,10 @@
 ## # The following are required to uses Dart and the Cdash dashboard
 ##   ENABLE_TESTING()
 ##   INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "dd4hep")
+set(CTEST_PROJECT_NAME "DD4hep")
 set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
 
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "aidasoft.desy.de")
-set(CTEST_DROP_LOCATION "/CDash/submit.php?project=dd4hep")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=DD4hep")
 set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/DDCore/include/DD4hep/DetFactoryHelper.h b/DDCore/include/DD4hep/DetFactoryHelper.h
index 9bce6d0e8..cf9c803f1 100644
--- a/DDCore/include/DD4hep/DetFactoryHelper.h
+++ b/DDCore/include/DD4hep/DetFactoryHelper.h
@@ -10,8 +10,8 @@
 // Author     : M.Frank
 //
 //==========================================================================
-#ifndef dd4hep_DETECTOR_DETFACTORYHELPER_H
-#define dd4hep_DETECTOR_DETFACTORYHELPER_H
+#ifndef DD4HEP_DETECTOR_DETFACTORYHELPER_H
+#define DD4HEP_DETECTOR_DETFACTORYHELPER_H
 
 /** Obsolete header. Better use XML/Helper.h instead !  */
 
diff --git a/DDCore/include/DD4hep/Readout.h b/DDCore/include/DD4hep/Readout.h
index e33784642..6d3f71635 100644
--- a/DDCore/include/DD4hep/Readout.h
+++ b/DDCore/include/DD4hep/Readout.h
@@ -10,8 +10,8 @@
 // Author     : M.Frank
 //
 //==========================================================================
-#ifndef dd4hep_GEOMETRY_READOUT_H
-#define dd4hep_GEOMETRY_READOUT_H
+#ifndef DD4HEP_GEOMETRY_READOUT_H
+#define DD4HEP_GEOMETRY_READOUT_H
 
 // Framework include files
 #include "DD4hep/Handle.h"
diff --git a/DDCore/include/DD4hep/VolumeManager.h b/DDCore/include/DD4hep/VolumeManager.h
index 3c3d71b8e..4025b4416 100644
--- a/DDCore/include/DD4hep/VolumeManager.h
+++ b/DDCore/include/DD4hep/VolumeManager.h
@@ -11,8 +11,8 @@
 //
 //==========================================================================
 
-#ifndef dd4hep_GEOMETRY_VOLUMEMANAGER_H
-#define dd4hep_GEOMETRY_VOLUMEMANAGER_H
+#ifndef DD4HEP_GEOMETRY_VOLUMEMANAGER_H
+#define DD4HEP_GEOMETRY_VOLUMEMANAGER_H
 
 // Framework include files
 #include "DD4hep/Volumes.h"
diff --git a/DDCore/include/XML/Utilities.h b/DDCore/include/XML/Utilities.h
index 42bbe65eb..618b5fca8 100644
--- a/DDCore/include/XML/Utilities.h
+++ b/DDCore/include/XML/Utilities.h
@@ -11,8 +11,8 @@
 //
 //==========================================================================
 
-#ifndef dd4hep_XML_XMLUTILITIES_H
-#define dd4hep_XML_XMLUTILITIES_H
+#ifndef DD4HEP_XML_XMLUTILITIES_H
+#define DD4HEP_XML_XMLUTILITIES_H
 
 // Framework include files
 #include "XML/Conversions.h"
diff --git a/DDCore/src/DetectorImp.h b/DDCore/src/DetectorImp.h
index 4a54d80c2..de79569de 100644
--- a/DDCore/src/DetectorImp.h
+++ b/DDCore/src/DetectorImp.h
@@ -11,8 +11,8 @@
 //
 //==========================================================================
 
-#ifndef dd4hep_DetectorGEOIMP_H
-#define dd4hep_DetectorGEOIMP_H
+#ifndef DD4HEP_DetectorGEOIMP_H
+#define DD4HEP_DetectorGEOIMP_H
 
 // Framework include files
 #include "DD4hep/DetectorData.h"
-- 
GitLab