diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/DistortedMaterialManager.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/DistortedMaterialManager.h
index 94ab96cf90852f961480890c9258b91d5e1444d7..8be4c86094d3aca22696d7a2664ca9d24423776f 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/DistortedMaterialManager.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/DistortedMaterialManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_DistortedMaterialManager_h
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ExtraMaterial.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ExtraMaterial.h
index 7c4bbb3d2b24f5951f3160debdc93e7a96fb4793..8550097760ea09fff3868b33e86734791da3af8e 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ExtraMaterial.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ExtraMaterial.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_ExtraMaterial
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/GenericTubeMaker.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/GenericTubeMaker.h
index 34b211b5eb9c58443b745ba1b63f4073e589f3b8..c1ce86c0b3200a226c13eb8fb00da6e605d8e107 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/GenericTubeMaker.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/GenericTubeMaker.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_GenericTubeMaker_h
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/IInDetServMatBuilderTool.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/IInDetServMatBuilderTool.h
index 5d81cd747f8032e15f2da5ffccc5fbd2942e37db..5cd2eeb8e3d64c66744d99f1ef4954d0586626da 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/IInDetServMatBuilderTool.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/IInDetServMatBuilderTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDDAthenaComps.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDDAthenaComps.h
index 4e1029756680c6100c800714f820ba36ad60deb8..f0146b75c8dcc8634616878215107a6db62f081d 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDDAthenaComps.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDDAthenaComps.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_InDetDDAthenaComps_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDetectorFactoryBase.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDetectorFactoryBase.h
index 7e91ac1d5f18bd9cf5da58424f5617d8769fc524..936fc3bc3707e2ef46cbe63957c45d92d9d6b7ff 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDetectorFactoryBase.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetDetectorFactoryBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_DetectorFactoryBase_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetMaterialManager.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetMaterialManager.h
index 7466f7a60dbf9e2677a4e06cec5f1438d034f674..daec292a8fe37d85f25ab2bdb39577a6a6f4b551 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetMaterialManager.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetMaterialManager.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef INDETMATERIALMANAGER_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetSubDetectorFactoryBase.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetSubDetectorFactoryBase.h
index e19bd6a9a389d02dc6d494eeb70d35b82837b0d6..51517ea821c911a86b1d1ae2d6ecc1710fee6309 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetSubDetectorFactoryBase.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/InDetSubDetectorFactoryBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_SubDetectorFactoryBase_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/PairIndexMap.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/PairIndexMap.h
index fd3619287d9b08da809411de8b3917748c648533..0f2a48146860df5a73124740b4783a500fd81989 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/PairIndexMap.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/PairIndexMap.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_PairIndexMap_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolume.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolume.h
index 94286488fbf92ca16e0a5bc9cb218609010f2b4a..c19e54b0a65b7cc8972d523a8243155241203ee8 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolume.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolume.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetDD_ServiceVolume_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h
index 665bfed87e59365c61da8c189e7ab4f610b2f1e0..5d60d77aa6b5d849ae36ebdc09c8c49f622cfb07 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/ServiceVolumeMaker.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ServiceVolumeMaker_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TopLevelPlacements.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TopLevelPlacements.h
index 541fba5a4428927cadbb3159d7d03817e5b99db8..51e07de7827d9f27162bf851b1972c4379bad31a 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TopLevelPlacements.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TopLevelPlacements.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef INDETGEOMODELUTILS_TOPLEVELPLACEMENTS_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TubeVolData.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TubeVolData.h
index 65ed71816bda84f8490e64e092d4d2db017fcde3..3ef4345695c805638ad2e311974d9e10da919990 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TubeVolData.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/TubeVolData.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_TubeVolData_h
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeBuilder.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeBuilder.h
index 1f12b7122158ee9b5e4cb599bce7bfc730b8a211..8320b41bbe065ada07f19ede8d4ca4921577da12 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeBuilder.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_VolumeBuilder_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitter.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitter.h
index dc876140155f624150c0ead46a3d43dd8365eb2e..6591156b0f3dbf8944d8eaee0b41d874e5fa23e3 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitter.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_VolumeSplitter_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h
index 096798b257f859ed834f8937dd5d4ac8273a51ee..bb2c5583b02b23dc619468db67d6a968fc12129c 100644
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/InDetGeoModelUtils/VolumeSplitterUtils.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef InDetGeoModelUtils_VolumeSplitterUtils_H
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/DistortedMaterialManager.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/DistortedMaterialManager.cxx
index c7db36eaa8420a5408ba4b9992754496038a9ee5..5341ad383c7b0a6d1ae930b0e3189b987e3db6fb 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/DistortedMaterialManager.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/DistortedMaterialManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ExtraMaterial.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ExtraMaterial.cxx
index 6dfe4a12d5e24b44ee2ac5d39c4d6f184bc8d337..9814c6b2f93a2993ddfa2e1c2a1c894c508cf88f 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ExtraMaterial.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ExtraMaterial.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/ExtraMaterial.h"
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/GenericTubeMaker.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/GenericTubeMaker.cxx
index 94f7b5f36303677a0ac5ab8c80d37971cad81a95..46f83349168a8dd261a62ba01c191b511918d610 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/GenericTubeMaker.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/GenericTubeMaker.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/GenericTubeMaker.h"
@@ -13,7 +13,7 @@
#include "GeoModelKernel/GeoPhysVol.h"
#include "GeoModelKernel/GeoFullPhysVol.h"
#include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "RDBAccessSvc/IRDBRecord.h"
@@ -113,7 +113,7 @@ namespace InDetDD {
// Place in negative z as well.
if (m_volData.bothZ()) {
- GeoTransform* xformNeg = new GeoTransform(GeoTrf::RotateY3D(180 * GeoModelKernelUnits::deg) * GeoTrf::TranslateZ3D(
+ GeoTransform* xformNeg = new GeoTransform(GeoTrf::RotateY3D(180 * Gaudi::Units::deg) * GeoTrf::TranslateZ3D(
zOffset) * GeoTrf::RotateZ3D(phi));
if (parent) {
parent->add(xformNeg);
@@ -149,7 +149,7 @@ namespace InDetDD {
// Place in negative z as well.
if (m_volData.bothZ()) {
- GeoTransform* xformNeg = new GeoTransform(GeoTrf::RotateY3D(180 * GeoModelKernelUnits::deg) * GeoTrf::TranslateZ3D(
+ GeoTransform* xformNeg = new GeoTransform(GeoTrf::RotateY3D(180 * Gaudi::Units::deg) * GeoTrf::TranslateZ3D(
zOffset) * GeoTrf::RotateZ3D(phi));
if (parentNeg) {
parentNeg->add(xformNeg);
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx
index a85d6e394683d47b873507ba56869549d4577329..e7d6579b0cb79fc0c0d3e3caf8c0f50bc24e1c8f 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetDDAthenaComps.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/InDetDDAthenaComps.h"
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx
index e811e511ae69e7f650bd612a7c7f15f94ed58262..5928aa25c2a2d9d9c6d9e8494a51deca4d1cfd0c 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/InDetMaterialManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/InDetMaterialManager.h"
@@ -9,6 +9,7 @@
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoModelKernel/GeoElement.h"
#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "RDBAccessSvc/IRDBRecordset.h"
#include "RDBAccessSvc/IRDBRecord.h"
#include "GeometryDBSvc/IGeometryDBSvc.h"
@@ -142,8 +143,8 @@ InDetMaterialManager::getCompositeMaterialForVolume(const std::string& newMatNam
baseMaterials.reserve(2);
fracWeight.reserve(2);
- msg(MSG::DEBUG) << "Composite material : " << volumeTot / GeoModelKernelUnits::cm3 << " = " << volume1 / GeoModelKernelUnits::cm3 << " + " <<
- volume2 / GeoModelKernelUnits::cm3 << endmsg;
+ msg(MSG::DEBUG) << "Composite material : " << volumeTot / Gaudi::Units::cm3 << " = " << volume1 / Gaudi::Units::cm3 << " + " <<
+ volume2 / Gaudi::Units::cm3 << endmsg;
msg(MSG::DEBUG) << "Composite material : " << matName1 << " " << matName2 << endmsg;
double density1, density2;
@@ -152,21 +153,21 @@ InDetMaterialManager::getCompositeMaterialForVolume(const std::string& newMatNam
if ((iter = m_weightMap.find(matName1)) != m_weightMap.end()) {
const GeoMaterial* mat1 = getMaterialForVolume(matName1, volume1);
density1 = mat1->getDensity();
- msg(MSG::DEBUG) << "Composite material 1 - weight : " << density1 / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << endmsg;
+ msg(MSG::DEBUG) << "Composite material 1 - weight : " << density1 / (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << endmsg;
} else {
const GeoMaterial* mat1 = getMaterial(matName1);
density1 = mat1->getDensity();
- msg(MSG::DEBUG) << "Composite material 1 - standard : " << density1 / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << endmsg;
+ msg(MSG::DEBUG) << "Composite material 1 - standard : " << density1 / (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << endmsg;
}
if ((iter = m_weightMap.find(matName2)) != m_weightMap.end()) {
const GeoMaterial* mat2 = getMaterialForVolume(matName2, volume2);
density2 = mat2->getDensity();
- msg(MSG::DEBUG) << "Composite material 2 - weight : " << density2 / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << endmsg;
+ msg(MSG::DEBUG) << "Composite material 2 - weight : " << density2 / (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << endmsg;
} else {
const GeoMaterial* mat2 = getMaterial(matName2);
density2 = mat2->getDensity();
- msg(MSG::DEBUG) << "Composite material 2 - standard : " << density2 / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << endmsg;
+ msg(MSG::DEBUG) << "Composite material 2 - standard : " << density2 / (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << endmsg;
}
double weight1 = density1 * volume1;
@@ -180,8 +181,8 @@ InDetMaterialManager::getCompositeMaterialForVolume(const std::string& newMatNam
double density_2 = 1.0 / (frac1 / density1 + frac2 / density2);
double density_3 = (weight1 + weight2) / (volume1 + volume2);
msg(MSG::DEBUG) << "-> weights : " << weight1 / (GeoModelKernelUnits::gram) << " " << weight2 / (GeoModelKernelUnits::gram) << endmsg;
- msg(MSG::DEBUG) << "-> density : " << density / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << " " << density_2 /
- (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << " " << density_3 / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << endmsg;
+ msg(MSG::DEBUG) << "-> density : " << density / (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << " " << density_2 /
+ (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << " " << density_3 / (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << endmsg;
baseMaterials.push_back(matName1);
@@ -228,8 +229,8 @@ InDetMaterialManager::getMaterialInternal(const std::string& origMaterialName,
if (material) {
if (!compareDensity(material->getDensity(), density)) {
msg(MSG::WARNING) << "Density is not consistent for material " << newName2
- << " " << material->getDensity() / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3)
- << " / " << density / (GeoModelKernelUnits::gram / GeoModelKernelUnits::cm3) << endmsg;
+ << " " << material->getDensity() / (GeoModelKernelUnits::gram / Gaudi::Units::cm3)
+ << " / " << density / (GeoModelKernelUnits::gram / Gaudi::Units::cm3) << endmsg;
}
newMaterial = material;
} else {
@@ -311,7 +312,7 @@ InDetMaterialManager::addMaterial(GeoMaterial* material) {
m_store[name] = material;
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Created new material: " << name << ", " << material->getDensity() /
- (GeoModelKernelUnits::g / GeoModelKernelUnits::cm3) << " g/cm3" << endmsg;
+ (Gaudi::Units::g / Gaudi::Units::cm3) << " g/cm3" << endmsg;
}
}
@@ -496,8 +497,8 @@ InDetMaterialManager::getMaterialForVolume(const std::string& materialName, doub
<< materialName << ", "
<< materialBase << ", "
<< weight / GeoModelKernelUnits::gram << ", "
- << volume / GeoModelKernelUnits::cm3 << ", "
- << density / (GeoModelKernelUnits::g / GeoModelKernelUnits::cm3) << endmsg;
+ << volume / Gaudi::Units::cm3 << ", "
+ << density / (Gaudi::Units::g / Gaudi::Units::cm3) << endmsg;
}
if (materialBase.empty()) {
@@ -516,7 +517,7 @@ InDetMaterialManager::getMaterialForVolume(const std::string& materialName, doub
msg(MSG::VERBOSE)
<< "Material not in weight table, using standard material: "
<< materialName
- << ", volume(cm3) = " << volume / GeoModelKernelUnits::cm3
+ << ", volume(cm3) = " << volume / Gaudi::Units::cm3
<< endmsg;
return getMaterial(materialName);
}
@@ -586,7 +587,7 @@ InDetMaterialManager::getMaterialForVolumeLength(const std::string& materialName
msg(MSG::VERBOSE)
<< "Material not in weight table, using standard material: "
<< materialName
- << ", volume(cm3) = " << volume / GeoModelKernelUnits::cm3
+ << ", volume(cm3) = " << volume / Gaudi::Units::cm3
<< endmsg;
return getMaterial(materialName);
}
@@ -681,7 +682,7 @@ InDetMaterialManager::getMaterialForVolumeLength(const std::string& name,
msg(MSG::VERBOSE) << "Creating material from multiple components: " << name << endmsg;
for (unsigned int i = 0; i < materialComponents.size(); ++i) {
msg(MSG::VERBOSE) << " Component " << i << ": Name = " << baseMaterials[i]
- << " Weight(g) = " << fracWeight[i] / GeoModelKernelUnits::g << endmsg;
+ << " Weight(g) = " << fracWeight[i] / Gaudi::Units::g << endmsg;
}
}
@@ -799,7 +800,7 @@ InDetMaterialManager::addTextFileMaterials() {
// read in material table
for (unsigned int iMat = 0; iMat < db()->getTableSize(materialTable); iMat++) {
std::string materialName = db()->getString(materialTable, "NAME", iMat);
- double density = db()->getDouble(materialTable, "DENSITY", iMat) * GeoModelKernelUnits::g / GeoModelKernelUnits::cm3;
+ double density = db()->getDouble(materialTable, "DENSITY", iMat) * Gaudi::Units::g / Gaudi::Units::cm3;
materials[materialName] = MaterialDef(materialName, density);
}
@@ -899,7 +900,7 @@ InDetMaterialManager::createMaterial(const MaterialDef& material) {
// Now build the material
GeoMaterial* newMaterial = new GeoMaterial(material.name(), material.density());
if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Creating material: " << material.name()
- << " with density: " << material.density() / (GeoModelKernelUnits::g / GeoModelKernelUnits::cm3) <<
+ << " with density: " << material.density() / (Gaudi::Units::g / Gaudi::Units::cm3) <<
endmsg;
for (unsigned int i = 0; i < material.numComponents(); i++) {
double fracWeight = material.fraction(i) / totWeight;
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/PairIndexMap.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/PairIndexMap.cxx
index f751382680012ef5ff1b648bc5a68c3e47de4bde..3d230952e013886bce2d1532e2902091e4c6edb2 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/PairIndexMap.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/PairIndexMap.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/PairIndexMap.h"
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolume.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolume.cxx
index 55c9e70441e960b4a51497503116c761021ed0cd..f56e26a48c273b781bc33c24161f94a6b773cba9 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolume.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolume.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
//
@@ -86,7 +86,7 @@
#include "GeoModelKernel/GeoBox.h"
#include "GeoModelKernel/GeoTrap.h"
#include "GeoModelKernel/GeoShapeSubtraction.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include <string>
#include <iostream>
@@ -239,10 +239,10 @@ namespace InDetDD {
// Inner edge
GeoShape* shapeTmp2 = 0;
if (m_rmin == m_rmin2) {
- shapeTmp2 = new GeoTube(0, m_rmin, halflength + 0.1 * GeoModelKernelUnits::mm);
+ shapeTmp2 = new GeoTube(0, m_rmin, halflength + 0.1 * Gaudi::Units::mm);
volume -= 2 * M_PI * m_rmin * m_rmin * halflength;
} else {
- shapeTmp2 = new GeoCons(0, 0, m_rmin, m_rmin2, halflength + 0.1 * GeoModelKernelUnits::mm, 0, 2 * M_PI);
+ shapeTmp2 = new GeoCons(0, 0, m_rmin, m_rmin2, halflength + 0.1 * Gaudi::Units::mm, 0, 2 * M_PI);
volume -= 2 * M_PI * pow(0.5 * (m_rmin + m_rmin2), 2) * halflength;
}
serviceShape = &(shapeTmp1->subtract(*shapeTmp2));
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx
index 8e56a2b2ca2cf23a8a7be85305bfe7c833873aff..12d569b6028871cff0f25fd859bb8a7f976b40eb 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/ServiceVolumeMaker.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/ServiceVolumeMaker.h"
@@ -10,7 +10,7 @@
#include "RDBAccessSvc/IRDBRecordset.h"
#include "GeometryDBSvc/IGeometryDBSvc.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
namespace InDetDD {
ServiceVolumeSchema::ServiceVolumeSchema() {
@@ -97,56 +97,56 @@ namespace InDetDD {
double
ServiceVolumeMakerMgr::rmin(int index) const {
- return db()->getDouble(m_table, m_schema.rmin(), index) * GeoModelKernelUnits::mm;
+ return db()->getDouble(m_table, m_schema.rmin(), index) * Gaudi::Units::mm;
}
double
ServiceVolumeMakerMgr::rmax(int index) const {
- return db()->getDouble(m_table, m_schema.rmax(), index) * GeoModelKernelUnits::mm;
+ return db()->getDouble(m_table, m_schema.rmax(), index) * Gaudi::Units::mm;
}
double
ServiceVolumeMakerMgr::rmin2(int index) const {
- return db()->getDouble(m_table, m_schema.rmin2(), index) * GeoModelKernelUnits::mm;
+ return db()->getDouble(m_table, m_schema.rmin2(), index) * Gaudi::Units::mm;
}
double
ServiceVolumeMakerMgr::rmax2(int index) const {
- return db()->getDouble(m_table, m_schema.rmax2(), index) * GeoModelKernelUnits::mm;
+ return db()->getDouble(m_table, m_schema.rmax2(), index) * Gaudi::Units::mm;
}
double
ServiceVolumeMakerMgr::zmin(int index) const {
- return db()->getDouble(m_table, m_schema.zmin(), index) * GeoModelKernelUnits::mm;
+ return db()->getDouble(m_table, m_schema.zmin(), index) * Gaudi::Units::mm;
}
double
ServiceVolumeMakerMgr::zmax(int index) const {
- return db()->getDouble(m_table, m_schema.zmax(), index) * GeoModelKernelUnits::mm;
+ return db()->getDouble(m_table, m_schema.zmax(), index) * Gaudi::Units::mm;
}
double
ServiceVolumeMakerMgr::phiDelta(int index) const {
- return db()->getDouble(m_table, m_schema.phiDelta(), index) * GeoModelKernelUnits::deg;
+ return db()->getDouble(m_table, m_schema.phiDelta(), index) * Gaudi::Units::deg;
}
double
ServiceVolumeMakerMgr::width(int index) const {
if (m_schema.has_width()) {
- return db()->getDouble(m_table, m_schema.width(), index) * GeoModelKernelUnits::mm;
+ return db()->getDouble(m_table, m_schema.width(), index) * Gaudi::Units::mm;
}
return 0;
}
double
ServiceVolumeMakerMgr::phiStart(int index) const {
- return db()->getDouble(m_table, m_schema.phiStart(), index) * GeoModelKernelUnits::deg;
+ return db()->getDouble(m_table, m_schema.phiStart(), index) * Gaudi::Units::deg;
}
double
ServiceVolumeMakerMgr::phiStep(int index) const {
if (m_schema.has_phiStep()) {
- return db()->getDouble(m_table, m_schema.phiStep(), index) * GeoModelKernelUnits::deg;
+ return db()->getDouble(m_table, m_schema.phiStep(), index) * Gaudi::Units::deg;
}
return 0;
}
@@ -309,8 +309,8 @@ namespace InDetDD {
double phiDelta = m_mgr->phiDelta(ii);
bool fullPhiSector = false;
- if (phiDelta == 0 || phiDelta >= 359.9 * GeoModelKernelUnits::degree) {
- phiDelta = 360 * GeoModelKernelUnits::degree;
+ if (phiDelta == 0 || phiDelta >= 359.9 * Gaudi::Units::degree) {
+ phiDelta = 360 * Gaudi::Units::degree;
fullPhiSector = true;
}
//else {
@@ -340,7 +340,7 @@ namespace InDetDD {
double phiWidth = phiDelta;
if (shapeType == "CONS" || shapeType == "TUBS") {
- const double phiepsilon = 0.001 * GeoModelKernelUnits::degree;
+ const double phiepsilon = 0.001 * Gaudi::Units::degree;
phiWidth -= 2 * phiepsilon;
phiStart += phiepsilon;
}
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TopLevelPlacements.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TopLevelPlacements.cxx
index 8f8fce59eefee18d1359cfaf7be0e7bc37f5f488..c67422760ef78da239afd8055cb02051cb7a4263 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TopLevelPlacements.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TopLevelPlacements.cxx
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/TopLevelPlacements.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "RDBAccessSvc/IRDBRecordset.h"
#include "RDBAccessSvc/IRDBRecord.h"
#include <iostream>
@@ -59,12 +59,12 @@ TopLevelPlacements::fillPlacements(IRDBRecordset_ptr topLevelTable) {
GeoTrf::Transform3D
TopLevelPlacements::partTransform(const IRDBRecord* record) const {
- double posX = record->getDouble("POSX") * GeoModelKernelUnits::mm;
- double posY = record->getDouble("POSY") * GeoModelKernelUnits::mm;
- double posZ = record->getDouble("POSZ") * GeoModelKernelUnits::mm;
- double rotX = record->getDouble("ROTX") * GeoModelKernelUnits::degree;
- double rotY = record->getDouble("ROTY") * GeoModelKernelUnits::degree;
- double rotZ = record->getDouble("ROTZ") * GeoModelKernelUnits::degree;
+ double posX = record->getDouble("POSX") * Gaudi::Units::mm;
+ double posY = record->getDouble("POSY") * Gaudi::Units::mm;
+ double posZ = record->getDouble("POSZ") * Gaudi::Units::mm;
+ double rotX = record->getDouble("ROTX") * Gaudi::Units::degree;
+ double rotY = record->getDouble("ROTY") * Gaudi::Units::degree;
+ double rotZ = record->getDouble("ROTZ") * Gaudi::Units::degree;
int rotOrder = record->getInt("ROTORDER");
// Translation part
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TubeVolData.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TubeVolData.cxx
index 10e14267b979241d7bca3d8410a0b2758a30ad17..3d723183651d59472c4a8303befbbf8947467b35 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TubeVolData.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/TubeVolData.cxx
@@ -1,10 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/TubeVolData.h"
#include "RDBAccessSvc/IRDBRecord.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include <cmath>
#include <string>
@@ -36,7 +36,7 @@ namespace InDetDD {
m_length(0.),
m_zMid(0.) {
// add an 2*epsilon gap between phi sectors.
- const double phiepsilon = 0.001 * GeoModelKernelUnits::degree;
+ const double phiepsilon = 0.001 * Gaudi::Units::degree;
bool fullPhiSector = false;
@@ -45,14 +45,14 @@ namespace InDetDD {
// The rest are obtained directly from RDB.
if (m_record) {
- m_phiStart = m_record->getDouble("PHISTART") * GeoModelKernelUnits::degree;
- m_phiDelta = m_record->getDouble("PHIDELTA") * GeoModelKernelUnits::degree;
- m_phiStep = m_record->getDouble("PHISTEP") * GeoModelKernelUnits::degree;
+ m_phiStart = m_record->getDouble("PHISTART") * Gaudi::Units::degree;
+ m_phiDelta = m_record->getDouble("PHIDELTA") * Gaudi::Units::degree;
+ m_phiStep = m_record->getDouble("PHISTEP") * Gaudi::Units::degree;
m_nRepeat = m_record->getInt("NREPEAT");
- m_rmin1 = m_record->getDouble("RMIN") * GeoModelKernelUnits::mm;
- m_rmax1 = m_record->getDouble("RMAX") * GeoModelKernelUnits::mm;
- m_rmin2 = m_record->getDouble("RMIN2") * GeoModelKernelUnits::mm;
- m_rmax2 = m_record->getDouble("RMAX2") * GeoModelKernelUnits::mm;
+ m_rmin1 = m_record->getDouble("RMIN") * Gaudi::Units::mm;
+ m_rmax1 = m_record->getDouble("RMAX") * Gaudi::Units::mm;
+ m_rmin2 = m_record->getDouble("RMIN2") * Gaudi::Units::mm;
+ m_rmax2 = m_record->getDouble("RMAX2") * Gaudi::Units::mm;
m_radialDiv = 0;
if (!m_record->isFieldNull("RADIAL")) {
m_radialDiv = m_record->getInt("RADIAL");
@@ -62,13 +62,13 @@ namespace InDetDD {
m_bothZ = m_record->getInt("ZSYMM");
}
- double zmin = m_record->getDouble("ZMIN") * GeoModelKernelUnits::mm;
- double zmax = m_record->getDouble("ZMAX") * GeoModelKernelUnits::mm;
+ double zmin = m_record->getDouble("ZMIN") * Gaudi::Units::mm;
+ double zmax = m_record->getDouble("ZMAX") * Gaudi::Units::mm;
m_length = std::abs(zmax - zmin);
m_zMid = 0.5 * (zmin + zmax);
- if (m_phiDelta == 0 || m_phiDelta >= 359.9 * GeoModelKernelUnits::degree) {
- m_phiDelta = 360 * GeoModelKernelUnits::degree;
+ if (m_phiDelta == 0 || m_phiDelta >= 359.9 * Gaudi::Units::degree) {
+ m_phiDelta = 360 * Gaudi::Units::degree;
fullPhiSector = true;
} else {
m_phiDelta -= 2 * phiepsilon;
@@ -79,7 +79,7 @@ namespace InDetDD {
if (m_nRepeat <= 0) m_nRepeat = 1;
// if PHISTEP==0 then set it to be equi-distant steps filling up phi.
if (m_phiStep == 0) {
- m_phiStep = 360 * GeoModelKernelUnits::degree / m_nRepeat;
+ m_phiStep = 360 * Gaudi::Units::degree / m_nRepeat;
}
if (m_rmin2 <= 0) m_rmin2 = m_rmin1;
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx
index a8367990da379e724ffa50947ded197229194b35..af26ac0b1f7d0554fc95ab2b816340e4c18fe0e3 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/VolumeBuilder.h"
@@ -12,7 +12,7 @@
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoModelKernel/GeoTransform.h"
#include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
namespace InDetDD {
VolumeBuilder::VolumeBuilder(const Zone& zone, const std::vector<const ServiceVolume* >& services)
@@ -226,7 +226,7 @@ namespace InDetDD {
if (msgLvl(MSG::DEBUG)) {
msg(MSG::DEBUG) << "Volume/material: " << logName << "/" << materialName << endmsg;
if (!param.shapeType().empty()) msg(MSG::DEBUG) << " shape: " << param.shapeType() << endmsg;
- msg(MSG::DEBUG) << " volume (cm3): " << volume / GeoModelKernelUnits::cm3 << endmsg;
+ msg(MSG::DEBUG) << " volume (cm3): " << volume / Gaudi::Units::cm3 << endmsg;
msg(MSG::DEBUG) << " rmin,rmax,zmin,zmax: "
<< param.rmin() << ", "
<< param.rmax() << ", "
@@ -305,10 +305,10 @@ namespace InDetDD {
const std::string& shapeType = param.shapeType();
if (shapeType == "TRAP" || shapeType == "TRAP2") {
// Need to rotate by -90 deg.
- xform = GeoTrf::RotateZ3D(-90. * GeoModelKernelUnits::deg) * xform;
+ xform = GeoTrf::RotateZ3D(-90. * Gaudi::Units::deg) * xform;
}
if (shapeType == "TRAP2") {
- xform = GeoTrf::RotateZ3D(-90. * GeoModelKernelUnits::deg) * xform; // * GeoTrf::RotateX3D(-90.*GeoModelKernelUnits::deg);
+ xform = GeoTrf::RotateZ3D(-90. * Gaudi::Units::deg) * xform; // * GeoTrf::RotateX3D(-90.*Gaudi::Units::deg);
}
if (shapeType == "BOX" || shapeType == "TRAP" || shapeType == "TRAP2") {
double radius = 0.5 * (param.rmin() + param.rmax());
@@ -330,7 +330,7 @@ namespace InDetDD {
}
// For shapes that are not symmetric about a rotation around Y axis. We need to rotate.
if (rotateAroundY) {
- xform = GeoTrf::RotateY3D(180. * GeoModelKernelUnits::degree) * xform;
+ xform = GeoTrf::RotateY3D(180. * Gaudi::Units::degree) * xform;
}
return new GeoTransform(xform);
}
@@ -360,11 +360,11 @@ namespace InDetDD {
// BOX, ROD and TRAP need special treatment.
if (shapeType == "TRAP") {
// Need to rotate by -90 deg.
- xform = GeoTrf::RotateZ3D(-90. * GeoModelKernelUnits::deg) * xform;
+ xform = GeoTrf::RotateZ3D(-90. * Gaudi::Units::deg) * xform;
}
if (shapeType == "TRAP2") {
// Need to rotate by -90 deg.
- xform = GeoTrf::RotateX3D(-90. * GeoModelKernelUnits::deg) * xform;
+ xform = GeoTrf::RotateX3D(-90. * Gaudi::Units::deg) * xform;
}
if (shapeType == "BOX" || shapeType == "TRAP" || shapeType == "TRAP2") {
double radius = 0.5 * (param.rmin() + param.rmax()) - rCenter;
@@ -386,7 +386,7 @@ namespace InDetDD {
}
// For shapes that are not symmetric about a rotation around Y axis. We need to rotate.
if (rotateAroundY) {
- xform = GeoTrf::RotateY3D(180. * GeoModelKernelUnits::degree) * xform;
+ xform = GeoTrf::RotateY3D(180. * Gaudi::Units::degree) * xform;
}
return new GeoTransform(xform);
}
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitter.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitter.cxx
index d91cd6bbd7cf663fe3e0134ad5083c9f1fe6daf7..26586912aa588f568360818d8a2c0f02980f7877 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitter.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitter.cxx
@@ -1,11 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetGeoModelUtils/VolumeSplitter.h"
#include "InDetGeoModelUtils/VolumeSplitterUtils.h"
#include "InDetGeoModelUtils/ServiceVolume.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include <sstream>
#include <algorithm>
@@ -13,7 +13,7 @@
namespace InDetDD {
VolumeSplitter::VolumeSplitter()
: m_ownVolumes(true),
- m_epsilon(0.0001 * GeoModelKernelUnits::mm)
+ m_epsilon(0.0001 * Gaudi::Units::mm)
{}
VolumeSplitter::~VolumeSplitter() {
diff --git a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitterUtils.cxx b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitterUtils.cxx
index 4e0c4173df819b0f1475c2a6f4aac64620d48a18..5d89d3c9984c45b7cee60bf21cc675550b8c09b7 100755
--- a/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitterUtils.cxx
+++ b/InnerDetector/InDetDetDescr/InDetGeoModelUtils/src/VolumeSplitterUtils.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/