From 2bfbde7216e23f1b522a5a583cc08f31c4cbdd7b Mon Sep 17 00:00:00 2001
From: Nikiforos Nikiforou <Nikiforos.Nikiforou@cern.ch>
Date: Thu, 13 Aug 2015 15:51:06 +0000
Subject: [PATCH] Fixed Coil Rmin/Rmax swap bug in ILD/CLIC convert to Gear
plugins. Also modified CMakeLists.txt to set CMAKE_INSTALL_PREFIX to source
dir as before, rather than /usr
---
CMakeLists.txt | 13 ++++++++++++-
DDRec/src/gear/createGearForCLIC.cpp | 4 ++--
DDRec/src/gear/createGearForILD.cpp | 4 ++--
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20be3c554..12c232edb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,17 @@ set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake )
#
include ( DD4hepBuild )
#
+
+#------------- set the default installation directory to be the source directory
+
+IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ SET( CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR} CACHE PATH
+ "install prefix path - overwrite with -D CMAKE_INSTALL_PREFIX = ..."
+ FORCE )
+ MESSAGE(STATUS "CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX} - overwrite with -D CMAKE_INSTALL_PREFIX" )
+ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+
+
#---Options-------------------------------------------------------------------------
option(DD4HEP_USE_XERCESC "Enable 'Detector Builders' based on XercesC" OFF)
option(DD4HEP_USE_PYROOT "Enable 'Detector Builders' based on PyROOT" OFF) # does not work (compile error)
@@ -21,7 +32,7 @@ dd4hep_set_version(DD4hep MAJOR 0 MINOR 14 PATCH 0)
dd4hep_configure_output( OUTPUT "${PROJECT_BINARY_DIR}" INSTALL "${CMAKE_INSTALL_PREFIX}" )
#
#
-# No Relex library present for ROOT 6
+# No Reflex library present for ROOT 6
#
find_package ( ROOT REQUIRED COMPONENTS Geom GenVector )
if ( ${ROOT_VERSION_MAJOR} GREATER 5 )
diff --git a/DDRec/src/gear/createGearForCLIC.cpp b/DDRec/src/gear/createGearForCLIC.cpp
index 60635e485..dcdcbc513 100644
--- a/DDRec/src/gear/createGearForCLIC.cpp
+++ b/DDRec/src/gear/createGearForCLIC.cpp
@@ -258,8 +258,8 @@ namespace DD4hep{
Tube coilTube = Tube( coilDE.volume().solid() ) ;
- gearCOIL->setDoubleVal("Coil_cryostat_outer_radius" , coilTube->GetRmin()/ dd4hep::mm ) ;
- gearCOIL->setDoubleVal("Coil_cryostat_inner_radius" , coilTube->GetRmax()/ dd4hep::mm ) ;
+ gearCOIL->setDoubleVal("Coil_cryostat_inner_radius" , coilTube->GetRmin()/ dd4hep::mm ) ;
+ gearCOIL->setDoubleVal("Coil_cryostat_outer_radius" , coilTube->GetRmax()/ dd4hep::mm ) ;
gearCOIL->setDoubleVal("Coil_cryostat_half_z" , coilTube->GetDZ()/ dd4hep::mm ) ;
coilDE.addExtension< GearHandle >( new GearHandle( gearCOIL, "CoilParameters" ) ) ;
diff --git a/DDRec/src/gear/createGearForILD.cpp b/DDRec/src/gear/createGearForILD.cpp
index a029c828b..af9db33ab 100644
--- a/DDRec/src/gear/createGearForILD.cpp
+++ b/DDRec/src/gear/createGearForILD.cpp
@@ -276,8 +276,8 @@ namespace DD4hep{
Tube coilTube = Tube( coilDE.volume().solid() ) ;
- gearCOIL->setDoubleVal("Coil_cryostat_outer_radius" , coilTube->GetRmin()/ dd4hep::mm ) ;
- gearCOIL->setDoubleVal("Coil_cryostat_inner_radius" , coilTube->GetRmax()/ dd4hep::mm ) ;
+ gearCOIL->setDoubleVal("Coil_cryostat_inner_radius" , coilTube->GetRmin()/ dd4hep::mm ) ;
+ gearCOIL->setDoubleVal("Coil_cryostat_outer_radius" , coilTube->GetRmax()/ dd4hep::mm ) ;
gearCOIL->setDoubleVal("Coil_cryostat_half_z" , coilTube->GetDZ()/ dd4hep::mm ) ;
coilDE.addExtension< GearHandle >( new GearHandle( gearCOIL, "CoilParameters" ) ) ;
--
GitLab