diff --git a/DDCore/include/DD4hep/AlignmentData.h b/DDCore/include/DD4hep/AlignmentData.h
index a0343a793d42768a894dc2a68d4d8fc2226ca9fe..0fc7c7ffa3d9ecefe062d1e898ab17df51dfb46e 100644
--- a/DDCore/include/DD4hep/AlignmentData.h
+++ b/DDCore/include/DD4hep/AlignmentData.h
@@ -14,12 +14,12 @@
#define DD4HEP_ALIGNMENTDATA_H
// Framework include files
-#include "DD4hep/NamedObject.h"
-#include "DD4hep/DetElement.h"
-#include "DD4hep/Volumes.h"
+#include <DD4hep/NamedObject.h>
+#include <DD4hep/DetElement.h>
+#include <DD4hep/Volumes.h>
// ROOT include files
-#include "TGeoMatrix.h"
+#include <TGeoMatrix.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/AlignmentTools.h b/DDCore/include/DD4hep/AlignmentTools.h
index dcbc694f2c235db47b19191104bb510d31eaf44c..6832ac7cbaa840320034ff98ae5a517787602f0c 100644
--- a/DDCore/include/DD4hep/AlignmentTools.h
+++ b/DDCore/include/DD4hep/AlignmentTools.h
@@ -14,7 +14,7 @@
#define DD4HEP_ALIGNMENTTOOLS_H
// Framework include files
-#include "DD4hep/Alignments.h"
+#include <DD4hep/Alignments.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/Alignments.h b/DDCore/include/DD4hep/Alignments.h
index 57c70f554e666a7134aabda8fb4f6dce95498e14..bd15fe2acc113b2c75126c5c627e98f4a4bfcfff 100644
--- a/DDCore/include/DD4hep/Alignments.h
+++ b/DDCore/include/DD4hep/Alignments.h
@@ -14,9 +14,9 @@
#define DD4HEP_ALIGNMENTS_H
// Framework include files
-#include "DD4hep/IOV.h"
-#include "DD4hep/Volumes.h"
-#include "DD4hep/Conditions.h"
+#include <DD4hep/IOV.h>
+#include <DD4hep/Volumes.h>
+#include <DD4hep/Conditions.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/AlignmentsCalculator.h b/DDCore/include/DD4hep/AlignmentsCalculator.h
index 7d6ab1bf6de42a6affc083ec46fbcd4d5a0cce6b..7a4361226bd57324b5cfc974707c49d80ad458a0 100644
--- a/DDCore/include/DD4hep/AlignmentsCalculator.h
+++ b/DDCore/include/DD4hep/AlignmentsCalculator.h
@@ -14,9 +14,9 @@
#define DD4HEP_ALIGNMENTSCALCULATOR_H
// Framework include files
-#include "DD4hep/Alignments.h"
-#include "DD4hep/AlignmentData.h"
-#include "DD4hep/ConditionsMap.h"
+#include <DD4hep/Alignments.h>
+#include <DD4hep/AlignmentData.h>
+#include <DD4hep/ConditionsMap.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/AlignmentsNominalMap.h b/DDCore/include/DD4hep/AlignmentsNominalMap.h
index d75141a249966c6ae1b8892986d07abf7c8618a9..bf6bf5091c0260b5cb5dc06689906e0f6bde2f72 100644
--- a/DDCore/include/DD4hep/AlignmentsNominalMap.h
+++ b/DDCore/include/DD4hep/AlignmentsNominalMap.h
@@ -14,7 +14,7 @@
#define DD4HEP_ALIGNMENTSNOMINALMAP_H
// Framework include files
-#include "DD4hep/ConditionsMap.h"
+#include <DD4hep/ConditionsMap.h>
// C/C++ include files
diff --git a/DDCore/include/DD4hep/AlignmentsPrinter.h b/DDCore/include/DD4hep/AlignmentsPrinter.h
index 9b8756538aea8e47859be2d0f576d995b17c7b73..6a0346d3fc40e30e1743fd7ea3dddc88097d2098 100644
--- a/DDCore/include/DD4hep/AlignmentsPrinter.h
+++ b/DDCore/include/DD4hep/AlignmentsPrinter.h
@@ -14,9 +14,9 @@
#define DD4HEP_ALIGNMENTSPRINTER_H
// Framework includes
-#include "DD4hep/Printout.h"
-#include "DD4hep/DetElement.h"
-#include "DD4hep/Alignments.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/DetElement.h>
+#include <DD4hep/Alignments.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/AlignmentsProcessor.h b/DDCore/include/DD4hep/AlignmentsProcessor.h
index 816f617d8b47ac7f53045011c8d9940a0d62c3c0..03e175abc571b8c655e10ea72f5b71dd8e95e9f2 100644
--- a/DDCore/include/DD4hep/AlignmentsProcessor.h
+++ b/DDCore/include/DD4hep/AlignmentsProcessor.h
@@ -14,10 +14,10 @@
#define DD4HEP_ALIGNMENTSPROCESSOR_H
// Framework includes
-#include "DD4hep/ConditionsMap.h"
-#include "DD4hep/AlignmentData.h"
-#include "DD4hep/Alignments.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/ConditionsMap.h>
+#include <DD4hep/AlignmentData.h>
+#include <DD4hep/Alignments.h>
+#include <DD4hep/Printout.h>
// C/C++ include files
#include <memory>
diff --git a/DDCore/include/DD4hep/Any.h b/DDCore/include/DD4hep/Any.h
index 569fff21e55acb745d5843670999c42a4f7dc587..255def7e46b79352f24799330fd333a964893743 100644
--- a/DDCore/include/DD4hep/Any.h
+++ b/DDCore/include/DD4hep/Any.h
@@ -25,7 +25,7 @@ namespace dd4hep {
#else
-#include "boost/any.hpp"
+#include <boost/any.hpp>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/CartesianGridXYZ.h b/DDCore/include/DD4hep/CartesianGridXYZ.h
index 19aa339e467746a56f0af3d4d490975b93466a2c..f4cec8dd0619a9f751904d81bd2679c45418324a 100644
--- a/DDCore/include/DD4hep/CartesianGridXYZ.h
+++ b/DDCore/include/DD4hep/CartesianGridXYZ.h
@@ -16,7 +16,7 @@
#define DD4HEP_CARTESIANGRIDXYZ_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/CartesianGridXZ.h b/DDCore/include/DD4hep/CartesianGridXZ.h
index 9dd585f9e1ebfdd88a77d630b98d9309c07110e2..da5941188d97db39468d5c22acc196a073e97baa 100644
--- a/DDCore/include/DD4hep/CartesianGridXZ.h
+++ b/DDCore/include/DD4hep/CartesianGridXZ.h
@@ -16,7 +16,7 @@
#define DD4HEP_CARTESIANGRIDXZ_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/CartesianGridYZ.h b/DDCore/include/DD4hep/CartesianGridYZ.h
index 727d6e02f9b495b3c69238c49ff84efb28f5deb5..1767b5fbe871a43efe94eb2030d3007b971eac16 100644
--- a/DDCore/include/DD4hep/CartesianGridYZ.h
+++ b/DDCore/include/DD4hep/CartesianGridYZ.h
@@ -16,7 +16,7 @@
#define DD4HEP_CARTESIANGRIDYZ_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/CartesianStripX.h b/DDCore/include/DD4hep/CartesianStripX.h
index 51630aec98afcc4047e4a62486738d7d235244c8..9e07ce6404189cd0bbca4c5726a260f5325be068 100644
--- a/DDCore/include/DD4hep/CartesianStripX.h
+++ b/DDCore/include/DD4hep/CartesianStripX.h
@@ -16,7 +16,7 @@
#define DD4HEP_CARTESIANSTRIPX_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/CartesianStripY.h b/DDCore/include/DD4hep/CartesianStripY.h
index c318052b4143a44f84402f44a430a0794d160cd2..9fade74b40f262666ebb8d3fcb7bf7ce2ed0ba0e 100644
--- a/DDCore/include/DD4hep/CartesianStripY.h
+++ b/DDCore/include/DD4hep/CartesianStripY.h
@@ -16,7 +16,7 @@
#define DD4HEP_CARTESIANSTRIPY_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/CartesianStripZ.h b/DDCore/include/DD4hep/CartesianStripZ.h
index 5dbcbb9d2e0c2b6db4f95d1c8fa96313aa889c53..e70e0ae842462f5580de8e65680ec27f95808e4d 100644
--- a/DDCore/include/DD4hep/CartesianStripZ.h
+++ b/DDCore/include/DD4hep/CartesianStripZ.h
@@ -16,13 +16,14 @@
#define DD4HEP_CARTESIANSTRIPZ_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
+
/// Namespace for base segmentations
namespace DDSegmentation {
-class CartesianStripZ;
+ class CartesianStripZ;
}
/// We need some abbreviation to make the code more readable.
diff --git a/DDCore/include/DD4hep/ConditionAny.h b/DDCore/include/DD4hep/ConditionAny.h
index d486bab6e9705d23e66aa3f50a90b02ebe15da8a..311467332d492a97115ddc17631a8ef65a8c1dfe 100644
--- a/DDCore/include/DD4hep/ConditionAny.h
+++ b/DDCore/include/DD4hep/ConditionAny.h
@@ -14,7 +14,7 @@
#define DD4HEP_CONDITIONANY_H
// Framework include files
-#include "DD4hep/Conditions.h"
+#include <DD4hep/Conditions.h>
// C/C++ include files
#include <any>
diff --git a/DDCore/include/DD4hep/ConditionDerived.h b/DDCore/include/DD4hep/ConditionDerived.h
index fda5de81aa869354ce39f6d0aaa2f9706ce596be..84921021004c94d7427cd534e10ace83fc7fad1a 100644
--- a/DDCore/include/DD4hep/ConditionDerived.h
+++ b/DDCore/include/DD4hep/ConditionDerived.h
@@ -14,9 +14,9 @@
#define DD4HEP_CONDITIONDERIVED_H
// Framework include files
-#include "DD4hep/Memory.h"
-#include "DD4hep/Conditions.h"
-#include "DD4hep/detail/ConditionsInterna.h"
+#include <DD4hep/Memory.h>
+#include <DD4hep/Conditions.h>
+#include <DD4hep/detail/ConditionsInterna.h>
// C/C++ include files
#include <memory>
diff --git a/DDCore/include/DD4hep/Conditions.h b/DDCore/include/DD4hep/Conditions.h
index bc9d77f0a5f8ebabcea66cace5a9de72fd4e43b4..16880169c370049c5efbae9c0a1779b46ae009a9 100644
--- a/DDCore/include/DD4hep/Conditions.h
+++ b/DDCore/include/DD4hep/Conditions.h
@@ -14,9 +14,9 @@
#define DD4HEP_CONDITIONS_H
// Framework include files
-#include "DD4hep/IOV.h"
-#include "DD4hep/Handle.h"
-#include "DD4hep/OpaqueData.h"
+#include <DD4hep/IOV.h>
+#include <DD4hep/Handle.h>
+#include <DD4hep/OpaqueData.h>
// C/C++ include files
#include <vector>
diff --git a/DDCore/include/DD4hep/ConditionsData.h b/DDCore/include/DD4hep/ConditionsData.h
index ce71128083c231fb6e201fcb051c7a571ea04522..06cf06fb106654beb9251460b423e0941d58fd1f 100644
--- a/DDCore/include/DD4hep/ConditionsData.h
+++ b/DDCore/include/DD4hep/ConditionsData.h
@@ -14,8 +14,8 @@
#define DD4HEP_CONDITIONSDATA_H
// Framework include files
-#include "DD4hep/Objects.h"
-#include "DD4hep/Conditions.h"
+#include <DD4hep/Objects.h>
+#include <DD4hep/Conditions.h>
// C/C++ include files
#include <vector>
diff --git a/DDCore/include/DD4hep/ConditionsDebug.h b/DDCore/include/DD4hep/ConditionsDebug.h
index 47c7cfbc452d165f88e1c83b7cb282d9f9b99d1e..bb8e234af3ad6f47b920050617a09f42ec44f8ef 100644
--- a/DDCore/include/DD4hep/ConditionsDebug.h
+++ b/DDCore/include/DD4hep/ConditionsDebug.h
@@ -14,7 +14,7 @@
#define DD4HEP_CONDITIONSDEBUG_H
// Framework include files
-#include "DD4hep/Conditions.h"
+#include <DD4hep/Conditions.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/ConditionsListener.h b/DDCore/include/DD4hep/ConditionsListener.h
index 8dea61956e77536c3327529cb6a4611816348692..9259253414f51cad1623d8e14439c3bf783e718e 100644
--- a/DDCore/include/DD4hep/ConditionsListener.h
+++ b/DDCore/include/DD4hep/ConditionsListener.h
@@ -14,7 +14,7 @@
#define DD4HEP_CONDITIONSLISTENER_H
// Framework include files
-#include "DD4hep/Conditions.h"
+#include <DD4hep/Conditions.h>
// C/C++ include files
diff --git a/DDCore/include/DD4hep/ConditionsMap.h b/DDCore/include/DD4hep/ConditionsMap.h
index 07be328a43fd6b5b498a5bd5c0a33f7541d2810e..a3133ef0b842a53667047f7f3fc72e35a4cb20e0 100644
--- a/DDCore/include/DD4hep/ConditionsMap.h
+++ b/DDCore/include/DD4hep/ConditionsMap.h
@@ -14,8 +14,8 @@
#define DD4HEP_CONDITIONSMAP_H
// Framework include files
-#include "DD4hep/Conditions.h"
-#include "DD4hep/DetElement.h"
+#include <DD4hep/Conditions.h>
+#include <DD4hep/DetElement.h>
// C/C++ include files
#include <map>
diff --git a/DDCore/include/DD4hep/ConditionsPrinter.h b/DDCore/include/DD4hep/ConditionsPrinter.h
index e0354dd4c1c184fdc0a71d17312019ed83814438..37f58f97932fd278d1292536da80d32b1753c18c 100644
--- a/DDCore/include/DD4hep/ConditionsPrinter.h
+++ b/DDCore/include/DD4hep/ConditionsPrinter.h
@@ -14,9 +14,9 @@
#define DD4HEP_CONDITIONSPRINTER_H
// Framework includes
-#include "DD4hep/Printout.h"
-#include "DD4hep/DetElement.h"
-#include "DD4hep/Conditions.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/DetElement.h>
+#include <DD4hep/Conditions.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/ConditionsProcessor.h b/DDCore/include/DD4hep/ConditionsProcessor.h
index 886c1a23a0a726b88896afd5c26f44fd7f1fe760..235f8c1ed77ede75955448ff0fc9eb9b63da4fd7 100644
--- a/DDCore/include/DD4hep/ConditionsProcessor.h
+++ b/DDCore/include/DD4hep/ConditionsProcessor.h
@@ -14,9 +14,9 @@
#define DD4HEP_CONDITIONSPROCESSOR_H
// Framework include files
-#include "DD4hep/DetElement.h"
-#include "DD4hep/Conditions.h"
-#include "DD4hep/ConditionsMap.h"
+#include <DD4hep/DetElement.h>
+#include <DD4hep/Conditions.h>
+#include <DD4hep/ConditionsMap.h>
// C/C++ include files
#include <memory>
diff --git a/DDCore/include/DD4hep/DD4hepUI.h b/DDCore/include/DD4hep/DD4hepUI.h
index efafc0cadccf175964a802cce4642c1e1c4dba80..c73c0ffa06c4c9f6246c23400499cb0f3efe2538 100644
--- a/DDCore/include/DD4hep/DD4hepUI.h
+++ b/DDCore/include/DD4hep/DD4hepUI.h
@@ -14,8 +14,8 @@
#define DD4HEP_DD4HEPUI_H
// Framework includes
-#include "DD4hep/Detector.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/Printout.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/DD4hepUnits.h b/DDCore/include/DD4hep/DD4hepUnits.h
index 33ba705b653085be8d6d68c335491d6db47d7616..33617654fb6ce8366f82533599ff1853aff5e028 100644
--- a/DDCore/include/DD4hep/DD4hepUnits.h
+++ b/DDCore/include/DD4hep/DD4hepUnits.h
@@ -1,6 +1,20 @@
+//==========================================================================
+// 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 Markus Frank, David Blyth
+// \date 2018-02-20
+// \version 1.0
+//
+//==========================================================================
#ifndef DD4HEP_DD4HEPUNITS_H
#define DD4HEP_DD4HEPUNITS_H
-#include "Evaluator/DD4hepUnits.h"
+#include <Evaluator/DD4hepUnits.h>
#endif
diff --git a/DDCore/include/DD4hep/DetElement.h b/DDCore/include/DD4hep/DetElement.h
index 5e42cde9eb603c8c0af09854c61dbef583524ab7..2e913aaa7b4d85b52aabc72132fd821cbe773589 100644
--- a/DDCore/include/DD4hep/DetElement.h
+++ b/DDCore/include/DD4hep/DetElement.h
@@ -14,14 +14,14 @@
#define DD4HEP_DETELEMENT_H
// Framework include files
-#include "DD4hep/Handle.h"
-#include "DD4hep/Callback.h"
-#include "DD4hep/Objects.h"
-#include "DD4hep/Volumes.h"
-#include "DD4hep/Readout.h"
-#include "DD4hep/Alignments.h"
-#include "DD4hep/Segmentations.h"
-#include "DD4hep/ObjectExtensions.h"
+#include <DD4hep/Handle.h>
+#include <DD4hep/Callback.h>
+#include <DD4hep/Objects.h>
+#include <DD4hep/Volumes.h>
+#include <DD4hep/Readout.h>
+#include <DD4hep/Alignments.h>
+#include <DD4hep/Segmentations.h>
+#include <DD4hep/ObjectExtensions.h>
// C/C++ include files
#include <map>
@@ -463,6 +463,6 @@ namespace dd4hep {
};
} /* End namespace dd4hep */
-#include "DD4hep/AlignmentData.h"
+#include <DD4hep/AlignmentData.h>
#endif // DD4HEP_DETELEMENT_H
diff --git a/DDCore/include/DD4hep/DetectorData.h b/DDCore/include/DD4hep/DetectorData.h
index 06c3db6b4b40e9ff7441f25917ef1321f1154d25..ae39b33ffc2723a26d3876732603c18736081ac1 100644
--- a/DDCore/include/DD4hep/DetectorData.h
+++ b/DDCore/include/DD4hep/DetectorData.h
@@ -15,10 +15,10 @@
#define DD4HEP_DETECTORDATA_H
// Framework includes
-#include "DD4hep/Printout.h"
-#include "DD4hep/Detector.h"
-#include "DD4hep/ObjectExtensions.h"
-#include "DD4hep/detail/VolumeManagerInterna.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/Detector.h>
+#include <DD4hep/ObjectExtensions.h>
+#include <DD4hep/detail/VolumeManagerInterna.h>
// C/C++ include files
#include <stdexcept>
diff --git a/DDCore/include/DD4hep/DetectorHelper.h b/DDCore/include/DD4hep/DetectorHelper.h
index 8efe0836d1339322d88ad42e3a2551befcfce9c0..8bbab16249e3b88e9b9bd71a99a35d44c87147f8 100644
--- a/DDCore/include/DD4hep/DetectorHelper.h
+++ b/DDCore/include/DD4hep/DetectorHelper.h
@@ -14,7 +14,7 @@
#ifndef DD4HEP_DETECTORHELPER_H
#define DD4HEP_DETECTORHELPER_H
-#include "DD4hep/Detector.h"
+#include <DD4hep/Detector.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/DetectorImp.h b/DDCore/include/DD4hep/DetectorImp.h
index 37dae4c5f480f3de0a585a3310bbf6393b0908bf..982b19d3d9ae39362bd4ab471648c736b50eaf78 100644
--- a/DDCore/include/DD4hep/DetectorImp.h
+++ b/DDCore/include/DD4hep/DetectorImp.h
@@ -28,9 +28,9 @@
#endif
// Framework include files
-#include "DD4hep/DetectorData.h"
-#include "DD4hep/DetectorLoad.h"
-#include "TNamed.h"
+#include <DD4hep/DetectorData.h>
+#include <DD4hep/DetectorLoad.h>
+#include <TNamed.h>
// Forward declarations
class TGeoManager;
diff --git a/DDCore/include/DD4hep/DetectorLoad.h b/DDCore/include/DD4hep/DetectorLoad.h
index fb6205019b1418bb099899533b4a669b59037a4d..54efeafbbbe6fad1b4f3a5e3c80a5aea6be18c3e 100644
--- a/DDCore/include/DD4hep/DetectorLoad.h
+++ b/DDCore/include/DD4hep/DetectorLoad.h
@@ -14,7 +14,7 @@
#define DD4HEP_DETECTORLOAD_H
// Framework includes
-#include "DD4hep/Detector.h"
+#include <DD4hep/Detector.h>
// C/C++ include files
#include <stdexcept>
diff --git a/DDCore/include/DD4hep/DetectorProcessor.h b/DDCore/include/DD4hep/DetectorProcessor.h
index 2b693ba4392032f4e3131cd7844d4fdc61814781..2c1503317f4914498ed01f12ac6cc4029eddd318 100644
--- a/DDCore/include/DD4hep/DetectorProcessor.h
+++ b/DDCore/include/DD4hep/DetectorProcessor.h
@@ -14,7 +14,7 @@
#define DD4HEP_DETECTORPROCESSOR_H
// Framework includes
-#include "DD4hep/DetElement.h"
+#include <DD4hep/DetElement.h>
// C/C++ include files
#include <memory>
diff --git a/DDCore/include/DD4hep/DetectorSelector.h b/DDCore/include/DD4hep/DetectorSelector.h
index 103008ef52b34533b2aa3ecc5b5682d4789f224a..55ea5a0c8e97d6fe0301f431cdcb1a4c369b5222 100644
--- a/DDCore/include/DD4hep/DetectorSelector.h
+++ b/DDCore/include/DD4hep/DetectorSelector.h
@@ -15,7 +15,7 @@
#define DD4HEP_DETECTORSELECTOR_H
// Framework include files
-#include "DD4hep/Detector.h"
+#include <DD4hep/Detector.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/DetectorTools.h b/DDCore/include/DD4hep/DetectorTools.h
index bdf6670a41f59068a5bd83a7a4d2aad750443fe8..e3c5fc50a77e4969372c8f67baaf67f71e67b279 100644
--- a/DDCore/include/DD4hep/DetectorTools.h
+++ b/DDCore/include/DD4hep/DetectorTools.h
@@ -14,7 +14,7 @@
#define DD4HEP_DETECTORTOOLS_H
// Framework include files
-#include "DD4hep/DetElement.h"
+#include <DD4hep/DetElement.h>
// Forward declarations
class TGeoHMatrix;
diff --git a/DDCore/include/DD4hep/Exceptions.h b/DDCore/include/DD4hep/Exceptions.h
index c983bae5917d4ed459566d27cdfac567b25399ee..428ce28189ffd6be53f127a382acc30cd3296913 100644
--- a/DDCore/include/DD4hep/Exceptions.h
+++ b/DDCore/include/DD4hep/Exceptions.h
@@ -17,8 +17,8 @@
// Forward declaring header for package configuration
-#include "DD4hep/config.h"
-#include "Parsers/Exceptions.h"
+#include <DD4hep/config.h>
+#include <Parsers/Exceptions.h>
#endif // DD4HEP_EXCEPTIONS_H
diff --git a/DDCore/include/DD4hep/ExtensionEntry.h b/DDCore/include/DD4hep/ExtensionEntry.h
index 98c3645c960b9e166e8e09f6f90924fd8e50fc39..07b00ba10b2040242a2e294a1b46561ee219a202 100644
--- a/DDCore/include/DD4hep/ExtensionEntry.h
+++ b/DDCore/include/DD4hep/ExtensionEntry.h
@@ -21,7 +21,8 @@
#ifndef DD4HEP_EXTENSIONENTRY_H
#define DD4HEP_EXTENSIONENTRY_H
-#include "DD4hep/Primitives.h"
+// Framework include files
+#include <DD4hep/Primitives.h>
// C/C++ include files
#include <typeinfo>
diff --git a/DDCore/include/DD4hep/FieldTypes.h b/DDCore/include/DD4hep/FieldTypes.h
index 01b74f1e6c26c28eff3fc915c10f2cf522cbc999..b689881c03b41ce76b2a6583edb5e1ca0b0c6132 100644
--- a/DDCore/include/DD4hep/FieldTypes.h
+++ b/DDCore/include/DD4hep/FieldTypes.h
@@ -14,8 +14,10 @@
#define DD4HEP_FIELDTYPES_H
// Framework include files
-#include "DD4hep/Fields.h"
-#include "DD4hep/Shapes.h"
+#include <DD4hep/Fields.h>
+#include <DD4hep/Shapes.h>
+
+// C/C++ include files
#include <vector>
/// Namespace for the AIDA detector description toolkit
diff --git a/DDCore/include/DD4hep/Fields.h b/DDCore/include/DD4hep/Fields.h
index 0a0d505c715bf578c8f2ba2f5c9c151f86dbba8b..e001fed900f2ec058f58107a7348b06e787a472a 100644
--- a/DDCore/include/DD4hep/Fields.h
+++ b/DDCore/include/DD4hep/Fields.h
@@ -14,8 +14,8 @@
#define DD4HEP_FIELDS_H
// Framework include files
-#include "DD4hep/NamedObject.h"
-#include "DD4hep/Objects.h"
+#include <DD4hep/NamedObject.h>
+#include <DD4hep/Objects.h>
// C/C++ include files
#include <vector>
diff --git a/DDCore/include/DD4hep/GeoHandler.h b/DDCore/include/DD4hep/GeoHandler.h
index 976ecbd9690a77873267ff9a899849b73d3636a4..3674b4ea38e0a705a1018de01b5b9640d01781ba 100644
--- a/DDCore/include/DD4hep/GeoHandler.h
+++ b/DDCore/include/DD4hep/GeoHandler.h
@@ -13,7 +13,10 @@
#ifndef DD4HEP_GEOHANDLER_H
#define DD4HEP_GEOHANDLER_H
-#include "DD4hep/Detector.h"
+/// Framework include files
+#include <DD4hep/Detector.h>
+
+/// C/C++ include files
#include <set>
#include <map>
#include <vector>
diff --git a/DDCore/include/DD4hep/GlobalAlignment.h b/DDCore/include/DD4hep/GlobalAlignment.h
index 41655bac1399cf55d9398dcf9b0d6f5c4d65fe61..ca369f94a6ba8c092948dc68fc3abc98b4038248 100644
--- a/DDCore/include/DD4hep/GlobalAlignment.h
+++ b/DDCore/include/DD4hep/GlobalAlignment.h
@@ -14,10 +14,10 @@
#define DD4HEP_GLOBALALIGNMENT_H
// Framework include files
-#include "DD4hep/Objects.h"
-#include "DD4hep/Volumes.h"
-#include "DD4hep/Alignments.h"
-#include "TGeoPhysicalNode.h"
+#include <DD4hep/Objects.h>
+#include <DD4hep/Volumes.h>
+#include <DD4hep/Alignments.h>
+#include <TGeoPhysicalNode.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/Grammar.h b/DDCore/include/DD4hep/Grammar.h
index f60bae044977111e823913af5ef9859d18a10d65..616c167d89f87b9050807d46248674f13bac3bf1 100644
--- a/DDCore/include/DD4hep/Grammar.h
+++ b/DDCore/include/DD4hep/Grammar.h
@@ -22,8 +22,8 @@
#define DD4HEP_GRAMMAR_H
// Framework include files
-#include "DD4hep/config.h"
-#include "DD4hep/Primitives.h"
+#include <DD4hep/config.h>
+#include <DD4hep/Primitives.h>
// C/C++ include files
#include <string>
diff --git a/DDCore/include/DD4hep/GrammarUnparsed.h b/DDCore/include/DD4hep/GrammarUnparsed.h
index aa0a53362d184f40dc7e1170d8b8c2530767cc4e..20d89dd4bb05a572896bdde26e243ce9cfbb66bd 100644
--- a/DDCore/include/DD4hep/GrammarUnparsed.h
+++ b/DDCore/include/DD4hep/GrammarUnparsed.h
@@ -26,7 +26,7 @@
#endif
// Framework include files
-#include "DD4hep/Grammar.h"
+#include <DD4hep/Grammar.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/GridPhiEta.h b/DDCore/include/DD4hep/GridPhiEta.h
index 67dab0f7bd1c600c8313fbe910b33b63a61a30c3..054301da2e41393fc822b8e15e6864fb27d08da5 100644
--- a/DDCore/include/DD4hep/GridPhiEta.h
+++ b/DDCore/include/DD4hep/GridPhiEta.h
@@ -16,8 +16,8 @@
#define DD4HEP_GRIDPHIETA_H 1
// Framework includes
-#include "DDSegmentation/GridPhiEta.h"
-#include "DD4hep/Segmentations.h"
+#include <DDSegmentation/GridPhiEta.h>
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/GridRPhiEta.h b/DDCore/include/DD4hep/GridRPhiEta.h
index c081bec79f22c592e0f282b45eccfc770d2bf601..cbcc5b3b3b614d4dde651e84d1f1883abbfaca97 100644
--- a/DDCore/include/DD4hep/GridRPhiEta.h
+++ b/DDCore/include/DD4hep/GridRPhiEta.h
@@ -16,8 +16,8 @@
#define DD4HEP_GRIDRPHIETA_H 1
// Framework includes
-#include "DD4hep/Segmentations.h"
-#include "DDSegmentation/GridRPhiEta.h"
+#include <DD4hep/Segmentations.h>
+#include <DDSegmentation/GridRPhiEta.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/Handle.h b/DDCore/include/DD4hep/Handle.h
index 8dfdbce70bfdc938dedf11dbe9fd1490f3291ff8..ed3791103e106629be123b2ead0e5217537a6097 100644
--- a/DDCore/include/DD4hep/Handle.h
+++ b/DDCore/include/DD4hep/Handle.h
@@ -14,7 +14,7 @@
#define DD4HEP_HANDLE_H
// Framework include files
-#include "DD4hep/Primitives.h"
+#include <DD4hep/Primitives.h>
#include <string>
#include <typeinfo>
diff --git a/DDCore/include/DD4hep/IDDescriptor.h b/DDCore/include/DD4hep/IDDescriptor.h
index 2e33c80c16da4945b4e6d10fae1884364833e05c..68211da5448ae390ca1ad07355e41307ef32e632 100644
--- a/DDCore/include/DD4hep/IDDescriptor.h
+++ b/DDCore/include/DD4hep/IDDescriptor.h
@@ -14,8 +14,8 @@
#define DD4HEP_IDDESCRIPTOR_H
// Framework include files
-#include "DD4hep/Handle.h"
-#include "DD4hep/BitFieldCoder.h"
+#include <DD4hep/Handle.h>
+#include <DD4hep/BitFieldCoder.h>
// C++ include files
#include <string>
diff --git a/DDCore/include/DD4hep/MatrixHelpers.h b/DDCore/include/DD4hep/MatrixHelpers.h
index 71282fb3930f766be17b28a75eb53b21b833cf24..49748809f93881c150d4c7562044c73632c0de98 100644
--- a/DDCore/include/DD4hep/MatrixHelpers.h
+++ b/DDCore/include/DD4hep/MatrixHelpers.h
@@ -14,7 +14,7 @@
#define DD4HEP_MATRIXHELPERS_H
// Framework include files
-#include "DD4hep/Objects.h"
+#include <DD4hep/Objects.h>
// Forward declarations
class TGeoTranslation;
diff --git a/DDCore/include/DD4hep/Memory.h b/DDCore/include/DD4hep/Memory.h
index f8ac6671f223addee2c89907b9e075f07bbc6058..275c7cb77b6f0e577c0c5702463c90c1e0d86ed4 100644
--- a/DDCore/include/DD4hep/Memory.h
+++ b/DDCore/include/DD4hep/Memory.h
@@ -15,7 +15,7 @@
#define DD4HEP_MEMORY_H
// Framework include files
-#include "RVersion.h"
+#include <RVersion.h>
#ifdef __GNUC__
#pragma GCC diagnostic push
diff --git a/DDCore/include/DD4hep/MultiSegmentation.h b/DDCore/include/DD4hep/MultiSegmentation.h
index f562a7cc4b42674cf6f2ad6e6a69ea1beb88de0c..92bb6fb91f556d0a2fdd19d707eb416ca69d1dcc 100644
--- a/DDCore/include/DD4hep/MultiSegmentation.h
+++ b/DDCore/include/DD4hep/MultiSegmentation.h
@@ -16,8 +16,8 @@
#define DD4HEP_MULTISEGMENTATION_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
-#include "DDSegmentation/MultiSegmentation.h"
+#include <DD4hep/Segmentations.h>
+#include <DDSegmentation/MultiSegmentation.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/NoSegmentation.h b/DDCore/include/DD4hep/NoSegmentation.h
index 54cb8f6a7fe570546a240bde410337ff0d6ecaea..50802e0db7e6bd1b8d49b2ca8ef8e4f18284d0c7 100644
--- a/DDCore/include/DD4hep/NoSegmentation.h
+++ b/DDCore/include/DD4hep/NoSegmentation.h
@@ -16,7 +16,7 @@
#define DD4HEP_NOSEGMENTATION_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/ObjectExtensions.h b/DDCore/include/DD4hep/ObjectExtensions.h
index 70b54a19e131edc35988baa6e810fe73be585a03..2042c1066a0be2c1d2f2a8417d6dc85fcaf5fa2a 100644
--- a/DDCore/include/DD4hep/ObjectExtensions.h
+++ b/DDCore/include/DD4hep/ObjectExtensions.h
@@ -14,7 +14,7 @@
#define DD4HEP_OBJECTEXTENSIONS_H
// Framework include files
-#include "DD4hep/ExtensionEntry.h"
+#include <DD4hep/ExtensionEntry.h>
// C/C++ include files
#include <map>
diff --git a/DDCore/include/DD4hep/OpaqueData.h b/DDCore/include/DD4hep/OpaqueData.h
index ad19ca0a97ae9b8a0c6443639bf57c6debdbab61..b386b513a2920dfaed73b7fdd61c556d192f6db5 100644
--- a/DDCore/include/DD4hep/OpaqueData.h
+++ b/DDCore/include/DD4hep/OpaqueData.h
@@ -14,7 +14,7 @@
#define DD4HEP_OPAQUEDATA_H
// Framework include files
-#include "DD4hep/Grammar.h"
+#include <DD4hep/Grammar.h>
// C/C++ include files
#include <typeinfo>
diff --git a/DDCore/include/DD4hep/OpaqueDataBinder.h b/DDCore/include/DD4hep/OpaqueDataBinder.h
index 8a647ead68bfd826bc88b1572fe92d82479d44e9..3ed052fc6cae41f9d69b7509f84c77eb5439eac5 100644
--- a/DDCore/include/DD4hep/OpaqueDataBinder.h
+++ b/DDCore/include/DD4hep/OpaqueDataBinder.h
@@ -14,7 +14,7 @@
#define DD4HEP_OPAQUEDATABINDER_H
// Framework include files
-#include "DD4hep/Printout.h"
+#include <DD4hep/Printout.h>
// C/C++ include files
#include <string>
diff --git a/DDCore/include/DD4hep/PolarGridRPhi.h b/DDCore/include/DD4hep/PolarGridRPhi.h
index addc7ab99378f81f61b7e290f630c6a2b7cf31ff..7a2a519e8f8a34aef8fdd79a21eb0d10587bca09 100644
--- a/DDCore/include/DD4hep/PolarGridRPhi.h
+++ b/DDCore/include/DD4hep/PolarGridRPhi.h
@@ -16,7 +16,7 @@
#define DD4HEP_POLARGRIDRPHI_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/PolarGridRPhi2.h b/DDCore/include/DD4hep/PolarGridRPhi2.h
index 9b29bdbd51a196483ac1de49e2f0639943f2ef49..e14cc99ba3f1f585c645132ed9bbffc9720a56e5 100644
--- a/DDCore/include/DD4hep/PolarGridRPhi2.h
+++ b/DDCore/include/DD4hep/PolarGridRPhi2.h
@@ -16,7 +16,7 @@
#define DD4HEP_POLARGRIDRPHI2_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/Primitives.h b/DDCore/include/DD4hep/Primitives.h
index beb50ec13369a9aa12d860fb0273ad9b0c2a289e..6706f549d2737d7e7f6d6867f134554fc77ab84d 100644
--- a/DDCore/include/DD4hep/Primitives.h
+++ b/DDCore/include/DD4hep/Primitives.h
@@ -17,7 +17,7 @@
// Forward declaring header for package configuration
-#include "DD4hep/config.h"
-#include "Parsers/Primitives.h"
+#include <DD4hep/config.h>
+#include <Parsers/Primitives.h>
#endif // DD4HEP_PRIMITIVES_H
diff --git a/DDCore/include/DD4hep/Printout.h b/DDCore/include/DD4hep/Printout.h
index 2aabd71e9ef471bf44056ea58575a2927e77afc9..6c32b827bf8e61892aa65d3841104e6fbe9342c8 100644
--- a/DDCore/include/DD4hep/Printout.h
+++ b/DDCore/include/DD4hep/Printout.h
@@ -17,7 +17,7 @@
// Forward declaring header for package configuration
-#include "DD4hep/config.h"
-#include "Parsers/Printout.h"
+#include <DD4hep/config.h>
+#include <Parsers/Printout.h>
#endif // DD4HEP_PRINTOUT_H
diff --git a/DDCore/include/DD4hep/Readout.h b/DDCore/include/DD4hep/Readout.h
index 75030fc08931da17952aaf3e2c70282db59f95bf..5595bcf9e5b46373378fecbea702d26a521ae8a8 100644
--- a/DDCore/include/DD4hep/Readout.h
+++ b/DDCore/include/DD4hep/Readout.h
@@ -14,9 +14,9 @@
#define DD4HEP_READOUT_H
// Framework include files
-#include "DD4hep/Handle.h"
-#include "DD4hep/IDDescriptor.h"
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Handle.h>
+#include <DD4hep/IDDescriptor.h>
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/SurfaceInstaller.h b/DDCore/include/DD4hep/SurfaceInstaller.h
index 39ec553e3344e9998fd045a07a4781ba4ae0fbd2..f2d9c53c7c88a7c6219cb4c6a2c59ae6b8a55805 100644
--- a/DDCore/include/DD4hep/SurfaceInstaller.h
+++ b/DDCore/include/DD4hep/SurfaceInstaller.h
@@ -14,9 +14,9 @@
#define DD4HEP_SURFACEINSTALLER_H 1
// Framework include files
-#include "DD4hep/Detector.h"
-#include "DD4hep/DetectorTools.h"
-#include "DD4hep/DetFactoryHelper.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/DetectorTools.h>
+#include <DD4hep/DetFactoryHelper.h>
// C/C++ include files
#include <map>
@@ -116,8 +116,8 @@ namespace dd4hep {
#if defined(DD4HEP_USE_SURFACEINSTALL_HELPER)
-#include "DDRec/Surface.h"
-#include "DDRec/DetectorData.h"
+#include <DDRec/Surface.h>
+#include <DDRec/DetectorData.h>
#ifndef SURFACEINSTALLER_DATA
typedef void* SURFACEINSTALLER_DATA;
diff --git a/DDCore/include/DD4hep/TGeoUnits.h b/DDCore/include/DD4hep/TGeoUnits.h
deleted file mode 100644
index e11e79f67257aee63b904d2eb552bf6e32f37d83..0000000000000000000000000000000000000000
--- a/DDCore/include/DD4hep/TGeoUnits.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// OSOLETE
-// use dd4hepUnits and dd4hep:: instead
-
-#ifndef DD4HEP_TGEOUNITS_H
-#define DD4HEP_TGEOUNITS_H
-
-
-// Uncomment for backward compatibility
-//#define USE_TGEOUNITS_H
-
-#ifdef USE_TGEOUNITS_H
-#include "DD4hepUnits.h"
-
-namesapce tgeo{
- using dd4hep ;
-}
-
-#endif
-
-#endif // DD4HEP_TGEOUNITS_H
diff --git a/DDCore/include/DD4hep/VolumeProcessor.h b/DDCore/include/DD4hep/VolumeProcessor.h
index 73901a18dc410c7847e45cacb3c3085d2193f9c9..ade06eeaa6076259cfd547a51913954dabb92c2c 100644
--- a/DDCore/include/DD4hep/VolumeProcessor.h
+++ b/DDCore/include/DD4hep/VolumeProcessor.h
@@ -14,8 +14,8 @@
#define DD4HEP_VOLUMEPROCESSOR_H
// Framework includes
-#include "DD4hep/DetElement.h"
-#include "DD4hep/Volumes.h"
+#include <DD4hep/DetElement.h>
+#include <DD4hep/Volumes.h>
// C/C++ include files
#include <memory>
diff --git a/DDCore/include/DD4hep/WaferGridXY.h b/DDCore/include/DD4hep/WaferGridXY.h
index 38ad1930b3dfa140c32f5029509fa1c5ec53948e..593f4c0e7604e18d1b4ab8a8e864c483ef00504b 100644
--- a/DDCore/include/DD4hep/WaferGridXY.h
+++ b/DDCore/include/DD4hep/WaferGridXY.h
@@ -16,7 +16,7 @@
#define DD4HEP_WAFERGRIDXY_H 1
// Framework include files
-#include "DD4hep/Segmentations.h"
+#include <DD4hep/Segmentations.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/World.h b/DDCore/include/DD4hep/World.h
index f73ceae5bf6ef48f0a921c6c230eaf06ed43d8a6..13e4ad3d64444ac9a921294fec99b4dddd9abdf9 100644
--- a/DDCore/include/DD4hep/World.h
+++ b/DDCore/include/DD4hep/World.h
@@ -14,7 +14,7 @@
#define DD4HEP_WORLD_H
// Framework include files
-#include "DD4hep/DetElement.h"
+#include <DD4hep/DetElement.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DD4hep/detail/Handle.inl b/DDCore/include/DD4hep/detail/Handle.inl
index 13beb937043cca62f9254238a1f6e915e9eec1c1..5c965408bfcf8350dd313db5c058445dd868f240 100644
--- a/DDCore/include/DD4hep/detail/Handle.inl
+++ b/DDCore/include/DD4hep/detail/Handle.inl
@@ -12,7 +12,7 @@
//==========================================================================
// Framework include files
-#include "DD4hep/Handle.h"
+#include <DD4hep/Handle.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DDSegmentation/BitField64.h b/DDCore/include/DDSegmentation/BitField64.h
index 4b2895a549c8b6cf67e2f0deecbefd8357c36ff5..7db377c31f70ea48e3b8ef9b1eaf6fc411111c6c 100644
--- a/DDCore/include/DDSegmentation/BitField64.h
+++ b/DDCore/include/DDSegmentation/BitField64.h
@@ -19,7 +19,7 @@
#include <map>
#include <sstream>
-#include "DDSegmentation/BitFieldCoder.h"
+#include <DDSegmentation/BitFieldCoder.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/DDSegmentation/CartesianGrid.h b/DDCore/include/DDSegmentation/CartesianGrid.h
index be3d98c8d2bcc5e0d017f534002b59aee3112d62..1a6b14c1cf9c7999bbe1e4154703df3035957793 100644
--- a/DDCore/include/DDSegmentation/CartesianGrid.h
+++ b/DDCore/include/DDSegmentation/CartesianGrid.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_CARTESIANGRID_H
#define DDSEGMENTATION_CARTESIANGRID_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianGridXY.h b/DDCore/include/DDSegmentation/CartesianGridXY.h
index 28fef97183a8e36244a990ba0deb77724030fadd..2ae5dcb56999a5144ddabe5e43ceba94496eb77a 100644
--- a/DDCore/include/DDSegmentation/CartesianGridXY.h
+++ b/DDCore/include/DDSegmentation/CartesianGridXY.h
@@ -8,10 +8,6 @@
// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
//==========================================================================
-
-
-
-
/*
* CartesianGridXY.h
*
@@ -22,7 +18,7 @@
#ifndef DDSEGMENTATION_CARTESIANGRIDXY_H
#define DDSEGMENTATION_CARTESIANGRIDXY_H
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianGridXYStaggered.h b/DDCore/include/DDSegmentation/CartesianGridXYStaggered.h
index 441026adfba77bd5028ff6317e65223d031e2a9e..381f4bbe6ee387692102d3acabbd0e37c25fe237 100644
--- a/DDCore/include/DDSegmentation/CartesianGridXYStaggered.h
+++ b/DDCore/include/DDSegmentation/CartesianGridXYStaggered.h
@@ -8,10 +8,6 @@
// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
//==========================================================================
-
-
-
-
/*
* CartesianGridXYStaggered.h
*
@@ -22,7 +18,7 @@
#ifndef DDSEGMENTATION_CARTESIANGRIDXYSTAGGERED_H
#define DDSEGMENTATION_CARTESIANGRIDXYSTAGGERED_H
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianGridXYZ.h b/DDCore/include/DDSegmentation/CartesianGridXYZ.h
index 61b101ce3114bff63b43de80332a44c0d225013c..644dbdaa01c383052baea2edb3f81b11f81f1209 100644
--- a/DDCore/include/DDSegmentation/CartesianGridXYZ.h
+++ b/DDCore/include/DDSegmentation/CartesianGridXYZ.h
@@ -8,7 +8,6 @@
// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
//==========================================================================
-
/*
* CartesianGridXYZ.h
*
@@ -19,7 +18,7 @@
#ifndef DDSEGMENTATION_CARTESIANGRIDXYZ_H
#define DDSEGMENTATION_CARTESIANGRIDXYZ_H
-#include "DDSegmentation/CartesianGridXY.h"
+#include <DDSegmentation/CartesianGridXY.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianGridXZ.h b/DDCore/include/DDSegmentation/CartesianGridXZ.h
index b4dcc77ca88f3a596792a5b511c2b408f5328c60..3e358488ec3b6835bb8ffec5b278c04e07b5114a 100644
--- a/DDCore/include/DDSegmentation/CartesianGridXZ.h
+++ b/DDCore/include/DDSegmentation/CartesianGridXZ.h
@@ -8,7 +8,6 @@
// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
//==========================================================================
-
/*
* CartesianGridXY.h
*
@@ -19,7 +18,7 @@
#ifndef DDSEGMENTATION_CARTESIANGRIDXZ_H
#define DDSEGMENTATION_CARTESIANGRIDXZ_H
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianGridYZ.h b/DDCore/include/DDSegmentation/CartesianGridYZ.h
index 39930febff0aa1d1f42d40293aad66ade8a657f1..50a4475d47bc72e1c698c307914cc577c7d54d1d 100644
--- a/DDCore/include/DDSegmentation/CartesianGridYZ.h
+++ b/DDCore/include/DDSegmentation/CartesianGridYZ.h
@@ -11,7 +11,7 @@
#ifndef DDSEGMENTATION_CARTESIANGRIDYZ_H
#define DDSEGMENTATION_CARTESIANGRIDYZ_H
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianStrip.h b/DDCore/include/DDSegmentation/CartesianStrip.h
index 709345fa343ec6bd129dc93ddbe0de3ad0c1ccfc..8c42f5e5b022ee655a6eb8ec9950839ef9477fa2 100644
--- a/DDCore/include/DDSegmentation/CartesianStrip.h
+++ b/DDCore/include/DDSegmentation/CartesianStrip.h
@@ -8,7 +8,6 @@
// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
//==========================================================================
-
/*
* CartesianStrip.h
*
@@ -20,7 +19,7 @@
#ifndef DDSEGMENTATION_CARTESIANSTRIP_H
#define DDSEGMENTATION_CARTESIANSTRIP_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianStripX.h b/DDCore/include/DDSegmentation/CartesianStripX.h
index e5b4c46dc915c170397c9a2b136911f8a9c62ac9..a2d867bb19bc602ac1fa4337e15ff23495293628 100644
--- a/DDCore/include/DDSegmentation/CartesianStripX.h
+++ b/DDCore/include/DDSegmentation/CartesianStripX.h
@@ -20,7 +20,7 @@
#ifndef DDSEGMENTATION_CARTESIANSTRIPX_H
#define DDSEGMENTATION_CARTESIANSTRIPX_H
-#include "DDSegmentation/CartesianStrip.h"
+#include <DDSegmentation/CartesianStrip.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianStripY.h b/DDCore/include/DDSegmentation/CartesianStripY.h
index b452f6b10da022cc567a7a65275ca4b76c197e79..7bfff98e241a0e33d947b83961fef5c88d7bda82 100644
--- a/DDCore/include/DDSegmentation/CartesianStripY.h
+++ b/DDCore/include/DDSegmentation/CartesianStripY.h
@@ -8,7 +8,6 @@
// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
//==========================================================================
-
/*
* CartesianStripY.h
*
@@ -20,7 +19,7 @@
#ifndef DDSEGMENTATION_CARTESIANSTRIPY_H
#define DDSEGMENTATION_CARTESIANSTRIPY_H
-#include "DDSegmentation/CartesianStrip.h"
+#include <DDSegmentation/CartesianStrip.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CartesianStripZ.h b/DDCore/include/DDSegmentation/CartesianStripZ.h
index a7603ab11d629463d187478302a7017ba5cae369..ce03e9a7078ed622d682a0698f1e894751e3fdd3 100644
--- a/DDCore/include/DDSegmentation/CartesianStripZ.h
+++ b/DDCore/include/DDSegmentation/CartesianStripZ.h
@@ -20,7 +20,7 @@
#ifndef DDSEGMENTATION_CARTESIANSTRIPZ_H
#define DDSEGMENTATION_CARTESIANSTRIPZ_H
-#include "DDSegmentation/CartesianStrip.h"
+#include <DDSegmentation/CartesianStrip.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/CylindricalSegmentation.h b/DDCore/include/DDSegmentation/CylindricalSegmentation.h
index e7b92dd40e8cc3f1b4f828f33c15f642b5ac3eba..84ce8e7a59ec7c3f67f743d1782c3442545580d0 100644
--- a/DDCore/include/DDSegmentation/CylindricalSegmentation.h
+++ b/DDCore/include/DDSegmentation/CylindricalSegmentation.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_CYLINDRICALSEGMENTATION_H
#define DDSEGMENTATION_CYLINDRICALSEGMENTATION_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
#include <map>
diff --git a/DDCore/include/DDSegmentation/GridPhiEta.h b/DDCore/include/DDSegmentation/GridPhiEta.h
index 76a8bc0993fe49054f70d997461e54675ffe7005..a45b9db5bce8df7b8653774481229b99f68bc73d 100644
--- a/DDCore/include/DDSegmentation/GridPhiEta.h
+++ b/DDCore/include/DDSegmentation/GridPhiEta.h
@@ -12,9 +12,8 @@
#ifndef DDSEGMENTATION_GRIDPHIETA_H
#define DDSEGMENTATION_GRIDPHIETA_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
-/* #include "DDSegmentation/SegmentationUtil.h" */
#include <cmath>
/** GridPhiEta DDSegmentation/include/DDSegmentation/GridPhiEta.h GridPhiEta.h
diff --git a/DDCore/include/DDSegmentation/GridRPhiEta.h b/DDCore/include/DDSegmentation/GridRPhiEta.h
index ec65b48954be7d886bf01c2504061881389f3a71..0a548c4360f8b23446b61753b8caf8477d00889a 100644
--- a/DDCore/include/DDSegmentation/GridRPhiEta.h
+++ b/DDCore/include/DDSegmentation/GridRPhiEta.h
@@ -13,7 +13,7 @@
#define DDSEGMENTATION_GRIDRPHIETA_H
// Framework includes
-#include "DDSegmentation/GridPhiEta.h"
+#include <DDSegmentation/GridPhiEta.h>
/** GridRPhiEta DDSegmentation/include/DDSegmentation/GridRPhiEta.h GridRPhiEta.h
*
diff --git a/DDCore/include/DDSegmentation/HexGrid.h b/DDCore/include/DDSegmentation/HexGrid.h
index 434177790ebf93611e1508569a02419bb6fb42aa..638db1abb448f3d77e5235705008719a1573c1d1 100644
--- a/DDCore/include/DDSegmentation/HexGrid.h
+++ b/DDCore/include/DDSegmentation/HexGrid.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_HEXGRID_H
#define DDSEGMENTATION_HEXGRID_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/MegatileLayerGridXY.h b/DDCore/include/DDSegmentation/MegatileLayerGridXY.h
index 743365b3c93dd28847ae3e98978009ecfaec2f50..ea4b3223e5f94e543b7393151025a7fcc1c3ffb5 100644
--- a/DDCore/include/DDSegmentation/MegatileLayerGridXY.h
+++ b/DDCore/include/DDSegmentation/MegatileLayerGridXY.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_MEGATILELAYERGRIDXY_H
#define DDSEGMENTATION_MEGATILELAYERGRIDXY_H
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
#include <cassert>
diff --git a/DDCore/include/DDSegmentation/MultiSegmentation.h b/DDCore/include/DDSegmentation/MultiSegmentation.h
index cff283d19da81d42c2f9757f9884ac6909e85e5e..e4a92e84899bab7c0357438a08bf8911292cb8cc 100644
--- a/DDCore/include/DDSegmentation/MultiSegmentation.h
+++ b/DDCore/include/DDSegmentation/MultiSegmentation.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
@@ -14,7 +13,7 @@
#ifndef DDSEGMENTATION_MULTISEGMENTATION_H
#define DDSEGMENTATION_MULTISEGMENTATION_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
/// Main handle class to hold a TGeo alignment object of type TGeoPhysicalNode
namespace dd4hep {
diff --git a/DDCore/include/DDSegmentation/NoSegmentation.h b/DDCore/include/DDSegmentation/NoSegmentation.h
index 5e15b24420ed452043821afd664bbcd5c66d1496..0da93867088b04bb9fb86375cedcca97df2265e6 100644
--- a/DDCore/include/DDSegmentation/NoSegmentation.h
+++ b/DDCore/include/DDSegmentation/NoSegmentation.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_NOSEGMENTATION_H
#define DDSEGMENTATION_NOSEGMENTATION_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/PolarGrid.h b/DDCore/include/DDSegmentation/PolarGrid.h
index 20c4bdbc4f764caa545bf8441df10a567f6b2a1f..8bf5fe36f4683b1d757f33405869a114e1b629b5 100644
--- a/DDCore/include/DDSegmentation/PolarGrid.h
+++ b/DDCore/include/DDSegmentation/PolarGrid.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_POLARGRID_H
#define DDSEGMENTATION_POLARGRID_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/PolarGridRPhi.h b/DDCore/include/DDSegmentation/PolarGridRPhi.h
index 4aa85263a7da3ef1476a79ae69768745c033f3ba..2895b0c71652e4d34ad8627b9980a6dab6a5d0b9 100644
--- a/DDCore/include/DDSegmentation/PolarGridRPhi.h
+++ b/DDCore/include/DDSegmentation/PolarGridRPhi.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_POLARGRIDRPHI_H
#define DDSEGMENTATION_POLARGRIDRPHI_H
-#include "DDSegmentation/PolarGrid.h"
+#include <DDSegmentation/PolarGrid.h>
#include <math.h>
namespace dd4hep {
diff --git a/DDCore/include/DDSegmentation/PolarGridRPhi2.h b/DDCore/include/DDSegmentation/PolarGridRPhi2.h
index 2d24d0bc4ade504f17da841dea7574cce9637d07..0e859027c6ca6ccbfaea2a2bd39bafa21ca5c0bc 100644
--- a/DDCore/include/DDSegmentation/PolarGridRPhi2.h
+++ b/DDCore/include/DDSegmentation/PolarGridRPhi2.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_POLARGRIDRPHI2_H
#define DDSEGMENTATION_POLARGRIDRPHI2_H
-#include "DDSegmentation/PolarGrid.h"
+#include <DDSegmentation/PolarGrid.h>
#include <cmath>
#include <vector>
diff --git a/DDCore/include/DDSegmentation/ProjectiveCylinder.h b/DDCore/include/DDSegmentation/ProjectiveCylinder.h
index cf57f064e3a0d02c392196a01e2404b5cd3653a4..eca70c13c58f50ff77d49a9f5e90d9fb39795b90 100644
--- a/DDCore/include/DDSegmentation/ProjectiveCylinder.h
+++ b/DDCore/include/DDSegmentation/ProjectiveCylinder.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_PROJECTIVECYLINDER_H
#define DDSEGMENTATION_PROJECTIVECYLINDER_H
-#include "CylindricalSegmentation.h"
+#include <DDSegmentation/CylindricalSegmentation.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/include/DDSegmentation/Segmentation.h b/DDCore/include/DDSegmentation/Segmentation.h
index 2a6c268495969d18f2914660d8af1df0dd4f4761..b2da572ba3a3dbdb656df6fcc4a4583929e02ce6 100644
--- a/DDCore/include/DDSegmentation/Segmentation.h
+++ b/DDCore/include/DDSegmentation/Segmentation.h
@@ -19,9 +19,9 @@
#ifndef DDSEGMENTATION_SEGMENTATION_H
#define DDSEGMENTATION_SEGMENTATION_H
-#include "DD4hep/detail/SegmentationsInterna.h"
-#include "DDSegmentation/BitFieldCoder.h"
-#include "DDSegmentation/SegmentationParameter.h"
+#include <DD4hep/detail/SegmentationsInterna.h>
+#include <DDSegmentation/BitFieldCoder.h>
+#include <DDSegmentation/SegmentationParameter.h>
#include <map>
#include <utility>
diff --git a/DDCore/include/DDSegmentation/SegmentationParameter.h b/DDCore/include/DDSegmentation/SegmentationParameter.h
index 8a20bc72cd46f4bc885276f5f57b0e68c3752382..894973b50e065c208dd08ce0b902b3f4796310be 100644
--- a/DDCore/include/DDSegmentation/SegmentationParameter.h
+++ b/DDCore/include/DDSegmentation/SegmentationParameter.h
@@ -8,7 +8,6 @@
// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
//==========================================================================
-
/*
* SegmentationParameter.h
*
diff --git a/DDCore/include/DDSegmentation/SegmentationUtil.h b/DDCore/include/DDSegmentation/SegmentationUtil.h
index 875fdfd861ffba84bb65ce4e815434a0d323d441..b450e363bf361874799c8215781bdb90d0c7bb52 100644
--- a/DDCore/include/DDSegmentation/SegmentationUtil.h
+++ b/DDCore/include/DDSegmentation/SegmentationUtil.h
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* SegmentationUtil.h
*
@@ -8,7 +18,7 @@
#ifndef DDSEGMENTATION_SEGMENTATIONUTIL_H
#define DDSEGMENTATION_SEGMENTATIONUTIL_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
#include <cmath>
#include <vector>
diff --git a/DDCore/include/DDSegmentation/TiledLayerGridXY.h b/DDCore/include/DDSegmentation/TiledLayerGridXY.h
index 20e2551b61cd66fedea0a0e8e243524106bf6ff5..c36fa176f8d063ffbad442bdea93c158aea2283f 100644
--- a/DDCore/include/DDSegmentation/TiledLayerGridXY.h
+++ b/DDCore/include/DDSegmentation/TiledLayerGridXY.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_TILEDLAYERGRIDXY_H
#define DDSEGMENTATION_TILEDLAYERGRIDXY_H
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
// C/C++ includes
#include <string>
diff --git a/DDCore/include/DDSegmentation/TiledLayerSegmentation.h b/DDCore/include/DDSegmentation/TiledLayerSegmentation.h
index d45790dd47705fa43761a086f8615bdf56db1146..ac13e50499ea118672b1ba78ff906d1755c8954b 100644
--- a/DDCore/include/DDSegmentation/TiledLayerSegmentation.h
+++ b/DDCore/include/DDSegmentation/TiledLayerSegmentation.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_TILEDLAYERSEGMENTATION_H
#define DDSEGMENTATION_TILEDLAYERSEGMENTATION_H
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
// C/C++ includes
#include <string>
diff --git a/DDCore/include/DDSegmentation/WaferGridXY.h b/DDCore/include/DDSegmentation/WaferGridXY.h
index 57a84f7f65dda6e24955fd72fe4692a322b02db8..706ad1dde6e562c16f378731ff6eea98c3e96f5e 100644
--- a/DDCore/include/DDSegmentation/WaferGridXY.h
+++ b/DDCore/include/DDSegmentation/WaferGridXY.h
@@ -19,7 +19,7 @@
#ifndef DDSEGMENTATION_WAFERGRIDXY_H
#define DDSEGMENTATION_WAFERGRIDXY_H
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
#define MAX_GROUPS 100
#define MAX_WAFERS 100
diff --git a/DDCore/include/JSON/ChildValue.h b/DDCore/include/JSON/ChildValue.h
index 305d4d4ede1ea30c8177912da9ecafe4e2a39088..a2c256863a09a2d903d4c98c4a7a2d7d1018bb46 100644
--- a/DDCore/include/JSON/ChildValue.h
+++ b/DDCore/include/JSON/ChildValue.h
@@ -14,10 +14,10 @@
#define JSON_CHILDVALUE_H
// Framework include files
-#include "JSON/Dimension.h"
+#include <JSON/Dimension.h>
#define DD4HEP_DIMENSION_NS json
-#include "Parsers/detail/ChildValue.h"
+#include <Parsers/detail/ChildValue.h>
#undef DD4HEP_DIMENSION_NS
diff --git a/DDCore/include/JSON/ChildValue.inl b/DDCore/include/JSON/ChildValue.inl
index aa3785e3bee7318296983615f47bd87379d2dbbb..1c9d9b5bdbeca29f6c0c99a726903e56eb6a6d00 100644
--- a/DDCore/include/JSON/ChildValue.inl
+++ b/DDCore/include/JSON/ChildValue.inl
@@ -14,10 +14,10 @@
#define DD4HEP_JSONCHILDVALUE_INL
// Framework include files
-#include "JSON/ChildValue.h"
+#include <JSON/ChildValue.h>
#define DD4HEP_DIMENSION_NS json
-#include "Parsers/detail/ChildValue.inl"
+#include <Parsers/detail/ChildValue.inl>
#undef DD4HEP_DIMENSION_NS
#endif /* DD4HEP_JSONCHILDVALUE_INL */
diff --git a/DDCore/include/JSON/Conversions.h b/DDCore/include/JSON/Conversions.h
index 691a1452b53b509854d572fd70ce0fad36a130d1..554a44b6ac65f826d24ca3703d3733d39f3f506a 100644
--- a/DDCore/include/JSON/Conversions.h
+++ b/DDCore/include/JSON/Conversions.h
@@ -14,7 +14,7 @@
#define JSON_CONVERSIONS_H
#define DD4HEP_CONVERSION_NS json
-#include "Parsers/detail/Conversions.h"
+#include <Parsers/detail/Conversions.h>
#undef DD4HEP_CONVERSION_NS
#endif // JSON_CONVERSIONS_H
diff --git a/DDCore/include/JSON/Detector.h b/DDCore/include/JSON/Detector.h
index 91a34c3f8e35cd98ed0ff36841a37e41eaadb42f..4b46099f373e6e167c387eb873157cd002dab07b 100644
--- a/DDCore/include/JSON/Detector.h
+++ b/DDCore/include/JSON/Detector.h
@@ -14,11 +14,11 @@
#define JSON_DETECTOR_H
// Framework include files
-#include "JSON/Dimension.h"
+#include <JSON/Dimension.h>
/// Include the implementation in the proper namespace
#define DD4HEP_DIMENSION_NS json
-#include "Parsers/detail/Detector.h"
+#include <Parsers/detail/Detector.h>
#undef DD4HEP_DIMENSION_NS
#endif // JSON_DETECTOR_H
diff --git a/DDCore/include/JSON/Dimension.h b/DDCore/include/JSON/Dimension.h
index 1607f2d80f3398cee9f14450c90b65ab4a85826b..c596b49d9ccf9a39c0da51c08562be0a66310c57 100644
--- a/DDCore/include/JSON/Dimension.h
+++ b/DDCore/include/JSON/Dimension.h
@@ -14,11 +14,11 @@
#define JSON_DIMENSION_H
// Framework include files
-#include "JSON/Elements.h"
-#include "JSON/Tags.h"
+#include <JSON/Elements.h>
+#include <JSON/Tags.h>
#define DD4HEP_DIMENSION_NS json
-#include "Parsers/detail/Dimension.h"
+#include <Parsers/detail/Dimension.h>
#undef DD4HEP_DIMENSION_NS
#endif // JSON_DIMENSION_H
diff --git a/DDCore/include/JSON/Dimension.inl b/DDCore/include/JSON/Dimension.inl
index 2380b8ac53b394ec672bf1e9e276d74e73c79a52..4f265af7948f74108094fedba06e9465ba809048 100644
--- a/DDCore/include/JSON/Dimension.inl
+++ b/DDCore/include/JSON/Dimension.inl
@@ -14,10 +14,10 @@
#define DD4HEP_JSONDIMENSION_INL
// Framework include files
-#include "JSON/Dimension.h"
+#include <JSON/Dimension.h>
#define DD4HEP_DIMENSION_NS json
-#include "Parsers/detail/Dimension.inl"
+#include <Parsers/detail/Dimension.inl>
#undef DD4HEP_DIMENSION_NS
#endif /* DD4HEP_JSONDIMENSION_INL */
diff --git a/DDCore/include/JSON/Helper.h b/DDCore/include/JSON/Helper.h
index 838fcee7b8a63c0af8514245e3523bc16d542f99..658d794b2c7eedaec3ba1293e7d9539e494d9a22 100644
--- a/DDCore/include/JSON/Helper.h
+++ b/DDCore/include/JSON/Helper.h
@@ -14,11 +14,11 @@
#define JSON_HELPER_H
// Framework include files
-#include "JSON/Detector.h"
-#include "JSON/ChildValue.h"
-#include "DD4hep/Detector.h"
-#include "DD4hep/Factories.h"
-#include "DD4hep/DD4hepUnits.h"
+#include <JSON/Detector.h>
+#include <JSON/ChildValue.h>
+#include <DD4hep/Detector.h>
+#include <DD4hep/Factories.h>
+#include <DD4hep/DD4hepUnits.h>
// Shortcuts to elements of the JSON namespace
typedef dd4hep::json::Attribute json_attr_t;
diff --git a/DDCore/include/JSON/Printout.h b/DDCore/include/JSON/Printout.h
index 3b61b1ebd5fa5694bc61cb1c1e7bdf2086efe2f5..eee4a07eca345b625ab2ad93f7a88bf648d26f73 100644
--- a/DDCore/include/JSON/Printout.h
+++ b/DDCore/include/JSON/Printout.h
@@ -19,6 +19,6 @@
*
* See the externalized header in doc/externalize for details.
*/
-#include "Parsers/Printout.h"
+#include <Parsers/Printout.h>
#endif // JSON_PRINTOUT_H
diff --git a/DDCore/include/JSON/Tags.h b/DDCore/include/JSON/Tags.h
index 674b5cd8bf2c1b4f86f518f013bcb047e107f821..f8c0af8b16ba1ae7e6de3e5afdfe709a1ba80835 100644
--- a/DDCore/include/JSON/Tags.h
+++ b/DDCore/include/JSON/Tags.h
@@ -16,7 +16,7 @@
#define DECLARE_UNICODE_TAG(x)
// Framework include files
-#include "JSON/Elements.h"
+#include <JSON/Elements.h>
// Helpers to access tags and attributes quickly without specifying explicitly namespaces
#define _dd4hep_Unicode_Item(a) #a
diff --git a/DDCore/include/JSON/config.h b/DDCore/include/JSON/config.h
index 1c5d179ef70537b8049cc335907e2f21ea701ddc..c9dded18df312a682c2daa3e9edffb57518f1831 100644
--- a/DDCore/include/JSON/config.h
+++ b/DDCore/include/JSON/config.h
@@ -13,7 +13,7 @@
#ifndef JSON_CONFIG_H
#define JSON_CONFIG_H
-#include "Parsers/config.h"
+#include <Parsers/config.h>
#define DD4HEP_USE_BOOST_JSON 1
diff --git a/DDCore/include/Parsers/Exceptions.h b/DDCore/include/Parsers/Exceptions.h
index f1253db0ee810e977a0e2568581167cdbc975caf..36072136583b4ba0e97e35dfb2b4f3422810a869 100644
--- a/DDCore/include/Parsers/Exceptions.h
+++ b/DDCore/include/Parsers/Exceptions.h
@@ -14,7 +14,7 @@
#define PARSERS_EXCEPTIONS_H
// Framework include files
-#include "Parsers/config.h"
+#include <Parsers/config.h>
// C/C++ include files
#include <string>
diff --git a/DDCore/include/Parsers/Primitives.h b/DDCore/include/Parsers/Primitives.h
index 2d4ed0afdba9a9f2dd319e61bc0d37918a640dbb..8aa470a2224bc31ebca4ac87f2cabc9b002ee76b 100644
--- a/DDCore/include/Parsers/Primitives.h
+++ b/DDCore/include/Parsers/Primitives.h
@@ -14,7 +14,7 @@
#define PARSERS_PRIMITIVES_H
// Framework include files
-#include "Parsers/config.h"
+#include <Parsers/config.h>
// C/C++ include files
#include <map>
diff --git a/DDCore/include/Parsers/Printout.h b/DDCore/include/Parsers/Printout.h
index c48acd14b3faadf31076466949704db3258aaa49..66a94028f3371d564f17c181e6a26f25cad3e07d 100644
--- a/DDCore/include/Parsers/Printout.h
+++ b/DDCore/include/Parsers/Printout.h
@@ -14,7 +14,7 @@
#define PARSERS_PRINTOUT_H
// Framework include files
-#include "Parsers/config.h"
+#include <Parsers/config.h>
// C/C++ include files
#include <cstdio>
diff --git a/DDCore/include/Parsers/detail/Detector.imp b/DDCore/include/Parsers/detail/Detector.imp
index 5242bb2dda44c86c57a9c2c9d7d8a9c8455da55c..f8553c64dd47a87a49d8504e432ad134f61a7647 100644
--- a/DDCore/include/Parsers/detail/Detector.imp
+++ b/DDCore/include/Parsers/detail/Detector.imp
@@ -21,8 +21,8 @@
// Framework include files
-#include "DD4hep/Plugins.h"
-#include "DD4hep/Detector.h"
+#include <DD4hep/Plugins.h>
+#include <DD4hep/Detector.h>
namespace detail { class Detector; }
diff --git a/DDCore/include/XML/Conversions.h b/DDCore/include/XML/Conversions.h
index 45d384b20fe553f1166c99dcbbdc2ae7d41ad103..ca41bc4a33b49a16d551d7092c5fc346b256fd3b 100644
--- a/DDCore/include/XML/Conversions.h
+++ b/DDCore/include/XML/Conversions.h
@@ -14,7 +14,7 @@
#define XML_CONVERSIONS_H
#define DD4HEP_CONVERSION_NS xml
-#include "Parsers/detail/Conversions.h"
+#include <Parsers/detail/Conversions.h>
#undef DD4HEP_CONVERSION_NS
#endif // XML_CONVERSIONS_H
diff --git a/DDCore/include/XML/DocumentHandler.h b/DDCore/include/XML/DocumentHandler.h
index 8b7515cd289fbcd91afd0e0eb36fad3a1464af5d..e57442d8e3751b5ac42b77d85c8543156a3869af 100644
--- a/DDCore/include/XML/DocumentHandler.h
+++ b/DDCore/include/XML/DocumentHandler.h
@@ -15,7 +15,7 @@
#define XML_DOCUMENTHANDLER_H
// Framework include files
-#include "XML/XMLElements.h"
+#include <XML/XMLElements.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/XML/Helper.h b/DDCore/include/XML/Helper.h
index 9438557a874ec291f8e23a41a57d6abbe7eb2d24..e0960f222f3c17a370614b1845e1bf58e3e12c5d 100644
--- a/DDCore/include/XML/Helper.h
+++ b/DDCore/include/XML/Helper.h
@@ -14,9 +14,9 @@
#define XML_HELPER_H
// Framework include files
-#include "XML/XML.h"
-#include "DD4hep/Detector.h"
-#include "DD4hep/DD4hepUnits.h"
+#include <XML/XML.h>
+#include <DD4hep/Detector.h>
+#include <DD4hep/DD4hepUnits.h>
/// Namespace for the AIDA detector description toolkit
namespace dd4hep {
diff --git a/DDCore/include/XML/Printout.h b/DDCore/include/XML/Printout.h
index ae9b3b2558016e652fe19936b2868357b12d4d16..37d3f994833e94c2a620bff7581415b1bd440159 100644
--- a/DDCore/include/XML/Printout.h
+++ b/DDCore/include/XML/Printout.h
@@ -19,6 +19,6 @@
*
* See the externalized header in doc/externalize for details.
*/
-#include "Parsers/Printout.h"
+#include <Parsers/Printout.h>
#endif // XML_PRINTOUT_H
diff --git a/DDCore/include/XML/Utilities.h b/DDCore/include/XML/Utilities.h
index 0fc046a8838dcdc6b693cd6bfd61eddbf76753b3..fb07b29dbdb8080ee435da23b401d3edab657348 100644
--- a/DDCore/include/XML/Utilities.h
+++ b/DDCore/include/XML/Utilities.h
@@ -15,10 +15,10 @@
#define XML_UTILITIES_H
// Framework include files
-#include "XML/Conversions.h"
-#include "XML/XMLElements.h"
-#include "XML/VolumeBuilder.h"
-#include "DD4hep/Detector.h"
+#include <XML/Conversions.h>
+#include <XML/XMLElements.h>
+#include <XML/VolumeBuilder.h>
+#include <DD4hep/Detector.h>
// C/C++ include files
#include <set>
diff --git a/DDCore/include/XML/VolumeBuilder.h b/DDCore/include/XML/VolumeBuilder.h
index 7776263149c1944804931cb688cc6d8803948470..945887acc465181515cfc8759fbac0954cdbb7f0 100644
--- a/DDCore/include/XML/VolumeBuilder.h
+++ b/DDCore/include/XML/VolumeBuilder.h
@@ -14,9 +14,9 @@
#define XML_VOLUMEBUILDER_H
// Framework include files
-#include "XML/XMLElements.h"
-#include "XML/XMLDetector.h"
-#include "DD4hep/Detector.h"
+#include <XML/XMLElements.h>
+#include <XML/XMLDetector.h>
+#include <DD4hep/Detector.h>
// C/C++ include files
#include <set>
diff --git a/DDCore/include/XML/XML.h b/DDCore/include/XML/XML.h
index 8a7ef3379f67a58a4b1b967542242437eafca740..76fba2543b96ba1d8036e8334e1c31aa00288af2 100644
--- a/DDCore/include/XML/XML.h
+++ b/DDCore/include/XML/XML.h
@@ -14,11 +14,11 @@
#ifndef XML_XML_H
#define XML_XML_H
-#include "XML/XMLTags.h"
-#include "XML/XMLDimension.h"
-#include "XML/XMLDetector.h"
-#include "XML/XMLChildValue.h"
-#include "XML/DocumentHandler.h"
+#include <XML/XMLTags.h>
+#include <XML/XMLDimension.h>
+#include <XML/XMLDetector.h>
+#include <XML/XMLChildValue.h>
+#include <XML/DocumentHandler.h>
// Useful shortcuts to process XML structures.
typedef dd4hep::xml::Strng_t Unicode;
diff --git a/DDCore/include/XML/XMLChildValue.h b/DDCore/include/XML/XMLChildValue.h
index 917b4d0e2c6bec1cfcdea124f7799ce664fbd2cf..39596e9c036117ea525a8e926a092501720bf433 100644
--- a/DDCore/include/XML/XMLChildValue.h
+++ b/DDCore/include/XML/XMLChildValue.h
@@ -15,10 +15,10 @@
#define XML_XMLCHILDVALUE_H
// Framework include files
-#include "XML/XMLTags.h"
+#include <XML/XMLTags.h>
#define DD4HEP_DIMENSION_NS xml
-#include "Parsers/detail/ChildValue.h"
+#include <Parsers/detail/ChildValue.h>
#undef DD4HEP_DIMENSION_NS
#endif // XML_XMLCHILDVALUE_H
diff --git a/DDCore/include/XML/XMLChildValue.inl b/DDCore/include/XML/XMLChildValue.inl
index 7927acab54d0be0325fbbc1bd6ab745f0cc571b2..f7ab057ec37dbb4b2e821b5f0791e4412a0522a9 100644
--- a/DDCore/include/XML/XMLChildValue.inl
+++ b/DDCore/include/XML/XMLChildValue.inl
@@ -15,10 +15,10 @@
#define DD4HEP_XML_XMLCHILDVALUE_INL
// Framework include files
-#include "XML/XMLChildValue.h"
+#include <XML/XMLChildValue.h>
#define DD4HEP_DIMENSION_NS xml
-#include "Parsers/detail/ChildValue.inl"
+#include <Parsers/detail/ChildValue.inl>
#undef DD4HEP_DIMENSION_NS
#endif /* DD4HEP_XML_XMLCHILDVALUE_INL */
diff --git a/DDCore/include/XML/XMLDetector.h b/DDCore/include/XML/XMLDetector.h
index 49d08232c5402c2c5b15fa398d45e77135ba2264..bac613f4667277e93965e73e8bf5ffbf8adba66f 100644
--- a/DDCore/include/XML/XMLDetector.h
+++ b/DDCore/include/XML/XMLDetector.h
@@ -14,10 +14,10 @@
#define XML_XMLDETECTOR_H
// Framework include files
-#include "XML/XMLDimension.h"
+#include <XML/XMLDimension.h>
#define DD4HEP_DIMENSION_NS xml
-#include "Parsers/detail/Detector.h"
+#include <Parsers/detail/Detector.h>
#undef DD4HEP_DIMENSION_NS
#endif // XML_XMLDETECTOR_H
diff --git a/DDCore/include/XML/XMLDimension.h b/DDCore/include/XML/XMLDimension.h
index c7ec04f24621e1b52a0a17ad531388f8ff9c000b..819036f7d0b7cebf8c207e05c96dcab3a7d84ebe 100644
--- a/DDCore/include/XML/XMLDimension.h
+++ b/DDCore/include/XML/XMLDimension.h
@@ -14,11 +14,11 @@
#define XML_XMLDIMENSION_H
// Framework include files
-#include "XML/XMLElements.h"
-#include "XML/XMLTags.h"
+#include <XML/XMLElements.h>
+#include <XML/XMLTags.h>
#define DD4HEP_DIMENSION_NS xml
-#include "Parsers/detail/Dimension.h"
+#include <Parsers/detail/Dimension.h>
#undef DD4HEP_DIMENSION_NS
#endif // XML_XMLDIMENSION_H
diff --git a/DDCore/include/XML/XMLDimension.inl b/DDCore/include/XML/XMLDimension.inl
index 3c962a7e33cee51bb0245cc6c2cb0069cab95456..79ce42ad8bbf7c8eedaacb6ddf584ce91f7e2d3a 100644
--- a/DDCore/include/XML/XMLDimension.inl
+++ b/DDCore/include/XML/XMLDimension.inl
@@ -14,10 +14,10 @@
#ifndef DD4HEP_XMLDIMENSION_INL
#define DD4HEP_XMLDIMENSION_INL
-#include "XML/XMLDimension.h"
+#include <XML/XMLDimension.h>
#define DD4HEP_DIMENSION_NS xml
-#include "Parsers/detail/Dimension.inl"
+#include <Parsers/detail/Dimension.inl>
#undef DD4HEP_DIMENSION_NS
#endif /* DD4HEP_XMLDIMENSION_INL */
diff --git a/DDCore/include/XML/XMLElements.h b/DDCore/include/XML/XMLElements.h
index 954f5f3592d745f02332c8ac785fbe5e3c828f4d..2db5332f913cb4f3624f3cb040509c22c70f2190 100644
--- a/DDCore/include/XML/XMLElements.h
+++ b/DDCore/include/XML/XMLElements.h
@@ -20,7 +20,7 @@
#include <stdexcept>
// Framework include files
-#include "XML/config.h"
+#include <XML/config.h>
#ifndef RAD_2_DEGREE
#define RAD_2_DEGREE 57.295779513082320876798154814105
diff --git a/DDCore/include/XML/XMLParsers.h b/DDCore/include/XML/XMLParsers.h
index 1f9b0ee819daadfab27b8cbdd17d6de4d98dd4f1..e3d0e54d51849b31fb9ff98adf06abbcd35e2840 100644
--- a/DDCore/include/XML/XMLParsers.h
+++ b/DDCore/include/XML/XMLParsers.h
@@ -16,8 +16,8 @@
#define XML_XMLPARSERS_H
// Framework include files
-#include "DD4hep/AlignmentData.h"
-#include "XML/XMLElements.h"
+#include <DD4hep/AlignmentData.h>
+#include <XML/XMLElements.h>
// C/C++ include files
diff --git a/DDCore/include/XML/XMLTags.h b/DDCore/include/XML/XMLTags.h
index 7e2b88943be0296ce7d16a9762bc87cf7d142bcc..1e63e5a60640df0514ee38d9a2ebe3db09f997fd 100644
--- a/DDCore/include/XML/XMLTags.h
+++ b/DDCore/include/XML/XMLTags.h
@@ -17,7 +17,7 @@
#define DECLARE_UNICODE_TAG(x) namespace dd4hep { namespace xml { extern const Tag_t Unicode_##x (#x); }}
// Framework include files
-#include "XML/XMLElements.h"
+#include <XML/XMLElements.h>
#define UNICODE(x) extern const Tag_t Unicode_##x
/// Namespace for the AIDA detector description toolkit
@@ -25,7 +25,7 @@ namespace dd4hep {
/// Namespace for the AIDA detector description toolkit supporting XML utilities
namespace xml {
-#include "XML/UnicodeValues.h"
+#include <XML/UnicodeValues.h>
}
}
diff --git a/DDCore/include/XML/config.h b/DDCore/include/XML/config.h
index 62e75f04c51647481a84ddd2630f9e53c1c471a5..ec7bc54ba6ecea88ffee427643e3cffef4d0bf19 100644
--- a/DDCore/include/XML/config.h
+++ b/DDCore/include/XML/config.h
@@ -17,7 +17,7 @@
#ifndef XML_CONFIG_H
#define XML_CONFIG_H
-#include "Parsers/config.h"
+#include <Parsers/config.h>
#if defined(DD4HEP_USE_TINYXML)
#define __TIXML__
diff --git a/DDCore/src/AlignmentsCalculator.cpp.old b/DDCore/src/AlignmentsCalculator.cpp.old
deleted file mode 100644
index 682f1345954b25ec0173b025457a1e3e4ee415f2..0000000000000000000000000000000000000000
--- a/DDCore/src/AlignmentsCalculator.cpp.old
+++ /dev/null
@@ -1,291 +0,0 @@
-//==========================================================================
-// 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 : M.Frank
-//
-//==========================================================================
-
-// Framework include files
-#include "DD4hep/AlignmentsCalculator.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/Conditions.h"
-#include "DD4hep/ConditionsMap.h"
-#include "DD4hep/InstanceCount.h"
-#include "DD4hep/MatrixHelpers.h"
-#include "DD4hep/detail/AlignmentsInterna.h"
-
-using namespace dd4hep;
-using namespace dd4hep::align;
-typedef AlignmentsCalculator::Result Result;
-
-/// Namespace for the AIDA detector description toolkit
-namespace dd4hep {
-
- /// Namespace for the alignment part of the AIDA detector description toolkit
- namespace align {
-
- /// Anonymous implementation classes
- namespace {
- static Delta identity_delta;
-
- /// Alignment calculator.
- /**
- * Uses internally the conditions mechanism to calculator the alignment conditions.
- *
- * \author M.Frank
- * \version 1.0
- * \ingroup DD4HEP_ALIGNMENTS
- */
- class Calculator {
- public:
- class Entry;
- class Context;
-
- public:
- /// Initializing constructor
- Calculator() = default;
- /// Default destructor
- ~Calculator() = default;
- /// Compute the alignment delta for one detector element and it's alignment condition
- void computeDelta(const Delta& delta, TGeoHMatrix& tr_delta) const;
- /// Compute the transformation from the closest detector element of the alignment to the world system
- Result to_world(Context& context, DetElement det, TGeoHMatrix& mat) const;
- /// Compute all alignment conditions of the lower levels
- Result compute(Context& context, Entry& entry) const;
- /// Resolve child dependencies for a given context
- void resolve(Context& context, DetElement child) const;
- };
-
- class Calculator::Entry {
- public:
- DetElement::Object* det = 0;
- const Delta* delta = 0;
- AlignmentCondition::Object* cond = 0;
- unsigned char key = 0, valid = 0, created = 0, _pad[1];
- Entry(DetElement d, const Delta* del) : det(d.ptr()), delta(del), key(d.key()) {}
- };
-
- class Calculator::Context {
- public:
- struct PathOrdering {
- bool operator()(const DetElement& a, const DetElement& b) const
- { return a.path() < b.path(); }
- };
- typedef std::map<DetElement,size_t,PathOrdering> DetectorMap;
- typedef std::map<unsigned int,size_t> Keys;
- typedef std::vector<Entry> Entries;
-
- DetectorMap detectors;
- Keys keys;
- Entries entries;
- ConditionsMap& mapping;
- Context(ConditionsMap& m) : mapping(m) {
- InstanceCount::increment(this);
- }
- ~Context() {
- InstanceCount::decrement(this);
- }
- void insert(DetElement det, const Delta* delta) {
- if ( det.isValid() ) {
- Entry entry(det,delta);
- detectors.insert(std::make_pair(det, entries.size()));
- keys.insert(std::make_pair(entry.key, entries.size()));
- entries.insert(entries.end(), entry);
- return;
- }
- except("AlignContext","Failed to add entry: invalid detector handle!");
- }
- };
- }
- } /* End namespace align */
-} /* End namespace dd4hep */
-
-static PrintLevel s_PRINT = WARNING;
-//static PrintLevel s_PRINT = INFO;
-
-Result Calculator::to_world(Context& context,
- DetElement det,
- TGeoHMatrix& delta_to_world) const
-{
- Result result;
- DetElement par = det.parent();
-
- while( par.isValid() ) {
- // Mapping creation mode:
- // If we find that the parent also got updated, directly take this transformation.
- // Since we compute top-down, it is already valid!
- Context::Keys::const_iterator i = context.keys.find(par.key());
- if ( i != context.keys.end() ) {
- Entry& e = context.entries[(*i).second];
- // The parent entry is (not yet) valid. need to compute it first
- if ( 0 == e.valid ) {
- result += compute(context, e);
- }
- AlignmentCondition cond(e.cond);
- AlignmentData& align(cond.data());
- if ( s_PRINT <= INFO ) {
- ::printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta_to_world.Print();
- ::printf(" with ALIGN(world) %s :", par.path().c_str()); align.worldDelta.Print();
- }
- delta_to_world.MultiplyLeft(&align.worldDelta);
- if ( s_PRINT <= INFO ) {
- ::printf(" Result :"); delta_to_world.Print();
- }
- ++result.computed;
- return result;
- }
- // Mapping update mode:
- // Check if there is already a transformation in the cache. If yes, take it.
- // We assume it is a good one, because higher level changes are already processed.
- AlignmentCondition cond = context.mapping.get(par,Keys::alignmentKey);
- if ( cond.isValid() ) {
- AlignmentData& align(cond.data());
- if ( s_PRINT <= INFO ) {
- ::printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta_to_world.Print();
- ::printf(" with ALIGN(world) %s :", par.path().c_str()); align.worldDelta.Print();
- }
- delta_to_world.MultiplyLeft(&align.worldDelta);
- if ( s_PRINT <= INFO ) {
- ::printf(" Result :"); delta_to_world.Print();
- }
- ++result.computed;
- return result;
- }
- // There is no special alignment for this detector element.
- // Hence to nominal (relative) transformation to the parent is valid
- if ( s_PRINT <= INFO ) {
- ::printf("Multiply-left ALIGNMENT %s:", det.path().c_str()); delta_to_world.Print();
- ::printf(" with NOMINAL(det) %s :", par.path().c_str());
- par.nominal().detectorTransformation().Print();
- }
- delta_to_world.MultiplyLeft(&par.nominal().detectorTransformation());
- if ( s_PRINT <= INFO ) {
- ::printf(" Result :"); delta_to_world.Print();
- }
- par = par.parent();
- }
- ++result.computed;
- return result;
-}
-
-/// Compute the alignment delta for one detector element and it's alignment condition
-void Calculator::computeDelta(const Delta& delta,
- TGeoHMatrix& tr_delta) const
-{
- const Position& pos = delta.translation;
- const Translation3D& piv = delta.pivot;
- const RotationZYX& rot = delta.rotation;
-
- switch(delta.flags) {
- case Delta::HAVE_TRANSLATION+Delta::HAVE_ROTATION+Delta::HAVE_PIVOT:
- detail::matrix::_transform(tr_delta, Transform3D(Translation3D(pos)*piv*rot*(piv.Inverse())));
- break;
- case Delta::HAVE_TRANSLATION+Delta::HAVE_ROTATION:
- detail::matrix::_transform(tr_delta, Transform3D(rot,pos));
- break;
- case Delta::HAVE_ROTATION+Delta::HAVE_PIVOT:
- detail::matrix::_transform(tr_delta, Transform3D(piv*rot*(piv.Inverse())));
- break;
- case Delta::HAVE_ROTATION:
- detail::matrix::_transform(tr_delta, rot);
- break;
- case Delta::HAVE_TRANSLATION:
- detail::matrix::_transform(tr_delta, pos);
- break;
- default:
- break;
- }
-}
-
-/// Compute all alignment conditions of the lower levels
-Result Calculator::compute(Context& context, Entry& e) const {
- Result result;
- DetElement det = e.det;
-
- if ( e.valid == 1 ) {
- printout(DEBUG,"ComputeAlignment","================ IGNORE %s (already valid)",det.path().c_str());
- return result;
- }
- AlignmentCondition c = context.mapping.get(e.det, Keys::alignmentKey);
- AlignmentCondition cond = c.isValid() ? c : AlignmentCondition("alignment");
- AlignmentData& align = cond.data();
- const Delta* delta = e.delta ? e.delta : &identity_delta;
- TGeoHMatrix tr_delta;
-
- printout(DEBUG,"ComputeAlignment",
- "============================== Compute transformation of %s",det.path().c_str());
- e.valid = 1;
- e.cond = cond.ptr();
- computeDelta(*delta, tr_delta);
- align.delta = *delta;
- align.worldDelta = tr_delta;
- result += to_world(context, det, align.worldDelta);
- align.worldTrafo = det.nominal().worldTransformation()*align.worldDelta;
- align.detectorTrafo = det.nominal().detectorTransformation()*tr_delta;
- align.trToWorld = detail::matrix::_transform(&align.worldDelta);
- // Update mapping if the condition is freshly created
- if ( !c.isValid() ) {
- e.created = 1;
- cond->hash = ConditionKey(e.det,Keys::alignmentKey).hash;
- context.mapping.insert(e.det, Keys::alignmentKey, cond);
- }
- if ( s_PRINT <= INFO ) {
- printout(INFO,"ComputeAlignment","Level:%d Path:%s DetKey:%08X: Cond:%s key:%16llX",
- det.level(), det.path().c_str(), det.key(),
- yes_no(e.delta != 0), (long long int)cond.key());
- if ( s_PRINT <= DEBUG ) {
- ::printf("DetectorTrafo: '%s' -> '%s' ",det.path().c_str(), det.parent().path().c_str());
- det.nominal().detectorTransformation().Print();
- ::printf("Delta: '%s' ",det.path().c_str()); tr_delta.Print();
- ::printf("World-Delta: '%s' ",det.path().c_str()); align.worldDelta.Print();
- ::printf("Nominal: '%s' ",det.path().c_str()); det.nominal().worldTransformation().Print();
- ::printf("Result: '%s' ",det.path().c_str()); align.worldTrafo.Print();
- }
- }
- return result;
-}
-
-/// Resolve child dependencies for a given context
-void Calculator::resolve(Context& context, DetElement detector) const {
- auto children = detector.children();
- auto item = context.detectors.find(detector);
- if ( item == context.detectors.end() ) context.insert(detector,0);
- for(const auto& c : children )
- resolve(context, c.second);
-}
-
-/// Compute all alignment conditions of the internal dependency list
-Result AlignmentsCalculator::compute(const std::map<DetElement, Delta>& deltas,
- ConditionsMap& alignments) const
-{
- Result result;
- Calculator obj;
- Calculator::Context context(alignments);
- // This is a tricky one. We absolutely need the detector elements ordered
- // by their depth aka. the distance to /world.
- // Unfortunately one cannot use the raw pointer of the DetElement here,
- // But has to insert them in a map which is ordered by the DetElement path.
- //
- // Otherwise memory randomization gives us the wrong order and the
- // corrections are calculated in the wrong order ie. not top -> down the
- // hierarchy, but in "some" order depending on the pointer values!
- //
- std::map<DetElement,Delta,Calculator::Context::PathOrdering> ordered_deltas;
-
- for( const auto& i : deltas )
- ordered_deltas.insert(i);
-
- for( const auto& i : ordered_deltas )
- context.insert(i.first, &(i.second));
- for( const auto& i : ordered_deltas )
- obj.resolve(context,i.first);
- for( auto& i : context.entries )
- result += obj.compute(context, i);
- return result;
-}
diff --git a/DDCore/src/Handle.cpp b/DDCore/src/Handle.cpp
index 2fa5b4b1b2ff2e902cc7821fc5073d3af091c047..8d415e35fb4471fd8fa3b2cc15306e98c2824837 100644
--- a/DDCore/src/Handle.cpp
+++ b/DDCore/src/Handle.cpp
@@ -24,7 +24,7 @@
#include <cstdio>
#if !defined(WIN32) && !defined(__ICC)
-#include "cxxabi.h"
+#include <cxxabi.h>
#endif
namespace dd4hep {
@@ -377,7 +377,7 @@ namespace dd4hep {
}
}
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
typedef DDSegmentation::Segmentation _Segmentation;
namespace dd4hep {
template <> void Handle<_Segmentation>::assign(_Segmentation* s, const std::string& n, const std::string&) {
diff --git a/DDCore/src/IDDescriptor.cpp b/DDCore/src/IDDescriptor.cpp
index 0b0d494e660304cc6db2c8dde8290f96f0f34cb8..410ee8d7e2bb3ff168dd776ea3f29cc00cdbd125 100644
--- a/DDCore/src/IDDescriptor.cpp
+++ b/DDCore/src/IDDescriptor.cpp
@@ -12,12 +12,12 @@
//==========================================================================
// Framework include files
-#include "DD4hep/IDDescriptor.h"
-#include "DD4hep/detail/Handle.inl"
-#include "DD4hep/detail/ObjectsInterna.h"
-#include "DD4hep/InstanceCount.h"
-#include "DD4hep/Volumes.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/IDDescriptor.h>
+#include <DD4hep/detail/Handle.inl>
+#include <DD4hep/detail/ObjectsInterna.h>
+#include <DD4hep/InstanceCount.h>
+#include <DD4hep/Volumes.h>
+#include <DD4hep/Printout.h>
// C/C++ include files
#include <stdexcept>
diff --git a/DDCore/src/JSON/Helpers.cpp b/DDCore/src/JSON/Helpers.cpp
index 8c172d1667f6979b52bfb30a993738941604a7f2..8a22db3c3e7ffadd6273443c30dca19fc073df06 100644
--- a/DDCore/src/JSON/Helpers.cpp
+++ b/DDCore/src/JSON/Helpers.cpp
@@ -19,5 +19,5 @@
#define DD4HEP_DIMENSION_NS json
using namespace dd4hep::DD4HEP_DIMENSION_NS;
-#include "Parsers/detail/Dimension.imp"
-#include "Parsers/detail/ChildValue.imp"
+#include <Parsers/detail/Dimension.imp>
+#include <Parsers/detail/ChildValue.imp>
diff --git a/DDCore/src/ObjectExtensions.cpp b/DDCore/src/ObjectExtensions.cpp
index 9979aca9198ff361c2fa081dbd72a84d7a048088..66ae327082a8b7ec4e987acfc488c77eb163c652 100644
--- a/DDCore/src/ObjectExtensions.cpp
+++ b/DDCore/src/ObjectExtensions.cpp
@@ -12,10 +12,10 @@
//==========================================================================
// Framework include files
-#include "DD4hep/ObjectExtensions.h"
-#include "DD4hep/InstanceCount.h"
-#include "DD4hep/Primitives.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/ObjectExtensions.h>
+#include <DD4hep/InstanceCount.h>
+#include <DD4hep/Primitives.h>
+#include <DD4hep/Printout.h>
using namespace dd4hep;
diff --git a/DDCore/src/Plugins.cpp b/DDCore/src/Plugins.cpp
index 30de1a2c0ec3f9824097032ab2dbdd2a2f700f4c..4bdc3230b7c2f20f9a666d12cedc75a4be227656 100644
--- a/DDCore/src/Plugins.cpp
+++ b/DDCore/src/Plugins.cpp
@@ -39,9 +39,9 @@ bool PluginService::setDebug(bool new_value) {
#define DD4HEP_PARSERS_NO_ROOT
#endif
-#include "DD4hep/Printout.h"
+#include <DD4hep/Printout.h>
#if !defined(DD4HEP_PARSERS_NO_ROOT)
-#include "TSystem.h"
+#include <TSystem.h>
#else
#include <dlfcn.h>
#endif
diff --git a/DDCore/src/PropertyDictionary.h b/DDCore/src/PropertyDictionary.h
index 95848f62c28404ed42c6f71d9062d436eb755520..434ca9ae933e06b32d895dbd2f0bb34da680ee64 100644
--- a/DDCore/src/PropertyDictionary.h
+++ b/DDCore/src/PropertyDictionary.h
@@ -26,7 +26,7 @@
#include <set>
#include <string>
-#include "TRint.h"
+#include <TRint.h>
namespace dd4hep {
namespace detail {}
}
diff --git a/DDCore/src/SegmentationsInterna.cpp b/DDCore/src/SegmentationsInterna.cpp
index c94e3f013ca7a14cd26b0a342c0cb4326d2f35b5..e4d40e4998b2d08213823811277acb53694aece9 100644
--- a/DDCore/src/SegmentationsInterna.cpp
+++ b/DDCore/src/SegmentationsInterna.cpp
@@ -15,7 +15,7 @@
#include <DD4hep/detail/SegmentationsInterna.h>
#include <DD4hep/InstanceCount.h>
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
using namespace dd4hep;
diff --git a/DDCore/src/XML/Detector.cpp b/DDCore/src/XML/Detector.cpp
index 1662debb3de227003b3ba4022269bd04886918e1..9839550294a7eb5e7a661e4d8ebf8b43eb7bdc0b 100644
--- a/DDCore/src/XML/Detector.cpp
+++ b/DDCore/src/XML/Detector.cpp
@@ -19,5 +19,5 @@
#define DD4HEP_DIMENSION_NS xml
using namespace dd4hep::DD4HEP_DIMENSION_NS;
-#include "Parsers/detail/Detector.imp"
+#include <Parsers/detail/Detector.imp>
#endif
diff --git a/DDCore/src/XML/XMLElements.cpp b/DDCore/src/XML/XMLElements.cpp
index d2ac4360dbebb429dc8721e525ca277773e4953b..aad6f714291760a6979c880657d1c6dfda87975c 100644
--- a/DDCore/src/XML/XMLElements.cpp
+++ b/DDCore/src/XML/XMLElements.cpp
@@ -13,20 +13,20 @@
// Framework include files
#ifdef DD4HEP_USE_TINYXML
-#include "XML/tinyxml.h"
+#include <XML/tinyxml.h>
#else
#include <xercesc/util/Xerces_autoconf_config.hpp>
-#include "xercesc/util/XMLString.hpp"
-#include "xercesc/dom/DOMElement.hpp"
-#include "xercesc/dom/DOMDocument.hpp"
-#include "xercesc/dom/DOMNodeList.hpp"
-#include "xercesc/dom/DOM.hpp"
-#include "XML/config.h"
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/dom/DOMElement.hpp>
+#include <xercesc/dom/DOMDocument.hpp>
+#include <xercesc/dom/DOMNodeList.hpp>
+#include <xercesc/dom/DOM.hpp>
+#include <XML/config.h>
#endif
-#include "XML/XMLElements.h"
-#include "XML/Printout.h"
-#include "XML/XMLTags.h"
+#include <XML/XMLElements.h>
+#include <XML/Printout.h>
+#include <XML/XMLTags.h>
// C/C++ include files
#include <iostream>
@@ -1266,7 +1266,7 @@ Handle_t Document::clone(Handle_t source) const {
}
#ifdef DD4HEP_USE_TINYXML
-#include "tinyxml_inl.h"
-#include "tinyxmlerror_inl.h"
-#include "tinyxmlparser_inl.h"
+#include <tinyxml_inl.h>
+#include <tinyxmlerror_inl.h>
+#include <tinyxmlparser_inl.h>
#endif
diff --git a/DDCore/src/XML/XMLHelpers.cpp b/DDCore/src/XML/XMLHelpers.cpp
index 59fa2b888bfded25d34b0b436eade6305b97c63a..2cfb69412791937274956a86912ca099afe6ce23 100644
--- a/DDCore/src/XML/XMLHelpers.cpp
+++ b/DDCore/src/XML/XMLHelpers.cpp
@@ -12,12 +12,12 @@
//==========================================================================
// Framework include files
-#include "XML/XMLDimension.inl"
-#include "XML/XMLChildValue.inl"
+#include <XML/XMLDimension.inl>
+#include <XML/XMLChildValue.inl>
// Instantiate here the concrete implementations
#define DD4HEP_DIMENSION_NS xml
using namespace dd4hep::DD4HEP_DIMENSION_NS;
-#include "Parsers/detail/Dimension.imp"
-#include "Parsers/detail/ChildValue.imp"
+#include <Parsers/detail/Dimension.imp>
+#include <Parsers/detail/ChildValue.imp>
diff --git a/DDCore/src/XML/XMLParsers.cpp b/DDCore/src/XML/XMLParsers.cpp
index f3228de0fdecc8a1f477deb4cf67464f05a46b57..ee8f6c0e83571949662ea8321ca259cd2939494c 100644
--- a/DDCore/src/XML/XMLParsers.cpp
+++ b/DDCore/src/XML/XMLParsers.cpp
@@ -15,13 +15,13 @@
#ifndef DD4HEP_NONE
// Framework include files
-#include "DD4hep/Objects.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/OpaqueData.h"
-#include "DD4hep/OpaqueDataBinder.h"
-#include "XML/XMLParsers.h"
-#include "XML/XMLDimension.h"
-#include "XML/DocumentHandler.h"
+#include <DD4hep/Objects.h>
+#include <DD4hep/Printout.h>
+#include <DD4hep/OpaqueData.h>
+#include <DD4hep/OpaqueDataBinder.h>
+#include <XML/XMLParsers.h>
+#include <XML/XMLDimension.h>
+#include <XML/DocumentHandler.h>
// C/C++ include files
diff --git a/DDCore/src/XML/XMLTags.cpp b/DDCore/src/XML/XMLTags.cpp
index 4ec2a13ce50d98b01e3ef08f658145a30b5a3de4..4916e847eefa1d26697a7399520bcf9ef423a1cf 100644
--- a/DDCore/src/XML/XMLTags.cpp
+++ b/DDCore/src/XML/XMLTags.cpp
@@ -12,10 +12,10 @@
//==========================================================================
// Framework include files
-#include "XML/XMLElements.h"
+#include <XML/XMLElements.h>
#ifndef __TIXML__
-#include "xercesc/util/XMLString.hpp"
-#include "xercesc/util/PlatformUtils.hpp"
+#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/PlatformUtils.hpp>
#endif
// C/C++ include files
@@ -66,7 +66,7 @@ namespace dd4hep {
/// Namespace for the AIDA detector description toolkit supporting XML utilities
namespace xml {
-#include "XML/UnicodeValues.h"
+#include <XML/UnicodeValues.h>
}
}
diff --git a/DDCore/src/XML/tinyxml_inl.h b/DDCore/src/XML/tinyxml_inl.h
index 9091b07649e75ea110a805261d96e13160d1e557..a1ce86a5d6e60f084559bd0964a37cacd1695bc2 100644
--- a/DDCore/src/XML/tinyxml_inl.h
+++ b/DDCore/src/XML/tinyxml_inl.h
@@ -37,7 +37,7 @@
#include <iostream>
#endif
-#include "XML/tinyxml.h"
+#include <XML/tinyxml.h>
bool TiXmlBase::condenseWhiteSpace = true;
diff --git a/DDCore/src/XML/tinyxmlerror_inl.h b/DDCore/src/XML/tinyxmlerror_inl.h
index ad18d94341cf35ed2cc64957373e6fa0ef8ed424..0dee3836f075782410f5c76f9d9c9fc76167cb5e 100644
--- a/DDCore/src/XML/tinyxmlerror_inl.h
+++ b/DDCore/src/XML/tinyxmlerror_inl.h
@@ -28,7 +28,7 @@
and include from "marlin/tinyxml.h"
*/
-#include "XML/tinyxml.h"
+#include <XML/tinyxml.h>
// The goal of the seperate error file is to make the first
diff --git a/DDCore/src/XML/tinyxmlparser_inl.h b/DDCore/src/XML/tinyxmlparser_inl.h
index 1613515acc583f87674b1ee1d945fafeac255972..46ea282f4e6ca739bfd1d83e30c14e78d1f4c346 100644
--- a/DDCore/src/XML/tinyxmlparser_inl.h
+++ b/DDCore/src/XML/tinyxmlparser_inl.h
@@ -32,7 +32,7 @@
#include <ctype.h>
#include <stddef.h>
-#include "XML/tinyxml.h"
+#include <XML/tinyxml.h>
//#define DEBUG_PARSER
#if defined( DEBUG_PARSER )
diff --git a/DDCore/src/gdml/DetElementCreator.cpp b/DDCore/src/gdml/DetElementCreator.cpp
index a9707616db32bfcbd60fee1cf0c3191428ab4d51..85c65aa923194050a390584331adeced9a979240 100644
--- a/DDCore/src/gdml/DetElementCreator.cpp
+++ b/DDCore/src/gdml/DetElementCreator.cpp
@@ -18,8 +18,8 @@
#define DD4HEP_DETELEMENTCREATOR_H
// Framework include files
-#include "DD4hep/VolumeProcessor.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/VolumeProcessor.h>
+#include <DD4hep/Printout.h>
namespace dd4hep {
@@ -106,10 +106,10 @@ namespace dd4hep {
#endif /* DD4HEP_DETELEMENTCREATOR_H */
// Framework include files
-#include "DD4hep/detail/DetectorInterna.h"
-#include "DD4hep/DetFactoryHelper.h"
-#include "DD4hep/DetectorHelper.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/detail/DetectorInterna.h>
+#include <DD4hep/DetFactoryHelper.h>
+#include <DD4hep/DetectorHelper.h>
+#include <DD4hep/Printout.h>
// C/C++ include files
#include <sstream>
diff --git a/DDCore/src/gdml/DetNominalCreator.cpp b/DDCore/src/gdml/DetNominalCreator.cpp
index 0e0ec5de66c2a97c751a050aa41f212b50652ffc..bf8bba4763f87c0561efbfe8370350c8225d36af 100644
--- a/DDCore/src/gdml/DetNominalCreator.cpp
+++ b/DDCore/src/gdml/DetNominalCreator.cpp
@@ -18,7 +18,7 @@
#define DD4HEP_DETNOMINALCREATOR_H
// Framework include files
-#include "DD4hep/DetElement.h"
+#include <DD4hep/DetElement.h>
namespace dd4hep {
@@ -44,8 +44,8 @@ namespace dd4hep {
#endif /* DD4HEP_DETNOMINALCREATOR_H */
// Framework include files
-#include "DD4hep/DetectorProcessor.h"
-#include "DD4hep/DetFactoryHelper.h"
+#include <DD4hep/DetectorProcessor.h>
+#include <DD4hep/DetFactoryHelper.h>
// C/C++ include files
diff --git a/DDCore/src/gdml/ImportPlainRoot.cpp b/DDCore/src/gdml/ImportPlainRoot.cpp
index be60a819497e63818da9d680a6bee0c77f0d78ae..606d4c0f184f17eb994b94f97cd05a700e1b4f3d 100644
--- a/DDCore/src/gdml/ImportPlainRoot.cpp
+++ b/DDCore/src/gdml/ImportPlainRoot.cpp
@@ -12,20 +12,20 @@
//==========================================================================
// Framework include files
-#include "DD4hep/Detector.h"
-#include "DD4hep/Memory.h"
-#include "DD4hep/DD4hepUI.h"
-#include "DD4hep/Factories.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/DetectorData.h"
-#include "DD4hep/DetectorTools.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/Memory.h>
+#include <DD4hep/DD4hepUI.h>
+#include <DD4hep/Factories.h>
+#include <DD4hep/Printout.h>
+#include <DD4hep/DetectorData.h>
+#include <DD4hep/DetectorTools.h>
// ROOT includes
-#include "TInterpreter.h"
-#include "TGeoElement.h"
-#include "TGeoManager.h"
-#include "TFile.h"
-#include "TUri.h"
+#include <TInterpreter.h>
+#include <TGeoElement.h>
+#include <TGeoManager.h>
+#include <TFile.h>
+#include <TUri.h>
using namespace std;
using namespace dd4hep;
diff --git a/DDCore/src/graphics/DrawBField.cpp b/DDCore/src/graphics/DrawBField.cpp
index 18b15f77fddc0d7dee9b0288cea38a9c0a8d4bb0..a4434b5116b170df69bc22509bad72c56a8fd642 100644
--- a/DDCore/src/graphics/DrawBField.cpp
+++ b/DDCore/src/graphics/DrawBField.cpp
@@ -12,10 +12,10 @@
//==========================================================================
// Framework includes
-#include "DD4hep/Printout.h"
-#include "DD4hep/FieldTypes.h"
-#include "DD4hep/MatrixHelpers.h"
-#include "DD4hep/DetFactoryHelper.h"
+#include <DD4hep/Printout.h>
+#include <DD4hep/FieldTypes.h>
+#include <DD4hep/MatrixHelpers.h>
+#include <DD4hep/DetFactoryHelper.h>
#include <cmath>
using namespace dd4hep;
diff --git a/DDCore/src/plugins/LCDD2Output.cpp b/DDCore/src/plugins/LCDD2Output.cpp
index ee7b10b18729e24fe38265db2ae60d57424b6c87..a80de1091cbd7778e2bace7e49207bdf87b1a5ce 100644
--- a/DDCore/src/plugins/LCDD2Output.cpp
+++ b/DDCore/src/plugins/LCDD2Output.cpp
@@ -12,18 +12,18 @@
//==========================================================================
// Framework includes
-#include "XML/Conversions.h"
-#include "DD4hep/Detector.h"
-#include "DD4hep/Objects.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/IDDescriptor.h"
+#include <XML/Conversions.h>
+#include <DD4hep/Detector.h>
+#include <DD4hep/Objects.h>
+#include <DD4hep/Printout.h>
+#include <DD4hep/IDDescriptor.h>
// ROOT includes
-#include "TMap.h"
-#include "TROOT.h"
-#include "TColor.h"
-#include "TGeoMatrix.h"
-#include "TGeoManager.h"
+#include <TMap.h>
+#include <TROOT.h>
+#include <TColor.h>
+#include <TGeoMatrix.h>
+#include <TGeoManager.h>
/// C/C++ include files
#include <iostream>
diff --git a/DDCore/src/plugins/LCDDConverter.h b/DDCore/src/plugins/LCDDConverter.h
index e553d8878d7e34d1ed9dd9e7d15d8bc6a435a6af..81ab66c765f339de11b87032c24a5339fcd20dc3 100644
--- a/DDCore/src/plugins/LCDDConverter.h
+++ b/DDCore/src/plugins/LCDDConverter.h
@@ -15,9 +15,9 @@
#define DDCORE_SRC_PLUGINS_LCDDCONVERTER_H
// Framework include files
-#include "DD4hep/Detector.h"
-#include "DD4hep/GeoHandler.h"
-#include "DD4hep/DetFactoryHelper.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/GeoHandler.h>
+#include <DD4hep/DetFactoryHelper.h>
// C/C++ include files
#include <set>
diff --git a/DDCore/src/plugins/PandoraConverter.cpp b/DDCore/src/plugins/PandoraConverter.cpp
index b615701f615f73cb8cc53f5879f86afbb6487204..e9475d037abd43d9b628266438fd89e642646818 100644
--- a/DDCore/src/plugins/PandoraConverter.cpp
+++ b/DDCore/src/plugins/PandoraConverter.cpp
@@ -14,9 +14,9 @@
#define DD4HEP_DDCORE_PANDORACONVERTER_H
// Framework include files
-#include "DD4hep/Detector.h"
-#include "DD4hep/GeoHandler.h"
-#include "DD4hep/DetFactoryHelper.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/GeoHandler.h>
+#include <DD4hep/DetFactoryHelper.h>
/*
* dd4hep namespace declaration
@@ -82,10 +82,10 @@ namespace dd4hep {
//==========================================================================
// Framework includes
-#include "DD4hep/Detector.h"
-#include "DD4hep/GeoHandler.h"
-#include "DD4hep/DetFactoryHelper.h"
-#include "XML/DocumentHandler.h"
+#include <DD4hep/Detector.h>
+#include <DD4hep/GeoHandler.h>
+#include <DD4hep/DetFactoryHelper.h>
+#include <XML/DocumentHandler.h>
// C/C++ include files
#include <stdexcept>
diff --git a/DDCore/src/python/PythonPlugin.cpp b/DDCore/src/python/PythonPlugin.cpp
index 70ecfe17d12631386c519e62b80992528e5cb637..eee8dfcf5d263987b13e4fc16c2d3af993109fe5 100644
--- a/DDCore/src/python/PythonPlugin.cpp
+++ b/DDCore/src/python/PythonPlugin.cpp
@@ -12,11 +12,11 @@
//==========================================================================
// Framework include files
-#include "DD4hep/Factories.h"
-#include "DD4hep/Printout.h"
+#include <DD4hep/Factories.h>
+#include <DD4hep/Printout.h>
// ROOT includes
-#include "TPython.h"
+#include <TPython.h>
using namespace std;
using namespace dd4hep;
diff --git a/DDCore/src/segmentations/BitField64.cpp b/DDCore/src/segmentations/BitField64.cpp
index 35bf19b1e861c1cd407e7b8d26585644ee53f9c6..ac7543348d0253d60642624a66b92b4b75e33161 100644
--- a/DDCore/src/segmentations/BitField64.cpp
+++ b/DDCore/src/segmentations/BitField64.cpp
@@ -1,4 +1,14 @@
-#include "DDSegmentation/BitField64.h"
+//==========================================================================
+// 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.
+//
+//==========================================================================
+#include <DDSegmentation/BitField64.h>
#include <cmath>
#include <algorithm>
diff --git a/DDCore/src/segmentations/BitFieldCoder.cpp b/DDCore/src/segmentations/BitFieldCoder.cpp
index 1c3fbed771f2eb5e47c5e882ff7efe1f1dc88816..c35a9676e19ea486332073aaab9bd11d93139adc 100644
--- a/DDCore/src/segmentations/BitFieldCoder.cpp
+++ b/DDCore/src/segmentations/BitFieldCoder.cpp
@@ -1,4 +1,14 @@
-#include "DDSegmentation/BitFieldCoder.h"
+//==========================================================================
+// 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.
+//
+//==========================================================================
+#include <DDSegmentation/BitFieldCoder.h>
#include <cmath>
#include <algorithm>
diff --git a/DDCore/src/segmentations/CartesianGrid.cpp b/DDCore/src/segmentations/CartesianGrid.cpp
index 0dc1ca2a93b357da870ee3bf9b15cea46dcae53a..7d53c20503041a8d761c4ea10e521ff54c5909e1 100644
--- a/DDCore/src/segmentations/CartesianGrid.cpp
+++ b/DDCore/src/segmentations/CartesianGrid.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianGrid.cpp
*
@@ -5,7 +15,7 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/CartesianGrid.h"
+#include <DDSegmentation/CartesianGrid.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/src/segmentations/CartesianGridXY.cpp b/DDCore/src/segmentations/CartesianGridXY.cpp
index 371828a6abf833ee28faadf8e7bc63907267477f..81d929be5ef9929a8edf8754e429b5b171064287 100644
--- a/DDCore/src/segmentations/CartesianGridXY.cpp
+++ b/DDCore/src/segmentations/CartesianGridXY.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianGridXY.cpp
*
@@ -5,7 +15,7 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/CartesianGridXY.h"
+#include <DDSegmentation/CartesianGridXY.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -82,5 +92,5 @@ CellID CartesianGridXY::cellID(const Vector3D& localPosition,
} /* namespace dd4hep */
// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
+// needs also #include <DD4hep/Factories.h>
// DECLARE_SEGMENTATION(CartesianGridXY,dd4hep::create_segmentation<dd4hep::DDSegmentation::CartesianGridXY>)
diff --git a/DDCore/src/segmentations/CartesianGridXYStaggered.cpp b/DDCore/src/segmentations/CartesianGridXYStaggered.cpp
index 504794d7e9f6e812843959db03222d2047f70d99..038e5ef8d40fd6340fe186d3c2e33035fe806ee6 100644
--- a/DDCore/src/segmentations/CartesianGridXYStaggered.cpp
+++ b/DDCore/src/segmentations/CartesianGridXYStaggered.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianGridXYStaggered.cpp
*
@@ -5,7 +15,7 @@
* Author: Sebouh J. Paul, UCR
*/
-#include "DDSegmentation/CartesianGridXYStaggered.h"
+#include <DDSegmentation/CartesianGridXYStaggered.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/src/segmentations/CartesianGridXYZ.cpp b/DDCore/src/segmentations/CartesianGridXYZ.cpp
index a4bec58b4da4f03230c75de63349817dd0dcff51..73333c8537fc42610b1e335c74bbfac337d05f4f 100644
--- a/DDCore/src/segmentations/CartesianGridXYZ.cpp
+++ b/DDCore/src/segmentations/CartesianGridXYZ.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianGridXYZ.cpp
*
@@ -5,7 +15,7 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/CartesianGridXYZ.h"
+#include <DDSegmentation/CartesianGridXYZ.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -74,7 +84,3 @@ std::vector<double> CartesianGridXYZ::cellDimensions(const CellID&) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(CartesianGridXYZ,create_segmentation<dd4hep::DDSegmentation::CartesianGridXYZ>)
diff --git a/DDCore/src/segmentations/CartesianGridXZ.cpp b/DDCore/src/segmentations/CartesianGridXZ.cpp
index 2c151bb0a8baaa6ea8d9d190ed2b705feb42a032..b7327e9e76442052edaea0db6eb07dfa73241401 100644
--- a/DDCore/src/segmentations/CartesianGridXZ.cpp
+++ b/DDCore/src/segmentations/CartesianGridXZ.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianGridXZ.cpp
*
@@ -5,7 +15,7 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/CartesianGridXZ.h"
+#include <DDSegmentation/CartesianGridXZ.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -81,7 +91,3 @@ std::vector<double> CartesianGridXZ::cellDimensions(const CellID&) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(CartesianGridXZ,create_segmentation<dd4hep::DDSegmentation::CartesianGridXZ>)
diff --git a/DDCore/src/segmentations/CartesianGridYZ.cpp b/DDCore/src/segmentations/CartesianGridYZ.cpp
index 47204dcd77215af7a5e685a927b09b20e582355e..9069f406f76963a21397888ffc520519e302e698 100644
--- a/DDCore/src/segmentations/CartesianGridYZ.cpp
+++ b/DDCore/src/segmentations/CartesianGridYZ.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/* CartesianGridYZ.cpp
*
* @date: Sep 03, 2014
@@ -6,7 +16,7 @@
* direkt copy of CartesianGridXY
* by Christian Grefe, CERN
*/
-#include "DDSegmentation/CartesianGridYZ.h"
+#include <DDSegmentation/CartesianGridYZ.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -79,7 +89,3 @@ std::vector<double> CartesianGridYZ::cellDimensions(const CellID&) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(CartesianGridYZ,create_segmentation<dd4hep::DDSegmentation::CartesianGridYZ>)
diff --git a/DDCore/src/segmentations/CartesianStrip.cpp b/DDCore/src/segmentations/CartesianStrip.cpp
index ac1c750a540c4f75673c7e58a25ad64c634e66fa..cc2b145ec6aebd9d3ffdce6c02e25a836a7a8369 100644
--- a/DDCore/src/segmentations/CartesianStrip.cpp
+++ b/DDCore/src/segmentations/CartesianStrip.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianStrip.cpp
*
@@ -6,7 +16,7 @@
* David Blyth, ANL
*/
-#include "DDSegmentation/CartesianStrip.h"
+#include <DDSegmentation/CartesianStrip.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/src/segmentations/CartesianStripX.cpp b/DDCore/src/segmentations/CartesianStripX.cpp
index f0e3743c32a8af534059dd0359e53412775f5a48..c43065972b93f59fe270289634cdd5c64eab02d8 100644
--- a/DDCore/src/segmentations/CartesianStripX.cpp
+++ b/DDCore/src/segmentations/CartesianStripX.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianStripX.cpp
*
@@ -6,7 +16,7 @@
* David Blyth, ANL
*/
-#include "DDSegmentation/CartesianStripX.h"
+#include <DDSegmentation/CartesianStripX.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -64,7 +74,3 @@ std::vector<double> CartesianStripX::cellDimensions(const CellID&) const {
} // namespace DDSegmentation
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(CartesianStripX,create_segmentation<dd4hep::DDSegmentation::CartesianStripX>)
diff --git a/DDCore/src/segmentations/CartesianStripY.cpp b/DDCore/src/segmentations/CartesianStripY.cpp
index 9366f8e263407bd6bb8f61a86d293c539dcdf815..ac9e7d797ee0a3aea73b8ee662f99ca3115c9ad6 100644
--- a/DDCore/src/segmentations/CartesianStripY.cpp
+++ b/DDCore/src/segmentations/CartesianStripY.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianStripY.cpp
*
@@ -6,7 +16,7 @@
* David Blyth, ANL
*/
-#include "DDSegmentation/CartesianStripY.h"
+#include <DDSegmentation/CartesianStripY.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -65,6 +75,3 @@ std::vector<double> CartesianStripY::cellDimensions(const CellID&) const {
} // namespace DDSegmentation
} /* namespace dd4hep */
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(CartesianStripY,create_segmentation<dd4hep::DDSegmentation::CartesianStripY>)
diff --git a/DDCore/src/segmentations/CartesianStripZ.cpp b/DDCore/src/segmentations/CartesianStripZ.cpp
index 3b57882998db3f9d068d8f56ee6a2a7a000c22f2..fcc689932be71f4480bbe92e1fd89cce036ef088 100644
--- a/DDCore/src/segmentations/CartesianStripZ.cpp
+++ b/DDCore/src/segmentations/CartesianStripZ.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CartesianStripZ.cpp
*
@@ -6,7 +16,7 @@
* David Blyth, ANL
*/
-#include "DDSegmentation/CartesianStripZ.h"
+#include <DDSegmentation/CartesianStripZ.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -64,7 +74,3 @@ std::vector<double> CartesianStripZ::cellDimensions(const CellID&) const {
} // namespace DDSegmentation
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(CartesianStripZ,create_segmentation<dd4hep::DDSegmentation::CartesianStripZ>)
diff --git a/DDCore/src/segmentations/CylindricalSegmentation.cpp b/DDCore/src/segmentations/CylindricalSegmentation.cpp
index 8ed982b3bde1cf356cd2adf3b5b32135871f23a9..223f0bf379eca297cb05cc6a5c1d5d221fe2af50 100644
--- a/DDCore/src/segmentations/CylindricalSegmentation.cpp
+++ b/DDCore/src/segmentations/CylindricalSegmentation.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* CylindricalSegmentation.cpp
*
@@ -5,7 +15,7 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/CylindricalSegmentation.h"
+#include <DDSegmentation/CylindricalSegmentation.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/src/segmentations/GridPhiEta.cpp b/DDCore/src/segmentations/GridPhiEta.cpp
index aeb75490c2775db1585332076a323618ef31cc60..e00a2577b2ddabc787ea18e86638b94dca31103f 100644
--- a/DDCore/src/segmentations/GridPhiEta.cpp
+++ b/DDCore/src/segmentations/GridPhiEta.cpp
@@ -1,5 +1,15 @@
-#include "DDSegmentation/GridPhiEta.h"
-#include "DDSegmentation/SegmentationUtil.h"
+//==========================================================================
+// 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.
+//
+//==========================================================================
+#include <DDSegmentation/GridPhiEta.h>
+#include <DDSegmentation/SegmentationUtil.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -57,7 +67,3 @@ double GridPhiEta::phi(const CellID& cID) const {
}
}
}
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(GridPhiEta,create_segmentation<dd4hep::DDSegmentation::GridPhiEta>)
diff --git a/DDCore/src/segmentations/GridRPhiEta.cpp b/DDCore/src/segmentations/GridRPhiEta.cpp
index 7da109951604a86e3de9e04c178782ba7c8ff947..f79aff295465b4f0ca1e8e633271f124470ada33 100644
--- a/DDCore/src/segmentations/GridRPhiEta.cpp
+++ b/DDCore/src/segmentations/GridRPhiEta.cpp
@@ -1,5 +1,15 @@
-#include "DDSegmentation/GridRPhiEta.h"
-#include "DDSegmentation/SegmentationUtil.h"
+//==========================================================================
+// 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.
+//
+//==========================================================================
+#include <DDSegmentation/GridRPhiEta.h>
+#include <DDSegmentation/SegmentationUtil.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -50,6 +60,3 @@ double GridRPhiEta::r(const CellID& cID) const {
}
}
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(GridRPhiEta,create_segmentation<dd4hep::DDSegmentation::GridRPhiEta>)
diff --git a/DDCore/src/segmentations/HexGrid.cpp b/DDCore/src/segmentations/HexGrid.cpp
index 5be6ea35581fea3f37d9362ab1abc3a8459a5285..6235aefcd3524de0b0f710df5d6278b6127bf7fe 100644
--- a/DDCore/src/segmentations/HexGrid.cpp
+++ b/DDCore/src/segmentations/HexGrid.cpp
@@ -12,8 +12,8 @@
* Created on: August 9, 2023
* Author: Sebouh J. Paul, UC Riverside
*/
-#include "DD4hep/Factories.h"
-#include "DDSegmentation/HexGrid.h"
+#include <DD4hep/Factories.h>
+#include <DDSegmentation/HexGrid.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/src/segmentations/MegatileLayerGridXY.cpp b/DDCore/src/segmentations/MegatileLayerGridXY.cpp
index 3ed0fb958d3c9dbc328f3e0f36f7bbfbe6e660da..77a75fd48dbbb963cf071e09e91bf41ca122de90 100644
--- a/DDCore/src/segmentations/MegatileLayerGridXY.cpp
+++ b/DDCore/src/segmentations/MegatileLayerGridXY.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* MegatileLayerGridXY.cpp
*
@@ -186,7 +196,3 @@ namespace dd4hep {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(MegatileLayerGridXY,create_segmentation<dd4hep::DDSegmentation::MegatileLayerGridXY>)
diff --git a/DDCore/src/segmentations/MultiSegmentation.cpp b/DDCore/src/segmentations/MultiSegmentation.cpp
index c00b5ec4e34752bb9627f8f5e2ae2d07b68ad762..2b61cbbc972b4d64ee5cdcc5395e7d4b440140b2 100644
--- a/DDCore/src/segmentations/MultiSegmentation.cpp
+++ b/DDCore/src/segmentations/MultiSegmentation.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* MultiSegmentation.cpp
*
diff --git a/DDCore/src/segmentations/NoSegmentation.cpp b/DDCore/src/segmentations/NoSegmentation.cpp
index 2c4257f0cf40283ed744b7b00ba7d597d8713ca3..d4ff39cf5ca24fc68de865738c0b1b7a195d32da 100644
--- a/DDCore/src/segmentations/NoSegmentation.cpp
+++ b/DDCore/src/segmentations/NoSegmentation.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* NoSegmentation.cpp
*
@@ -5,7 +15,7 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/NoSegmentation.h"
+#include <DDSegmentation/NoSegmentation.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -40,6 +50,3 @@ namespace dd4hep {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(NoSegmentation,create_segmentation<dd4hep::DDSegmentation::NoSegmentation>)
diff --git a/DDCore/src/segmentations/PolarGrid.cpp b/DDCore/src/segmentations/PolarGrid.cpp
index ef858e55430fb881aaef24cabde26362e6eb59c2..51b0bd9f2178e21d7daa498a495fa273260b05a4 100644
--- a/DDCore/src/segmentations/PolarGrid.cpp
+++ b/DDCore/src/segmentations/PolarGrid.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* PolarGrid.cpp
*
@@ -5,7 +15,7 @@
* Author: Marko Petric
*/
-#include "DDSegmentation/PolarGrid.h"
+#include <DDSegmentation/PolarGrid.h>
namespace dd4hep {
namespace DDSegmentation {
diff --git a/DDCore/src/segmentations/PolarGridRPhi.cpp b/DDCore/src/segmentations/PolarGridRPhi.cpp
index 8ad9473612129316f88b56e0c174216024e107a5..f549cde12d9d0e9cba0b65d6da2eb0a2def7ec98 100644
--- a/DDCore/src/segmentations/PolarGridRPhi.cpp
+++ b/DDCore/src/segmentations/PolarGridRPhi.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* PolarGridRPhi.cpp
*
@@ -5,7 +15,7 @@
* Author: Marko Petric
*/
-#include "DDSegmentation/PolarGridRPhi.h"
+#include <DDSegmentation/PolarGridRPhi.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -85,6 +95,3 @@ std::vector<double> PolarGridRPhi::cellDimensions(const CellID& cID) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(PolarGridRPhi,create_segmentation<dd4hep::DDSegmentation::PolarGridRPhi>)
diff --git a/DDCore/src/segmentations/PolarGridRPhi2.cpp b/DDCore/src/segmentations/PolarGridRPhi2.cpp
index adf4a4446d522d137de17176b548058046137478..b294315aead3ab6ee1f5d8fb5edc513d32904df5 100644
--- a/DDCore/src/segmentations/PolarGridRPhi2.cpp
+++ b/DDCore/src/segmentations/PolarGridRPhi2.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* PolarGridRPhi2.cpp
*
@@ -5,7 +15,7 @@
* Author: Marko Petric, Andre Sailer
*/
-#include "DDSegmentation/PolarGridRPhi2.h"
+#include <DDSegmentation/PolarGridRPhi2.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -106,7 +116,3 @@ std::vector<double> PolarGridRPhi2::cellDimensions(const CellID& cID) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(PolarGridRPhi2,create_segmentation<dd4hep::DDSegmentation::PolarGridRPhi2>)
diff --git a/DDCore/src/segmentations/ProjectiveCylinder.cpp b/DDCore/src/segmentations/ProjectiveCylinder.cpp
index 3819e4baded06cd655864356fb16427ae93ad502..dd014d81c161021ff47ec439b4b9b0ce36fc55eb 100644
--- a/DDCore/src/segmentations/ProjectiveCylinder.cpp
+++ b/DDCore/src/segmentations/ProjectiveCylinder.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* ProjectiveCylinder.cpp
*
@@ -5,8 +15,8 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/ProjectiveCylinder.h"
-#include "DDSegmentation/SegmentationUtil.h"
+#include <DDSegmentation/ProjectiveCylinder.h>
+#include <DDSegmentation/SegmentationUtil.h>
#define _USE_MATH_DEFINES
#include <cmath>
@@ -84,6 +94,3 @@ double ProjectiveCylinder::phi(const CellID& cID) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(ProjectiveCylinder,create_segmentation<dd4hep::DDSegmentation::ProjectiveCylinder>)
diff --git a/DDCore/src/segmentations/Segmentation.cpp b/DDCore/src/segmentations/Segmentation.cpp
index d6906747041c752ab94c303b5580f8069b8e499c..834e8485e97cf0877b05d0426f7d1dc744018d33 100644
--- a/DDCore/src/segmentations/Segmentation.cpp
+++ b/DDCore/src/segmentations/Segmentation.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* Segmentation.cpp
*
@@ -5,7 +15,7 @@
* Author: Christian Grefe, CERN
*/
-#include "DDSegmentation/Segmentation.h"
+#include <DDSegmentation/Segmentation.h>
#include <iostream>
#include <sstream>
diff --git a/DDCore/src/segmentations/TiledLayerGridXY.cpp b/DDCore/src/segmentations/TiledLayerGridXY.cpp
index a3630381a8310a1d74d474bc81c53e408dd808d0..987f8eee6970a4b351749c6a59796fdb17c6b823 100644
--- a/DDCore/src/segmentations/TiledLayerGridXY.cpp
+++ b/DDCore/src/segmentations/TiledLayerGridXY.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* TiledLayerGridXY.cpp
*
@@ -125,7 +135,3 @@ std::vector<double> TiledLayerGridXY::cellDimensions(const CellID&) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(TiledLayerGridXY,create_segmentation<dd4hep::DDSegmentation::TiledLayerGridXY>)
diff --git a/DDCore/src/segmentations/TiledLayerSegmentation.cpp b/DDCore/src/segmentations/TiledLayerSegmentation.cpp
index d2997687cb5561761f32f4b22e7e2349f086fa12..47a5f100f5d5146b9a6ce9660ac7068116942f89 100644
--- a/DDCore/src/segmentations/TiledLayerSegmentation.cpp
+++ b/DDCore/src/segmentations/TiledLayerSegmentation.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* TiledLayerSegmentation.cpp
*
@@ -5,7 +15,7 @@
* Author: cgrefe
*/
-#include "DDSegmentation/TiledLayerSegmentation.h"
+#include <DDSegmentation/TiledLayerSegmentation.h>
// C/C++ includes
#include <algorithm>
diff --git a/DDCore/src/segmentations/WaferGridXY.cpp b/DDCore/src/segmentations/WaferGridXY.cpp
index 608c975497568693428be2e9ad63e6111295f2f7..325945ff581e71452219d97a7448fde2e4519ed0 100644
--- a/DDCore/src/segmentations/WaferGridXY.cpp
+++ b/DDCore/src/segmentations/WaferGridXY.cpp
@@ -1,3 +1,13 @@
+//==========================================================================
+// 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.
+//
+//==========================================================================
/*
* WaferGridXY.cpp
*
@@ -5,7 +15,7 @@
* Author: S. Lu, DESY
*/
-#include "DDSegmentation/WaferGridXY.h"
+#include <DDSegmentation/WaferGridXY.h>
namespace dd4hep {
namespace DDSegmentation {
@@ -128,7 +138,3 @@ std::vector<double> WaferGridXY::cellDimensions(const CellID&) const {
} /* namespace DDSegmentation */
} /* namespace dd4hep */
-
-// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore
-// needs also #include "DD4hep/Factories.h"
-// DECLARE_SEGMENTATION(WaferGridXY,create_segmentation<dd4hep::DDSegmentation::WaferGridXY>)
diff --git a/DDDigi/include/DDDigi/DigiAction.h b/DDDigi/include/DDDigi/DigiAction.h
index 31dfb86eba6118de12494b060103f7209d632e58..cd1192a338bd10a071f6ccc6528881c78f2a4094 100644
--- a/DDDigi/include/DDDigi/DigiAction.h
+++ b/DDDigi/include/DDDigi/DigiAction.h
@@ -15,7 +15,7 @@
// Framework include files
#include <DD4hep/Printout.h>
-#include <DD4hep/ObjectExtensions.h>
+#include <DD4hep/ExtensionEntry.h>
#include <DD4hep/ComponentProperties.h>
#include <DDDigi/DigiContext.h>
@@ -118,12 +118,12 @@ namespace dd4hep {
/// Default destructor
virtual ~Extension() = default;
/// Wrapper for the object destruction
- virtual void* object() const override { return ptr; }
+ virtual void* object() const override { return ptr; }
/// Wrapper for the object destruction
- virtual void destruct() const override { delete ptr; }
- virtual void* copy(void*) const override { return nullptr; }
- virtual ExtensionEntry* clone(void*) const override { return nullptr; }
- virtual unsigned long long int hash64() const override { return uint64_t(ptr); }
+ virtual void destruct() const override { delete ptr; }
+ virtual void* copy(void*) const override { invalidCall("copy"); return nullptr; }
+ virtual ExtensionEntry* clone(void*) const override { invalidCall("clone"); return nullptr; }
+ virtual unsigned long long int hash64() const override { return uint64_t(ptr); }
};
@@ -144,8 +144,6 @@ namespace dd4hep {
std::string m_name;
/// Property pool
PropertyManager m_properties;
- ///
- std::vector<void*> m_opt_properties;
/// Object extensions if used
extensions_t m_extensions;
/// Reference count. Initial value: 1
@@ -255,21 +253,21 @@ namespace dd4hep {
/// Declare property
template <typename T> DigiAction& DigiAction::declareProperty(const std::string& nam, T& val) {
- m_properties.add(nam, val);
+ this->m_properties.add(nam, val);
return *this;
}
/// Declare property
template <typename T> DigiAction& DigiAction::declareProperty(const char* nam, T& val) {
- m_properties.add(nam, val);
+ this->m_properties.add(nam, val);
return *this;
}
/// Declare property
template <typename T> DigiAction& DigiAction::addProperty(const std::string& nam, T& val) {
void* ptr = ::operator new(sizeof(T));
T* prop = new(ptr) T(val);
- m_properties.add(nam, *prop);
- m_opt_properties.emplace_back(ptr);
+ this->m_properties.add(nam, *prop);
+ this->addExtension(prop);
return *this;
}
@@ -277,8 +275,8 @@ namespace dd4hep {
template <typename T> DigiAction& DigiAction::addProperty(const char* nam, T& val) {
void* ptr = ::operator new(sizeof(T));
T* prop = new(ptr) T(val);
- m_properties.add(nam, *prop);
- m_opt_properties.emplace_back(ptr);
+ this->m_properties.add(nam, *prop);
+ this->addExtension(prop);
return *this;
}
} // End namespace digi
diff --git a/DDDigi/src/DigiAction.cpp b/DDDigi/src/DigiAction.cpp
index 15371b9640ead5ae6ba97e9e18503a8cc45a7a92..645f5c890d475e270ef04f18da77dfcc41bc3442 100644
--- a/DDDigi/src/DigiAction.cpp
+++ b/DDDigi/src/DigiAction.cpp
@@ -49,7 +49,6 @@ DigiAction::~DigiAction() {
for( auto& ptr : m_extensions )
ptr.second->destruct();
m_extensions.clear();
- m_opt_properties.clear();
InstanceCount::decrement(this);
}
@@ -241,11 +240,9 @@ namespace dd4hep {
namespace digi {
template <typename VAL>
int add_action_property(DigiAction* action, const std::string& name, VAL value) {
- VAL* new_val = new VAL(value);
- action->addProperty(name, *(new_val));
- action->addExtension(new_val);
+ action->addProperty(name, value);
printout(INFO, "addProperty", "+++ Added property %s of type %s",
- name.c_str(), typeName(typeid(VAL)).c_str());
+ name.c_str(), typeName(typeid(VAL)).c_str());
return 1;
}