diff --git a/DDAlign/include/DDAlign/AlignmentTags.h b/DDAlign/include/DDAlign/AlignmentTags.h
index d2c2fe56b2a2efd16c651f5df39e6bc438f2bdc3..2aeec5508905e7b7b0ce30a6f3faad8b2bb3eacf 100644
--- a/DDAlign/include/DDAlign/AlignmentTags.h
+++ b/DDAlign/include/DDAlign/AlignmentTags.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/GlobalAlignmentStack.h b/DDAlign/include/DDAlign/GlobalAlignmentStack.h
index e6a4373eba24f72b7d13eada70273961277bd2bd..611e220656b73fb38e75ae38c65ce34d69db4b7b 100644
--- a/DDAlign/include/DDAlign/GlobalAlignmentStack.h
+++ b/DDAlign/include/DDAlign/GlobalAlignmentStack.h
@@ -50,7 +50,8 @@ namespace dd4hep {
* \version 1.0
* \ingroup DD4HEP_ALIGN
*/
- struct StackEntry {
+ class StackEntry {
+ public:
/// Reference to the detector element
DetElement detector;
/// Delta transformation to be applied
diff --git a/DDCond/include/DDCond/ConditionsContent.h b/DDCond/include/DDCond/ConditionsContent.h
index f4114d28b1950e58159973ab9382ec0f38fa954b..722ff0727b8565df97a9015b1ddb789cef19ba99 100644
--- a/DDCond/include/DDCond/ConditionsContent.h
+++ b/DDCond/include/DDCond/ConditionsContent.h
@@ -67,7 +67,8 @@ namespace dd4hep {
* \version 1.0
* \date 31/03/2016
*/
- template <typename T> struct LoadInfo : public ConditionsLoadInfo {
+ template <typename T> class LoadInfo : public ConditionsLoadInfo {
+ public:
T info;
LoadInfo(const T& i) : info(i) {}
LoadInfo() = default;
diff --git a/DDCond/include/DDCond/ConditionsSelectors.h b/DDCond/include/DDCond/ConditionsSelectors.h
index b434d30b5e572db71c05665a6bb7a1251861637f..e909de6fd0355a97fc847e5bfc69059df22e873a 100644
--- a/DDCond/include/DDCond/ConditionsSelectors.h
+++ b/DDCond/include/DDCond/ConditionsSelectors.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsTextRepository.h b/DDCond/include/DDCond/ConditionsTextRepository.h
index d89e2de7a29fdfbd787866f79d355fd4d76e31e9..3bb0ff53899f320565e8a19da19b6a2b13dfba6a 100644
--- a/DDCond/include/DDCond/ConditionsTextRepository.h
+++ b/DDCond/include/DDCond/ConditionsTextRepository.h
@@ -1,4 +1,3 @@
-// $Id: ConditionsTextrepository.h 2336 2016-09-07 17:27:40Z markus.frank@cern.ch $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDCond/src/plugins/ConditionsLinearPool.cpp b/DDCond/src/plugins/ConditionsLinearPool.cpp
index 1496d9fffea7d8608907d04f1cc36bd04025670e..bcc0951caa97722c81dec1343fd48771d992066f 100644
--- a/DDCond/src/plugins/ConditionsLinearPool.cpp
+++ b/DDCond/src/plugins/ConditionsLinearPool.cpp
@@ -171,7 +171,6 @@ namespace dd4hep {
} /* End namespace dd4hep */
#endif // DDCOND_CONDITIONSLINEARPOOL_H
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/DetElement.h b/DDCore/include/DD4hep/DetElement.h
index 4ac645527f362e7d4a3eb98d088eb878ee770043..236ddce6d31aea0f3ef88d1bd1cf27ef642d7d8e 100644
--- a/DDCore/include/DD4hep/DetElement.h
+++ b/DDCore/include/DD4hep/DetElement.h
@@ -202,7 +202,7 @@ namespace dd4hep {
protected:
- template <typename Q, typename T> struct DetElementExtension : public ExtensionEntry {
+ template <typename Q, typename T> class DetElementExtension : public ExtensionEntry {
protected:
T* ptr = 0;
mutable Q* iface = 0; //!
diff --git a/DDCore/include/DD4hep/ExtensionEntry.h b/DDCore/include/DD4hep/ExtensionEntry.h
index 9542523bc22f626c075dac0363e5abe682e9a056..e251a3cb927bbf95f3717a8bc0eaf2d21ed68673 100644
--- a/DDCore/include/DD4hep/ExtensionEntry.h
+++ b/DDCore/include/DD4hep/ExtensionEntry.h
@@ -72,7 +72,7 @@ namespace dd4hep {
* \date 13.08.2013
* \ingroup DD4HEP
*/
- template <typename Q,typename T> struct SimpleExtension : public ExtensionEntry {
+ template <typename Q,typename T> class SimpleExtension : public ExtensionEntry {
protected:
T* ptr = 0;
mutable Q* iface = 0; //!
@@ -114,7 +114,7 @@ namespace dd4hep {
* \date 13.08.2013
* \ingroup DD4HEP
*/
- template <typename Q,typename T> struct DeleteExtension : public ExtensionEntry {
+ template <typename Q,typename T> class DeleteExtension : public ExtensionEntry {
protected:
T* ptr = 0;
mutable Q* iface = 0; //!
@@ -156,7 +156,7 @@ namespace dd4hep {
* \date 13.08.2013
* \ingroup DD4HEP
*/
- template <typename Q,typename T> struct CopyDeleteExtension : public ExtensionEntry {
+ template <typename Q,typename T> class CopyDeleteExtension : public ExtensionEntry {
protected:
T* ptr = 0;
mutable Q* iface = 0; //!
diff --git a/DDCore/src/plugins/PandoraConverter.cpp b/DDCore/src/plugins/PandoraConverter.cpp
index 5c761ce47e9b3271497d3c20f98b1aad2c8e981a..c55ef85eee43d7e489cdf74f3581f8f0b7ad8d73 100644
--- a/DDCore/src/plugins/PandoraConverter.cpp
+++ b/DDCore/src/plugins/PandoraConverter.cpp
@@ -199,8 +199,8 @@ static long create_description(Detector& /* description */, int /* argc */, char
* This class converts from a compact detector description into slicPandora's
* geometry input format.
*
- * @author Jeremy McCormick <jeremym@slac.stanford.edu>
- * @version $Id$
+ * @author Jeremy McCormick <jeremym@slac.stanford.edu>
+ * @version 1.0
*/
public class Main implements Converter
{
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index 31cdd1acff3a669ae25951796decdf65f43bd3e7..4345a1ceaeb92070ad80a27fc08315168e02493f 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -759,14 +759,14 @@ static long dump_volume_tree(Detector& description, int argc, char** argv) {
if ( m_printMaterials ) {
Volume vol = pv.volume();
Material mat = vol.material();
- TGeoMaterial* m = mat->GetMaterial();
- bool ok = mat.A() == m->GetA() && mat.Z() == m->GetZ();
+ TGeoMaterial* mptr = mat->GetMaterial();
+ bool ok = mat.A() == mptr->GetA() && mat.Z() == mptr->GetZ();
::snprintf(fmt,sizeof(fmt),"%03d %%-%ds Material: %%-16s A:%%f %%f Z:%%f %%f",
level+1,2*level+1);
++m_numMaterial;
if ( !ok ) ++m_numMaterialERR;
printout(ok ? INFO : ERROR,
- "VolumeDump", fmt, "", mat.name(), mat.A(), m->GetA(), mat.Z(), m->GetZ());
+ "VolumeDump", fmt, "", mat.name(), mat.A(), mptr->GetA(), mat.Z(), mptr->GetZ());
}
for (Int_t idau = 0, ndau = aligned->GetNdaughters(); idau < ndau; ++idau) {
if ( ideal ) {
diff --git a/DDCore/src/segmentations/CartesianGridYZ.cpp b/DDCore/src/segmentations/CartesianGridYZ.cpp
index 50b11384e42e4e2ebcc16745a35b126f62018f3d..b26f9e605753cefa8ca69c6c224ead87c41cef1a 100644
--- a/DDCore/src/segmentations/CartesianGridYZ.cpp
+++ b/DDCore/src/segmentations/CartesianGridYZ.cpp
@@ -1,8 +1,8 @@
/* CartesianGridYZ.cpp
*
- * @date: Sep 03, 2014
- * @author: F.Gaede CERN/Desy
- * @version: $Id: $
+ * @date: Sep 03, 2014
+ * @author: F.Gaede CERN/Desy
+ * @version: 1.0
* direkt copy of CartesianGridXY
* by Christian Grefe, CERN
*/
diff --git a/DDDetectors/src/BoxSegment_geo.cpp b/DDDetectors/src/BoxSegment_geo.cpp
index 2762c115d5ffab1394c0714e57cd278333833d73..3f7079ace996fce6b937db7f42c38cb7c94ff9a0 100644
--- a/DDDetectors/src/BoxSegment_geo.cpp
+++ b/DDDetectors/src/BoxSegment_geo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/CaloFaceBarrel_surfaces.cpp b/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
index a506cd5ab087b7ed00a32da70c51eab43b5a44c8..5d4ebc9fba37caa3c49775913853c87940fd0c95 100644
--- a/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
+++ b/DDDetectors/src/CaloFaceBarrel_surfaces.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/CaloFaceEndcap_surfaces.cpp b/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
index ae696a5d94a4ff8ff18cff2a3637eaa9b16b86c2..e08eb56652317fd4966043b9db247e484e42cd53 100644
--- a/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
+++ b/DDDetectors/src/CaloFaceEndcap_surfaces.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/DiskTracker_geo.cpp b/DDDetectors/src/DiskTracker_geo.cpp
index 67f6f0ec3c83483f8b926b3c40e762ce34ffc74c..75bb698b9140ac6089b23fb3fd171bfc19e74cf4 100644
--- a/DDDetectors/src/DiskTracker_geo.cpp
+++ b/DDDetectors/src/DiskTracker_geo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/EcalBarrel_geo.cpp b/DDDetectors/src/EcalBarrel_geo.cpp
index ef453d561d8429c4293487231bdd23ddf7d19ba4..f8332e9e9c44e7655e1c5e7391fe64637e4f0959 100644
--- a/DDDetectors/src/EcalBarrel_geo.cpp
+++ b/DDDetectors/src/EcalBarrel_geo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/ForwardDetector_geo.cpp b/DDDetectors/src/ForwardDetector_geo.cpp
index 40a4e0331022dada02696f32f4323d5d9efbf067..6241d310e33eea457286bc9bb8f35c4ead6f3cfa 100644
--- a/DDDetectors/src/ForwardDetector_geo.cpp
+++ b/DDDetectors/src/ForwardDetector_geo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerEndcap2_geo.cpp b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
index 275946b02568cf45ed12de29086fd9349b0a13f6..3337d6529008d131ff305b6cddb15e60865e88b7 100644
--- a/DDDetectors/src/SiTrackerEndcap2_geo.cpp
+++ b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SubdetectorAssembly_geo.cpp b/DDDetectors/src/SubdetectorAssembly_geo.cpp
index ec408bb7ef40ccf6f668a31b25021f87ebd7c03f..52b769b94c324e118536bf3b86b7da5d24d5c447 100644
--- a/DDDetectors/src/SubdetectorAssembly_geo.cpp
+++ b/DDDetectors/src/SubdetectorAssembly_geo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDDetectors/src/TubeSegment_geo.cpp b/DDDetectors/src/TubeSegment_geo.cpp
index 940a5be1a578396d10770da239cf6923735d9686..36fcb987b4b46f877706ca525c38e45c5481d7a2 100644
--- a/DDDetectors/src/TubeSegment_geo.cpp
+++ b/DDDetectors/src/TubeSegment_geo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/lcio/LCIOEventHandler.cpp b/DDEve/lcio/LCIOEventHandler.cpp
index 7ee523ddd057b3f36f96766b0b49f5c8ec39750b..933ae60dcbde8cabedaf07449c6487e11141a56d 100644
--- a/DDEve/lcio/LCIOEventHandler.cpp
+++ b/DDEve/lcio/LCIOEventHandler.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/lcio/LCIOEventHandler.h b/DDEve/lcio/LCIOEventHandler.h
index d95a7196efebad96af4b2e85e5135bb0e49981c7..a01d07f1916d84827fb3a2d47e94f1839fd1b15a 100644
--- a/DDEve/lcio/LCIOEventHandler.h
+++ b/DDEve/lcio/LCIOEventHandler.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
@@ -16,7 +15,6 @@
// Framework include files
#include "DDEve/EventHandler.h"
-
#include "lcio.h"
// C/C++ include files
diff --git a/DDEve/src/Annotation.cpp b/DDEve/src/Annotation.cpp
index a20ea90e4386211525929e8d3f2b843e5ea3a5c4..2aa6565db61ab4a8e365925d35ad62c38648e24c 100644
--- a/DDEve/src/Annotation.cpp
+++ b/DDEve/src/Annotation.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/Calo2DProjection.cpp b/DDEve/src/Calo2DProjection.cpp
index 68d34faacd2c4ba5cd020d9b8c27acb7dafb8e2a..09101b8879e3039a99ba8016015c0cac70c06758 100644
--- a/DDEve/src/Calo2DProjection.cpp
+++ b/DDEve/src/Calo2DProjection.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/Calo3DProjection.cpp b/DDEve/src/Calo3DProjection.cpp
index 5173caf117e7049d8e55a26d98f3081807f2af62..d1c05baa2197e20a1d9404514c2b2a689e979408 100644
--- a/DDEve/src/Calo3DProjection.cpp
+++ b/DDEve/src/Calo3DProjection.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/CaloLego.cpp b/DDEve/src/CaloLego.cpp
index 40a194f3e0e767025a651b5f17ef6f52aa7e1a5d..40c01e9f4390435a17dc2763fece1ecc9099651b 100644
--- a/DDEve/src/CaloLego.cpp
+++ b/DDEve/src/CaloLego.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/ContextMenu.cpp b/DDEve/src/ContextMenu.cpp
index 1150da3f8583e52e55eb1e1189fdd004b246ecdc..1089a96c55bc59fc35d231862138a5f93d0dac4d 100644
--- a/DDEve/src/ContextMenu.cpp
+++ b/DDEve/src/ContextMenu.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/DDEveEventData.cpp b/DDEve/src/DDEveEventData.cpp
index aa640dfeeb344e0376a58ea4123b63f155610bfc..5a48804c6dde873afb2ea71a5a737cdb5cdbecaa 100644
--- a/DDEve/src/DDEveEventData.cpp
+++ b/DDEve/src/DDEveEventData.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/DDEvePlugins.cpp b/DDEve/src/DDEvePlugins.cpp
index 47f2b49c0838885a4b228ca17088d410f3d40b9a..ed1b29d95ae30dd3744a978c0aebd73f56cb078c 100644
--- a/DDEve/src/DDEvePlugins.cpp
+++ b/DDEve/src/DDEvePlugins.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/DDG4EventHandler.cpp b/DDEve/src/DDG4EventHandler.cpp
index fb412e01e20d317a20a61a4723e4d3a340d479f6..69b51e11bf40d546b43311b96565e21e0db95ebb 100644
--- a/DDEve/src/DDG4EventHandler.cpp
+++ b/DDEve/src/DDG4EventHandler.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/DisplayConfiguration.cpp b/DDEve/src/DisplayConfiguration.cpp
index 4d1eb35ef55a142c204074b4f336f0670deefc35..463480aa3c1e0a3f590a889cd62f6f5d5452746b 100644
--- a/DDEve/src/DisplayConfiguration.cpp
+++ b/DDEve/src/DisplayConfiguration.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/EvePgonSetProjectedContextMenu.cpp b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
index 16b86915258def85f5d7cd9e3a105ff8a88842d3..f27a301ee3e6372506afea024651756727c761ed 100644
--- a/DDEve/src/EvePgonSetProjectedContextMenu.cpp
+++ b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/EveShapeContextMenu.cpp b/DDEve/src/EveShapeContextMenu.cpp
index 7383cd2921bcc1d0d3347253acb4e002e160b75a..c2399a509d7fa709ba8f23f6d63fd7d287071905 100644
--- a/DDEve/src/EveShapeContextMenu.cpp
+++ b/DDEve/src/EveShapeContextMenu.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/EveUserContextMenu.cpp b/DDEve/src/EveUserContextMenu.cpp
index ca3d6aeda8ba3f2c3429020abb056b1622c5ad4e..6b79eeb1162a82fbd00b62f518b32f31821401c0 100644
--- a/DDEve/src/EveUserContextMenu.cpp
+++ b/DDEve/src/EveUserContextMenu.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/FrameControl.cpp b/DDEve/src/FrameControl.cpp
index ad5b72a937f780aca6742fa3479d0ed71f3048d9..5ffc54a89a0ef1f44f810dcc2e2b180d09a8c335 100644
--- a/DDEve/src/FrameControl.cpp
+++ b/DDEve/src/FrameControl.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/HitActors.cpp b/DDEve/src/HitActors.cpp
index b8a15347d96f159bec8b7973210e7c9ad56ad9a1..f5b4b551b38a776d29ab38bfd4f787b438783406 100644
--- a/DDEve/src/HitActors.cpp
+++ b/DDEve/src/HitActors.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/MultiView.cpp b/DDEve/src/MultiView.cpp
index d2e2d9f74dd0c0ee64f1469c9aba0e2f57019005..598d8863ba1cc84f9fac38b4229e01a6344f02c5 100644
--- a/DDEve/src/MultiView.cpp
+++ b/DDEve/src/MultiView.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/ParticleActors.cpp b/DDEve/src/ParticleActors.cpp
index 5a6793da0d48b437a3bfa48a5f0f80e1da84e602..beb752b183b140acf5388109a46c56701c7d3676 100644
--- a/DDEve/src/ParticleActors.cpp
+++ b/DDEve/src/ParticleActors.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/PopupMenu.cpp b/DDEve/src/PopupMenu.cpp
index e1e85ed56be5c902ecf5d40be5057fb53e5fc525..1dd5e186dd264cc80cf3da5861b338d94e6dfe6f 100644
--- a/DDEve/src/PopupMenu.cpp
+++ b/DDEve/src/PopupMenu.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/RhoPhiProjection.cpp b/DDEve/src/RhoPhiProjection.cpp
index 75205d696b70b066791bd6578c7fe5fea085e55f..4d1c3356ae7d3d8bd7b1cce36e2cee06d400ac57 100644
--- a/DDEve/src/RhoPhiProjection.cpp
+++ b/DDEve/src/RhoPhiProjection.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/RhoZProjection.cpp b/DDEve/src/RhoZProjection.cpp
index 930836998cf3b663defea11efab3341c9f8790ae..a273b56a2386ab4834f52be53674513cdba51bc1 100644
--- a/DDEve/src/RhoZProjection.cpp
+++ b/DDEve/src/RhoZProjection.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/View.cpp b/DDEve/src/View.cpp
index f039097baade692090089be1281a3e9a2e4aca20..5e128b070f4009bea20a575d7ca56c651dc777bf 100644
--- a/DDEve/src/View.cpp
+++ b/DDEve/src/View.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/View3D.cpp b/DDEve/src/View3D.cpp
index e3cfbbd3866e6342db4cb684505711389f5608cf..55f16fff7a1f4ec775091baaa04ed0f70b6e0d6f 100644
--- a/DDEve/src/View3D.cpp
+++ b/DDEve/src/View3D.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDEve/src/ViewMenu.cpp b/DDEve/src/ViewMenu.cpp
index c49353695ad01bcbbe35f00f17c1f3856da7a3a1..12e9fc633ca034a2a3647dd995e7af40a141c9bf 100644
--- a/DDEve/src/ViewMenu.cpp
+++ b/DDEve/src/ViewMenu.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/examples/TEve.C b/DDG4/examples/TEve.C
index f1cc577968a44d80892d37a04b6b7080fd8eb516..98683b4073556096dfe0a984e3c137b0c7efdce9 100644
--- a/DDG4/examples/TEve.C
+++ b/DDG4/examples/TEve.C
@@ -1,4 +1,3 @@
-// $Id: Geant4Data.h 513 2013-04-05 14:31:53Z gaede $
//====================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------
diff --git a/DDG4/examples/initAClick.C b/DDG4/examples/initAClick.C
index 3567ce4d029e0ac7361af95e5eadf11ec6b2c958..7b817df9767c91a9e0ab92740785c3b61d29fee6 100644
--- a/DDG4/examples/initAClick.C
+++ b/DDG4/examples/initAClick.C
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/examples/run.C b/DDG4/examples/run.C
index 0605c4de33c1c82fa9537ad16b58618cf67a8b15..edba4399c552f533c8db016c447e5e9416bddcd1 100644
--- a/DDG4/examples/run.C
+++ b/DDG4/examples/run.C
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/ComponentUtils.h b/DDG4/include/DDG4/ComponentUtils.h
index 5cd9e5a48cd1a46ce71944ce81a37fada80777f2..2d77d02896acc23298fce9bbf270c56bcb201507 100644
--- a/DDG4/include/DDG4/ComponentUtils.h
+++ b/DDG4/include/DDG4/ComponentUtils.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GDMLDetector.h b/DDG4/include/DDG4/Geant4GDMLDetector.h
index c669aaf3229948d16fef2199f9133c88633601e8..986ea9a9602d4e742c39bc255c0d2919bc70e7af 100644
--- a/DDG4/include/DDG4/Geant4GDMLDetector.h
+++ b/DDG4/include/DDG4/Geant4GDMLDetector.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeneratorAction.h b/DDG4/include/DDG4/Geant4GeneratorAction.h
index 20e0fcdebfd381b963babb08c5cb46d78e26c4c2..f588a94de338720f88d3a66f52576cb1b1855ede 100644
--- a/DDG4/include/DDG4/Geant4GeneratorAction.h
+++ b/DDG4/include/DDG4/Geant4GeneratorAction.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeneratorActionInit.h b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
index ff83fef329bafa695514ce347b6a3bc51042194f..82c2d3c98f816a5b75997949e2d34d21372dcc3e 100644
--- a/DDG4/include/DDG4/Geant4GeneratorActionInit.h
+++ b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeneratorWrapper.h b/DDG4/include/DDG4/Geant4GeneratorWrapper.h
index f6495f3a5a89bdbc8a64a07068a2c7725ab58693..3179a8d98afb55fcdd86de730206ef960ae4e65f 100644
--- a/DDG4/include/DDG4/Geant4GeneratorWrapper.h
+++ b/DDG4/include/DDG4/Geant4GeneratorWrapper.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeometryInfo.h b/DDG4/include/DDG4/Geant4GeometryInfo.h
index 477e5fb0abbfc1aa6e3bc6be8dafb8a3c59cd98c..059732d6bfed352b229875b2448eddb0cfc11609 100644
--- a/DDG4/include/DDG4/Geant4GeometryInfo.h
+++ b/DDG4/include/DDG4/Geant4GeometryInfo.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4HitCollection.h b/DDG4/include/DDG4/Geant4HitCollection.h
index 6e531f413a55f7bf055427c2ed34c7ecea4e1c32..31a00fd9d953296b98ff77675cce69d62892c4b5 100644
--- a/DDG4/include/DDG4/Geant4HitCollection.h
+++ b/DDG4/include/DDG4/Geant4HitCollection.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Hits.h b/DDG4/include/DDG4/Geant4Hits.h
index d5176a12b007d016f9c4a21e9b6710130ca64d4f..ad1772d320f06712e7c2ec488ead9650a0393f4b 100644
--- a/DDG4/include/DDG4/Geant4Hits.h
+++ b/DDG4/include/DDG4/Geant4Hits.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InputHandling.h b/DDG4/include/DDG4/Geant4InputHandling.h
index c41906d20ca5208d8acccd64a24aa64045f1c469..af2cdf13c48e724d5987cc83b2eb14d5c2ba3969 100644
--- a/DDG4/include/DDG4/Geant4InputHandling.h
+++ b/DDG4/include/DDG4/Geant4InputHandling.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4MonteCarloTruth.h b/DDG4/include/DDG4/Geant4MonteCarloTruth.h
index 248e16fb3b46508acf19dfda6c638962c82d2be3..c82b2321e325ec5eee4066c29f2b2fbeef1ce874 100644
--- a/DDG4/include/DDG4/Geant4MonteCarloTruth.h
+++ b/DDG4/include/DDG4/Geant4MonteCarloTruth.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Output2ROOT.h b/DDG4/include/DDG4/Geant4Output2ROOT.h
index 9be1e1c98bf471e49a97a013fcd5fc94cde99aca..206a98550f0a6acd51a0c689b2cefc9d5836409f 100644
--- a/DDG4/include/DDG4/Geant4Output2ROOT.h
+++ b/DDG4/include/DDG4/Geant4Output2ROOT.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleGenerator.h b/DDG4/include/DDG4/Geant4ParticleGenerator.h
index 6099e9f66cc58d948dfdcaa1686cc0f3c55941c6..ce5f08ac2579920a126f36da574478b3193f8a40 100644
--- a/DDG4/include/DDG4/Geant4ParticleGenerator.h
+++ b/DDG4/include/DDG4/Geant4ParticleGenerator.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleGun.h b/DDG4/include/DDG4/Geant4ParticleGun.h
index 5f2f62139422b6a3cfa5fa1b7088165894f10b50..a487c41fddf82984606862456c6024bf89a21f78 100644
--- a/DDG4/include/DDG4/Geant4ParticleGun.h
+++ b/DDG4/include/DDG4/Geant4ParticleGun.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h b/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h
index ba3414d876882515d7152c04a24eeeda1a1aa5ce..30ccc933738295f7284dd928ab52aaa7c39e0942 100644
--- a/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h
+++ b/DDG4/include/DDG4/Geant4SensitiveDetector_inline.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4StackingAction.h b/DDG4/include/DDG4/Geant4StackingAction.h
index 916f53f04db30a3e4f6a947c5a582c32e8311878..822f98a0d4f4896d7a3b55d73b4d2517b3c07f08 100644
--- a/DDG4/include/DDG4/Geant4StackingAction.h
+++ b/DDG4/include/DDG4/Geant4StackingAction.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4StepHandler.h b/DDG4/include/DDG4/Geant4StepHandler.h
index 495023caeaedbbb8d28f72925777e7b8a6065d24..3322e3b1203de641c9aa2293fc0ab0484c5e95f1 100644
--- a/DDG4/include/DDG4/Geant4StepHandler.h
+++ b/DDG4/include/DDG4/Geant4StepHandler.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TestActions.h b/DDG4/include/DDG4/Geant4TestActions.h
index 613b41276891a36749984247e251ac523583d97a..43565e922b257e166385d0df5505ef83b7722427 100644
--- a/DDG4/include/DDG4/Geant4TestActions.h
+++ b/DDG4/include/DDG4/Geant4TestActions.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TouchableHandler.h b/DDG4/include/DDG4/Geant4TouchableHandler.h
index 9b554f7afbda1310bae7d72017b9148392780c12..aa0e728b5497ecd2508f053fd243182ef17dd2ff 100644
--- a/DDG4/include/DDG4/Geant4TouchableHandler.h
+++ b/DDG4/include/DDG4/Geant4TouchableHandler.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackHandler.h b/DDG4/include/DDG4/Geant4TrackHandler.h
index 444873fbe3bdc0b5c4c46814e1adda0b67c5373a..eae449db8709371f48232bd5c61be4a18a8d2de9 100644
--- a/DDG4/include/DDG4/Geant4TrackHandler.h
+++ b/DDG4/include/DDG4/Geant4TrackHandler.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackInformation.h b/DDG4/include/DDG4/Geant4TrackInformation.h
index e2400f3bce442d322f0c6fa5c827d5a4863562b3..faa321ee6c099081ebb7a156187c8f45fb2a92b0 100644
--- a/DDG4/include/DDG4/Geant4TrackInformation.h
+++ b/DDG4/include/DDG4/Geant4TrackInformation.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingAction.h b/DDG4/include/DDG4/Geant4TrackingAction.h
index ac802a69c58cb7c89ae26c7edcc3de1d9df18f0b..721e85780736aa1c208713d3d91ccac4512ea89b 100644
--- a/DDG4/include/DDG4/Geant4TrackingAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingAction.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingPostAction.h b/DDG4/include/DDG4/Geant4TrackingPostAction.h
index 6886bd39ac3cede527f5c7d71468670979a4a45a..32b9d4be5b2ece67daea18f738eb87d73cb33f51 100644
--- a/DDG4/include/DDG4/Geant4TrackingPostAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPostAction.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingPreAction.h b/DDG4/include/DDG4/Geant4TrackingPreAction.h
index a46b9d9ad6323291813258298ec2ca026f3be182..a5699ba39695d3aa20f3d3cfdae62bd8fd718351 100644
--- a/DDG4/include/DDG4/Geant4TrackingPreAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPreAction.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UIManager.h b/DDG4/include/DDG4/Geant4UIManager.h
index 779667a146cf9ce80feff6b156dcee3ab35a95cc..56b75757376f9bf3acea8e6c9d8ad8b2c762ca12 100644
--- a/DDG4/include/DDG4/Geant4UIManager.h
+++ b/DDG4/include/DDG4/Geant4UIManager.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UIMessenger.h b/DDG4/include/DDG4/Geant4UIMessenger.h
index 659fa11f7c7def66c47d1b546c31e5e5795fb647..045bc1714d8cbec6bc7ede9330621f1fa6f0790f 100644
--- a/DDG4/include/DDG4/Geant4UIMessenger.h
+++ b/DDG4/include/DDG4/Geant4UIMessenger.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UserInitialization.h b/DDG4/include/DDG4/Geant4UserInitialization.h
index 52cf405848ad5802cad8f2ce99d5ea49a31d77df..22ceade97f36fcac59e03c7acc9ad7249a013360 100644
--- a/DDG4/include/DDG4/Geant4UserInitialization.h
+++ b/DDG4/include/DDG4/Geant4UserInitialization.h
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UserParticleHandler.h b/DDG4/include/DDG4/Geant4UserParticleHandler.h
index cb9ebc41d7bf55b80a8dbb024e98a79f860ec453..b28385776d250e70d8e5242479073de34270c2cb 100644
--- a/DDG4/include/DDG4/Geant4UserParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4UserParticleHandler.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOConversions.cpp b/DDG4/lcio/LCIOConversions.cpp
index d326c316f6691bfc9daeabe9ca53750aa3f6778f..1a27b3d11ddd03fc90fe478f0f5e45c2cb21b926 100644
--- a/DDG4/lcio/LCIOConversions.cpp
+++ b/DDG4/lcio/LCIOConversions.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOEventReader.h b/DDG4/lcio/LCIOEventReader.h
index e3c3043551b641209adc358548f19dd1083e2c66..051cfb61325f7e6f6c68ee2331b725bdb651bfbf 100644
--- a/DDG4/lcio/LCIOEventReader.h
+++ b/DDG4/lcio/LCIOEventReader.h
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOStdHepReader.cpp b/DDG4/lcio/LCIOStdHepReader.cpp
index 10a72886403f59afbf118915bedc6278b7d98e38..8351577ba73e51497c04717d8767b1acd3ab7818 100644
--- a/DDG4/lcio/LCIOStdHepReader.cpp
+++ b/DDG4/lcio/LCIOStdHepReader.cpp
@@ -51,7 +51,6 @@ namespace dd4hep {
} /* End namespace dd4hep */
#endif /* DD4HEP_DDG4_LCIOSTDHEPREADER_H */
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4ExtraParticles.h b/DDG4/plugins/Geant4ExtraParticles.h
index d220cdf1f18f08d857c02ae5c91df8b6de7eac40..ed40998e6e8125ef6f4ee88bd486e180b42adb4d 100644
--- a/DDG4/plugins/Geant4ExtraParticles.h
+++ b/DDG4/plugins/Geant4ExtraParticles.h
@@ -3,9 +3,6 @@
// Taikan Suehara <suehara@icepp.s.u-tokyo.ac.jp>
// Proted from Mokka by A.Sailer (CERN )
//
-// $Id$
-// $Name: $
-
#ifndef ExtraParticles_hh
#define ExtraParticles_hh 1
diff --git a/DDG4/plugins/Geant4FieldTrackingSetup.cpp b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
index 14ac6ecda567a301eb93c3deebf5ac01db05a510..82f110563e471325aa58c60fe2041df0b1aa070f 100644
--- a/DDG4/plugins/Geant4FieldTrackingSetup.cpp
+++ b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
@@ -120,8 +120,6 @@ namespace dd4hep {
} // End namespace dd4hep
#endif // DD4HEP_DDG4_GEANT4FIELDTRACKINGSETUP_H
-
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4MaterialScanner.cpp b/DDG4/plugins/Geant4MaterialScanner.cpp
index a820a37e94d1f1b37429a899d36382bcbe802e0e..284e050f771168f10b33b4a96285140fcee68c0b 100644
--- a/DDG4/plugins/Geant4MaterialScanner.cpp
+++ b/DDG4/plugins/Geant4MaterialScanner.cpp
@@ -75,7 +75,6 @@ namespace dd4hep {
}
}
-// $Id: $
//====================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4TCUserParticleHandler.cpp b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
index 4b6f2b9a8cbd3d10e12fd9cacb68915d68b7973d..496b351af3e463a9084c37ac78aad0d7cd96d851 100644
--- a/DDG4/plugins/Geant4TCUserParticleHandler.cpp
+++ b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
@@ -60,7 +60,6 @@ namespace dd4hep {
#endif // DD4HEP_DDG4_GEANT4TCUSERPARTICLEHANDLER_H
-// $Id: Geant4Field.cpp 888 2013-11-14 15:54:56Z markus.frank@cern.ch $
//====================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4UserActionInitialization.cpp b/DDG4/plugins/Geant4UserActionInitialization.cpp
index 12d62739fe39ea206feeb4d29ad290545d08208c..ffb7fff1e51c05d928e4414b35306dca70915604 100644
--- a/DDG4/plugins/Geant4UserActionInitialization.cpp
+++ b/DDG4/plugins/Geant4UserActionInitialization.cpp
@@ -58,7 +58,6 @@ namespace dd4hep {
// \date 2015-11-03
//
//==========================================================================
-// $Id$
// Framework include files
#include "DDG4/Factories.h"
diff --git a/DDG4/src/Geant4ActionPhase.cpp b/DDG4/src/Geant4ActionPhase.cpp
index d31d9620230ef20c0396417cdabfcf1a53402740..d27f4c38f2338777a8833aa5d10dec5c7e303f84 100644
--- a/DDG4/src/Geant4ActionPhase.cpp
+++ b/DDG4/src/Geant4ActionPhase.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Call.cpp b/DDG4/src/Geant4Call.cpp
index b014907614d0b4d0b313df9c0a400409b33c6715..b204635dd7a6c8a9451dff00358d8a99de021ae3 100644
--- a/DDG4/src/Geant4Call.cpp
+++ b/DDG4/src/Geant4Call.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Data.cpp b/DDG4/src/Geant4Data.cpp
index 07218db109ada005a961ac0e09dc5e8d7ab06d9b..a6ab612bace9319dd401d2873e3d3025e04eeef6 100644
--- a/DDG4/src/Geant4Data.cpp
+++ b/DDG4/src/Geant4Data.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4DataDump.cpp b/DDG4/src/Geant4DataDump.cpp
index d0f420f0c9ffbdf0e1141d294fd926cfa85b60f3..a92f01f933e3c00930b651ce80df5d4b62351651 100644
--- a/DDG4/src/Geant4DataDump.cpp
+++ b/DDG4/src/Geant4DataDump.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GDMLDetector.cpp b/DDG4/src/Geant4GDMLDetector.cpp
index ca968ea366df91ba6b970c2454f2057eb1faa5cf..a2410165985343c80b8e9f1ed667313e167e33d7 100644
--- a/DDG4/src/Geant4GDMLDetector.cpp
+++ b/DDG4/src/Geant4GDMLDetector.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeneratorActionInit.cpp b/DDG4/src/Geant4GeneratorActionInit.cpp
index e86fda8f1fd128851d9ee48837deed85aac33d64..0d80f94f912343a374fc7aee5133cb98bf5fcc86 100644
--- a/DDG4/src/Geant4GeneratorActionInit.cpp
+++ b/DDG4/src/Geant4GeneratorActionInit.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeneratorWrapper.cpp b/DDG4/src/Geant4GeneratorWrapper.cpp
index 6086cbfc637dd48d95c48f0e1d776e1906e0a30f..7eb09b3f5303949a23841fd8d5d7162bc185a0bf 100644
--- a/DDG4/src/Geant4GeneratorWrapper.cpp
+++ b/DDG4/src/Geant4GeneratorWrapper.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeometryInfo.cpp b/DDG4/src/Geant4GeometryInfo.cpp
index c97474dd7d7a1c9435b9b76c1242da2878cce2d6..f61d1ba3fa6bc69f77fc91d20ef302e15a7d75a7 100644
--- a/DDG4/src/Geant4GeometryInfo.cpp
+++ b/DDG4/src/Geant4GeometryInfo.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4HitCollection.cpp b/DDG4/src/Geant4HitCollection.cpp
index 3e156d82b502fcda7c9887b4a2fab2635c161ba2..87a9d33834b4d21e33a04025f92af540e7a61261 100644
--- a/DDG4/src/Geant4HitCollection.cpp
+++ b/DDG4/src/Geant4HitCollection.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Hits.cpp b/DDG4/src/Geant4Hits.cpp
index be7154a334503d27fd7d0028c56091c676315c2b..575be9d078a065a4bfd3ce79d98b032162d3a1b7 100644
--- a/DDG4/src/Geant4Hits.cpp
+++ b/DDG4/src/Geant4Hits.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InputHandling.cpp b/DDG4/src/Geant4InputHandling.cpp
index 2fa76779873d421a7214c27543f617a3be232654..81ab96790e3a9e3120536e542e7d32c059f1558d 100644
--- a/DDG4/src/Geant4InputHandling.cpp
+++ b/DDG4/src/Geant4InputHandling.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionMerger.cpp b/DDG4/src/Geant4InteractionMerger.cpp
index 6cf15381700bb81b4be700eeacc489aa7dcdbae7..28b52b3881884886a34e6d1999c1e7559d2ca703 100644
--- a/DDG4/src/Geant4InteractionMerger.cpp
+++ b/DDG4/src/Geant4InteractionMerger.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionVertexBoost.cpp b/DDG4/src/Geant4InteractionVertexBoost.cpp
index b73a72179d310166dec8cc5c3ec076c8e6e63c87..c914bd217be4ff09be75e29b1ced65faac41d6d6 100644
--- a/DDG4/src/Geant4InteractionVertexBoost.cpp
+++ b/DDG4/src/Geant4InteractionVertexBoost.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionVertexSmear.cpp b/DDG4/src/Geant4InteractionVertexSmear.cpp
index 41be15c273db88085885cddebd1e020b65186a41..bf851056bc498130a2afe8a284afb3be0e33c54d 100644
--- a/DDG4/src/Geant4InteractionVertexSmear.cpp
+++ b/DDG4/src/Geant4InteractionVertexSmear.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4IsotropeGenerator.cpp b/DDG4/src/Geant4IsotropeGenerator.cpp
index 236ad8fd8873544fdddc7aa5351db7941bc9822d..1a8aaddd86d7768ae0d88e08440382cc0b48522f 100644
--- a/DDG4/src/Geant4IsotropeGenerator.cpp
+++ b/DDG4/src/Geant4IsotropeGenerator.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4MonteCarloTruth.cpp b/DDG4/src/Geant4MonteCarloTruth.cpp
index c512ab6ea68a35cc1a8944966ed6ee9f56d937b5..3285cd01e2bddd5be3c4cd9cea945622fdf48557 100644
--- a/DDG4/src/Geant4MonteCarloTruth.cpp
+++ b/DDG4/src/Geant4MonteCarloTruth.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ParticleGenerator.cpp b/DDG4/src/Geant4ParticleGenerator.cpp
index 4ab75c1bcc42f00c2e841b88bc809ea6e9775b04..2927dbfa79f2b58e0ed7e71bf3c4e97d2f846c23 100644
--- a/DDG4/src/Geant4ParticleGenerator.cpp
+++ b/DDG4/src/Geant4ParticleGenerator.cpp
@@ -1,11 +1,15 @@
-// $Id: Geant4Converter.cpp 603 2013-06-13 21:15:14Z markus.frank $
-//====================================================================
+//==========================================================================
// AIDA Detector description implementation
-//--------------------------------------------------------------------
+//--------------------------------------------------------------------------
+// Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN)
+// All rights reserved.
//
-// Author : M.Frank
+// For the licensing terms see $DD4hepINSTALL/LICENSE.
+// For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
//
-//====================================================================
+// Author : M.Frank
+//
+//==========================================================================
// Framework include files
#include "DD4hep/Printout.h"
diff --git a/DDG4/src/Geant4ParticleGun.cpp b/DDG4/src/Geant4ParticleGun.cpp
index f0a720e5e6457481fd3b80449411fa899a92f122..1bfd9b11dd514ac8707506dd667468c494e4663c 100644
--- a/DDG4/src/Geant4ParticleGun.cpp
+++ b/DDG4/src/Geant4ParticleGun.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4RunAction.cpp b/DDG4/src/Geant4RunAction.cpp
index 5544708dead82018165806c1f73b6ace2cbe89ec..68169a6b9e5ad53796b743def4df657ca4ee3b45 100644
--- a/DDG4/src/Geant4RunAction.cpp
+++ b/DDG4/src/Geant4RunAction.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4SensitiveDetector.cpp b/DDG4/src/Geant4SensitiveDetector.cpp
index 557f75e9cb1d1d9fb25a770c4f3e93685d674ba3..2b0ecfbe006a1a0319f96c147103c54114c8f921 100644
--- a/DDG4/src/Geant4SensitiveDetector.cpp
+++ b/DDG4/src/Geant4SensitiveDetector.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TouchableHandler.cpp b/DDG4/src/Geant4TouchableHandler.cpp
index 4baad0a785df25b80e5ce0506c037da769121b55..56e387b3862e409e45541986185db25ea3b642fd 100644
--- a/DDG4/src/Geant4TouchableHandler.cpp
+++ b/DDG4/src/Geant4TouchableHandler.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackInformation.cpp b/DDG4/src/Geant4TrackInformation.cpp
index 8b84ac31d0bc85463d496fb488b8150618015032..e5ca3f46e4b4b8e45ba157795b9ef44764884c79 100644
--- a/DDG4/src/Geant4TrackInformation.cpp
+++ b/DDG4/src/Geant4TrackInformation.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingPostAction.cpp b/DDG4/src/Geant4TrackingPostAction.cpp
index e152ab966cd8472602e03fb0d948ec4eb925c766..a19f987ee6396f891c969171d18ada1e10128e6f 100644
--- a/DDG4/src/Geant4TrackingPostAction.cpp
+++ b/DDG4/src/Geant4TrackingPostAction.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingPreAction.cpp b/DDG4/src/Geant4TrackingPreAction.cpp
index e08225f3bf3086a8496b61e6154802d653e9ed44..a75deae26365af5f91432570896173b5507a16ee 100644
--- a/DDG4/src/Geant4TrackingPreAction.cpp
+++ b/DDG4/src/Geant4TrackingPreAction.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UserInitialization.cpp b/DDG4/src/Geant4UserInitialization.cpp
index 8a0e2a45b09041d9510f21b5cb55cdaabc5d7db2..69c1357da9eb5af51d79d956644f8829736bcb24 100644
--- a/DDG4/src/Geant4UserInitialization.cpp
+++ b/DDG4/src/Geant4UserInitialization.cpp
@@ -1,4 +1,3 @@
-// $Id$
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UserParticleHandler.cpp b/DDG4/src/Geant4UserParticleHandler.cpp
index 912d292fdbcd2671ed79b03106e2961506b32b7a..4e60d6e6c5a2502172f530457e722766ee456504 100644
--- a/DDG4/src/Geant4UserParticleHandler.cpp
+++ b/DDG4/src/Geant4UserParticleHandler.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Vertex.cpp b/DDG4/src/Geant4Vertex.cpp
index c2815572d43d813790f60b1b4ac2a63d1419c190..5ba2de1b65af4240c3b7c6cebaaba7bd27bb0745 100644
--- a/DDG4/src/Geant4Vertex.cpp
+++ b/DDG4/src/Geant4Vertex.cpp
@@ -1,4 +1,3 @@
-// $Id: $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDParsers/src/parsers/ParserStandardList_list_bool.cpp b/DDParsers/src/parsers/ParserStandardList_list_bool.cpp
index bb9aa026b2a66e690b09584c846026378655509f..aae227af3b3cc459da15b873a6b2db923193af03 100644
--- a/DDParsers/src/parsers/ParserStandardList_list_bool.cpp
+++ b/DDParsers/src/parsers/ParserStandardList_list_bool.cpp
@@ -1,4 +1,3 @@
-// $Id: ParserStandardList_list_bool.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDParsers/src/parsers/ParserStandardList_list_double.cpp b/DDParsers/src/parsers/ParserStandardList_list_double.cpp
index da6cb55cc5bd7185c17e8feac724f8dd1c95c8fc..be4659e5d237e7b6c82d5f32e18a5b0757e4530f 100644
--- a/DDParsers/src/parsers/ParserStandardList_list_double.cpp
+++ b/DDParsers/src/parsers/ParserStandardList_list_double.cpp
@@ -1,4 +1,3 @@
-// $Id: ParserStandardList_list_double.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDParsers/src/parsers/ParserStandardList_list_float.cpp b/DDParsers/src/parsers/ParserStandardList_list_float.cpp
index d53d372904dec3ab5baad1141997b6960ff15283..8609a5e80c7340849b704f88bbcf7b02e2332301 100644
--- a/DDParsers/src/parsers/ParserStandardList_list_float.cpp
+++ b/DDParsers/src/parsers/ParserStandardList_list_float.cpp
@@ -1,4 +1,3 @@
-// $Id: ParserStandardList_list_float.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDParsers/src/parsers/ParserStandardList_list_int.cpp b/DDParsers/src/parsers/ParserStandardList_list_int.cpp
index a697939accb7e54d02ad3388edf2c77ac68bddd0..5b3c38a947d1e1312ab6e9e8d06cc24b82a7effb 100644
--- a/DDParsers/src/parsers/ParserStandardList_list_int.cpp
+++ b/DDParsers/src/parsers/ParserStandardList_list_int.cpp
@@ -1,4 +1,3 @@
-// $Id: ParserStandardList_list_int.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDParsers/src/parsers/ParserStandardList_list_long.cpp b/DDParsers/src/parsers/ParserStandardList_list_long.cpp
index 6912b4b9d583e056d7e13e64ede406391d6657d4..909a28f271b029a2c49898446ad5df688d01b3dc 100644
--- a/DDParsers/src/parsers/ParserStandardList_list_long.cpp
+++ b/DDParsers/src/parsers/ParserStandardList_list_long.cpp
@@ -1,4 +1,3 @@
-// $Id: ParserStandardList_list_long.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/DDParsers/src/parsers/ParserStandardList_list_string.cpp b/DDParsers/src/parsers/ParserStandardList_list_string.cpp
index 3e15719eb6f34cb9900cc89c1c8da21b3d038eaa..c102f7767a55e9947f2e09cc1c3717afaf06def6 100644
--- a/DDParsers/src/parsers/ParserStandardList_list_string.cpp
+++ b/DDParsers/src/parsers/ParserStandardList_list_string.cpp
@@ -1,4 +1,3 @@
-// $Id: ParserStandardList_list_string.cpp 2166 2016-03-17 16:37:06Z /DC=ch/DC=cern/OU=Organic Units/OU=Users/CN=sailer/CN=683529/CN=Andre Sailer $
//==========================================================================
// AIDA Detector description implementation
//--------------------------------------------------------------------------
diff --git a/doc/LaTex/DDConditionsManual.tex b/doc/LaTex/DDConditionsManual.tex
index a20a2d32e983c37d77522dec06701d9bdf8c76e7..c5d8d6ddc847c3055d55d9d5c636b28e5112543f 100644
--- a/doc/LaTex/DDConditionsManual.tex
+++ b/doc/LaTex/DDConditionsManual.tex
@@ -154,13 +154,12 @@ a calibration process are technically identical to raw values in an
analysis application using these re-calibrated constants.
Hence, as soon as derived data enter the conditions database they are
technically identical to raw values.
-\DDC provides a mechanism that according to a recipe given upfront
-for a given event time a coherent set of conditions can be projected
-which includes
-\begin{itemize}
-\item all requested raw data values and
-\item all requested derived data are computed.
-\end{itemize}
+
+\noindent
+To support such calibration processes producing derived conditions
+data, \DDC provides a mechanism to project new values given
+a set of recipes provided by the user. This recipes can project a
+set of coherent new conditions for a given event time accordingly.
%=============================================================================
@@ -193,86 +192,18 @@ interface used to interact with tools and the generic container object or
conditions slices as described in section~\ref{subsec:ddcond-conditions-slices}.
%=============================================================================
-\subsection{The ConditionsMap Interface}
-\label{subsec:ddcond-conditionsmap}
-%=============================================================================
-
-\noindent
-The $ConditionsMap$ interface defines the lowest common denominator to
-allow tools or clients to interact with conditions of a given slice.
-This interface defines the interaction of clients with a conditions slice.
-These interactions cover both the data access and the data management
-within a slice. The interface allows to
-\begin{itemize}
-\item access individual conditions by the detector element
-and a given item key. The interface allows
-\item to scan conditions according to the detector element or
-\item to scan all conditions contained. Further it allows
-\item insert conditions to the mapping and
-\item to clear the content.
-\end{itemize}
-The provision of these basic interaction mechanisms allows us to build
-very generic tools firstly for conditions, but also later for the
-management and th computation of alignment data as described in
-the \DDA manual~\cite{bib:ddalign-manual}.
-
-\noindent
-The $ConditionsMap$ interface class, which supports this basic functionality
-has the following entry points:
-\begin{unnumberedcode}
- class ConditionsMap {
- public:
- /// Insert a new entry to the map. The detector element key and
- /// the item key make a unique global conditions key
- virtual bool insert(DetElement detector,
- Condition::itemkey_type key,
- Condition condition) = 0;
- /// Interface to access conditions by hash value. The detector element key
- /// and the item key make a unique global conditions key
- virtual Condition get(DetElement detector,
- Condition::itemkey_type key) const = 0;
- /// Interface to scan data content of the conditions mapping
- virtual void scan(const Condition::Processor& processor) const = 0;
-
- /// No ConditionsMap overload: Access all conditions within
- /// a key range in the interval [lower,upper]
- virtual std::vector<Condition> get(DetElement detector,
- Condition::itemkey_type lower,
- Condition::itemkey_type upper) const;
-
- /// Interface to partially scan data content of the conditions mapping
- virtual void scan(DetElement detector,
- Condition::itemkey_type lower,
- Condition::itemkey_type upper,
- const Condition::Processor& processor) const;
- };
-\end{unnumberedcode}
-Such $ConditionsMap$ implementations can easily be constructed using standard
-STL maps. The lookup key is constructed out of two elements:
-\begin{itemize}
-\item The detector element this condition belongs to and
-\item an identifier of condition within this detector element.
-\end{itemize}
-An efficient implementation of a longword key would consist of the tuple:
-$$
-[ hash32(conditions-name) , hash32(det-element->path()) ],
-$$
-which resembles to an ordered sequence of conditions according to
-their detector element. A special implementation, which implements
-this user interface is the $ConditionsSlice$ implemented in the
-\DDC package (See section [] for details).
-
-%=============================================================================
-\subsection{Conditions Data}
+\subsection{Condition Objects and Conditions Data}
\label{subsec:ddcond-conditions-data}
%=============================================================================
\noindent
A conditions objects serves two purposes:
\begin{itemize}
-\item Firstly, it supports the basic functionality required by a
- conditions management framework, which implements the $ConditionsMap$
- interface.
+\item Firstly, it supports the basic functionality which is generic to any
+ condition -- independent of the actual user payload. This information
+ includes access to the interval of validity and the key to uniquely identify
+ the condition.
+
\item Secondly, the objects hosts and manages a user payload, the actual
conditions data. These data are freely user defined. An automatic
parsing mechanism from a string representation is supported if the
@@ -290,6 +221,10 @@ A conditions objects serves two purposes:
std::pair\textless int,TYPE\textgreater,
std::pair\textless string,TYPE\textgreater.
\end{itemize}
+
+\item Thirdly, it supports the basic functionality required by a
+ conditions management framework, which implements the $ConditionsMap$
+ interface.
\end{itemize}
For completeness we include here the basic data access methods of the conditions
class:
@@ -364,6 +299,78 @@ This is an example how to access already bound data:
std::vector<int>& data = cond.get<std::vector<int> >();
\end{unnumberedcode}
+
+%=============================================================================
+\subsection{The ConditionsMap Interface}
+\label{subsec:ddcond-conditionsmap}
+%=============================================================================
+
+\noindent
+The $ConditionsMap$ interface defines the lowest common denominator to
+allow tools or clients to interact with conditions of a given slice.
+This interface defines the interaction of clients with a conditions slice.
+These interactions cover both the data access and the data management
+within a slice. The interface allows to
+\begin{itemize}
+\item access individual conditions by the detector element
+and a given item key. The interface allows
+\item to scan conditions according to the detector element or
+\item to scan all conditions contained. Further it allows
+\item insert conditions to the mapping and
+\item to clear the content.
+\end{itemize}
+The provision of these basic interaction mechanisms allows us to build
+very generic tools firstly for conditions, but also later for the
+management and th computation of alignment data as described in
+the \DDA manual~\cite{bib:ddalign-manual}.
+
+\noindent
+The $ConditionsMap$ interface class, which supports this basic functionality
+has the following entry points:
+\begin{unnumberedcode}
+ class ConditionsMap {
+ public:
+ /// Insert a new entry to the map. The detector element key and
+ /// the item key make a unique global conditions key
+ virtual bool insert(DetElement detector,
+ Condition::itemkey_type key,
+ Condition condition) = 0;
+ /// Interface to access conditions by hash value. The detector element key
+ /// and the item key make a unique global conditions key
+ virtual Condition get(DetElement detector,
+ Condition::itemkey_type key) const = 0;
+ /// Interface to scan data content of the conditions mapping
+ virtual void scan(const Condition::Processor& processor) const = 0;
+
+ /// No ConditionsMap overload: Access all conditions within
+ /// a key range in the interval [lower,upper]
+ virtual std::vector<Condition> get(DetElement detector,
+ Condition::itemkey_type lower,
+ Condition::itemkey_type upper) const;
+
+ /// Interface to partially scan data content of the conditions mapping
+ virtual void scan(DetElement detector,
+ Condition::itemkey_type lower,
+ Condition::itemkey_type upper,
+ const Condition::Processor& processor) const;
+ };
+\end{unnumberedcode}
+Such $ConditionsMap$ implementations can easily be constructed using standard
+STL maps. The lookup key is constructed out of two elements:
+\begin{itemize}
+\item The detector element this condition belongs to and
+\item an identifier of condition within this detector element.
+\end{itemize}
+An efficient implementation of a longword key would consist of the tuple:
+$$
+[ hash32(conditions-name) , hash32(det-element->path()) ],
+$$
+which resembles to an ordered sequence of conditions according to
+their detector element. A special implementation, which implements
+this user interface is the $ConditionsSlice$ implemented in the
+\DDC package (See section \ref{subsec:ddcond-conditions-store} for details).
+
+
\newpage
%=============================================================================
\section{DDCond Conditions Store and Slices}
@@ -376,12 +383,13 @@ This is an example how to access already bound data:
%=============================================================================
\noindent
-The basic assumption to optimize the access and the management of conditions
+The basic assumption of the \DDC conditions store to optimize the access
+and the management of conditions
data can be very simply summarized: it is assumed, that groups of data items
exist, which have a common interval of validity. In other words: given a
certain event, valid or invalid conditions can quickly be identified by
checking the so called "interval of validity" of the entire group with the
-time stamp of the event. This intervall of validity defines the time span
+time stamp of the event. This interval of validity defines the time span
for which a given group of processing parameters is valid. It starts and
ends with a time stamp. The definition of a time stamp may be user defined
and not necessarily resemble to values in seconds or fractions thereof.
@@ -403,11 +411,10 @@ still work formally. However, by construction it cannot not work efficiently.
Resources both in CPU and memory would be wasted at run-time.
The necessity to properly organize the conditions data becomes
immediately evident in Figure~\ref{fig:ddcond-data-organization}:
-Users can orginize data according to certain types, These types are
+Users can organize data according to certain types, These types are
independently managed and subdivided into pools. Each of these pools
manages a set of conditions items sharing the same interval ov validity.
-
%=============================================================================
\begin{figure}[h]
\begin{center}\includegraphics[height=10cm] {DDCond-ConditionsStore.png}
@@ -418,17 +425,41 @@ manages a set of conditions items sharing the same interval ov validity.
\end{figure}
\vspace{-0.5cm}
+
+\noindent
+The internal organization of the conditions data in \DDC is entirely
+transparent to the user. The description here is contained for
+completeness and for the understanding of the limitations of the implemented
+approach. If different requirements or access patterns concerning the
+access to conditions data arise, it should though be feasible to implement
+these fairly straight forward using a suited approach.
+
%=============================================================================
-\subsection{Data Access}
+\subsection{Slice Configuration and Data Access}
\label{subsec:ddcond-data-access}
%=============================================================================
+\noindent
+As defined in section~\ref{subsec:ddcond-conditions-slices}, the conditions slice
+id the main entity to project conditions suitable to process a given particle
+collision. As shown also in Figure~\ref{fig:ddcond-slice-usage}, there are
+several steps to be performed before a conditions slice is ready to be used:
+\begin{enumerate}
+\item Create the conditions data slice.
+\item Setting up the data content of the slice.
+\item Preparing the conditions data slice.
+\item Using the conditions data slice.
+\end{enumerate}
+
+NEED TO MENTION ConditionsContent
+
+
%=============================================================================
\begin{figure}[h]
\begin{center}\includegraphics[width=15cm] {DDCond-ConditionsAccess.png}
\caption{The interaction of a particular user with the conditions
data store using the $ConditionsManager$ interface.}
- \label{fig:ddcond-data-organization}
+ \label{fig:ddcond-slice-usage}
\end{center}
\end{figure}
\vspace{-0.5cm}