From 0cc623afe69333fffc45f83b9ed9c5bbd14c2677 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Sun, 12 Jul 2015 02:44:49 +0000
Subject: [PATCH] Fix ID tags

---
 DDAlign/CMakeLists.txt                                   | 2 +-
 DDAlign/include/DDAlign/AlignmentCache.h                 | 2 +-
 DDAlign/include/DDAlign/AlignmentOperators.h             | 2 +-
 DDAlign/include/DDAlign/AlignmentStack.h                 | 2 +-
 DDAlign/include/DDAlign/AlignmentTags.h                  | 2 +-
 DDAlign/include/DDAlign/AlignmentTransaction.h           | 2 +-
 DDAlign/include/DDAlign/AlignmentWriter.h                | 2 +-
 DDAlign/include/DDAlign/DetectorAlignment.h              | 2 +-
 DDAlign/src/AlignmentCache.cpp                           | 2 +-
 DDAlign/src/AlignmentOperators.cpp                       | 2 +-
 DDAlign/src/AlignmentParser.cpp                          | 2 +-
 DDAlign/src/AlignmentStack.cpp                           | 2 +-
 DDAlign/src/AlignmentTags.cpp                            | 2 +-
 DDAlign/src/AlignmentTransaction.cpp                     | 2 +-
 DDAlign/src/AlignmentWriter.cpp                          | 2 +-
 DDAlign/src/DetectorAlignment.cpp                        | 2 +-
 DDCond/CMakeLists.txt                                    | 2 +-
 DDCond/include/DDCond/ConditionValidator.h               | 2 +-
 DDCond/include/DDCond/ConditionsHandler.h                | 2 +-
 DDCond/include/DDCond/ConditionsOperators.h              | 2 +-
 DDCond/include/DDCond/ConditionsStack.h                  | 2 +-
 DDCond/include/DDCond/ConditionsTags.h                   | 2 +-
 DDCond/include/DDCond/ConditionsTransaction.h            | 2 +-
 DDCond/src/ConditionTest.cpp                             | 2 +-
 DDCond/src/ConditionValidator.cpp                        | 2 +-
 DDCond/src/ConditionsHandler.cpp                         | 2 +-
 DDCond/src/ConditionsParser.cpp                          | 2 +-
 DDCond/src/ConditionsStack.cpp                           | 2 +-
 DDCond/src/ConditionsTags.cpp                            | 2 +-
 DDCond/src/ConditionsTransaction.cpp                     | 2 +-
 DDCore/CMakeLists.txt                                    | 2 +-
 DDCore/include/DD4hep/Alignment.h                        | 2 +-
 DDCore/include/DD4hep/BasicGrammar.h                     | 2 +-
 DDCore/include/DD4hep/Callback.h                         | 2 +-
 DDCore/include/DD4hep/ConditionTypes.h                   | 2 +-
 DDCore/include/DD4hep/Conditions.h                       | 2 +-
 DDCore/include/DD4hep/DD4hepRootPersistency.h            | 2 +-
 DDCore/include/DD4hep/DD4hepUnits.h                      | 4 ++--
 DDCore/include/DD4hep/DetectorTools.h                    | 2 +-
 DDCore/include/DD4hep/Dictionary.h                       | 2 +-
 DDCore/include/DD4hep/Exceptions.h                       | 2 +-
 DDCore/include/DD4hep/Handle.inl                         | 2 +-
 DDCore/include/DD4hep/InstanceCount.h                    | 2 +-
 DDCore/include/DD4hep/LCDDData.h                         | 2 +-
 DDCore/include/DD4hep/LCDDHelper.h                       | 2 +-
 DDCore/include/DD4hep/LCDDLoad.h                         | 2 +-
 DDCore/include/DD4hep/MatrixHelpers.h                    | 2 +-
 DDCore/include/DD4hep/Memory.h                           | 2 +-
 DDCore/include/DD4hep/NamedObject.h                      | 2 +-
 DDCore/include/DD4hep/ObjectExtensions.h                 | 2 +-
 DDCore/include/DD4hep/Parsers.h                          | 2 +-
 DDCore/include/DD4hep/Plugins.h                          | 2 +-
 DDCore/include/DD4hep/Plugins.inl                        | 2 +-
 DDCore/include/DD4hep/Primitives.h                       | 2 +-
 DDCore/include/DD4hep/Printout.h                         | 2 +-
 DDCore/include/DD4hep/SurfaceInstaller.h                 | 2 +-
 DDCore/include/DD4hep/ToStream.h                         | 2 +-
 DDCore/include/DD4hep/VolumeManager.h                    | 2 +-
 DDCore/include/DD4hep/config.h                           | 2 +-
 DDCore/include/DD4hep/objects/BasicGrammar_inl.h         | 2 +-
 DDCore/include/DD4hep/objects/ConditionsInterna.h        | 2 +-
 DDCore/include/DD4hep/objects/DetectorInterna.h          | 2 +-
 DDCore/include/DD4hep/objects/ObjectsInterna.h           | 2 +-
 DDCore/include/DD4hep/objects/VolumeManagerInterna.h     | 2 +-
 DDCore/include/XML/Utilities.h                           | 4 ++--
 DDCore/include/XML/XMLChildValue.h                       | 2 +-
 DDCore/include/XML/XMLDimension.h                        | 2 +-
 DDCore/python/lcdd.py                                    | 2 +-
 DDCore/src/Alignment.cpp                                 | 2 +-
 DDCore/src/BasicGrammar.cpp                              | 2 +-
 DDCore/src/BasicGrammarTypes.cpp                         | 2 +-
 DDCore/src/Callback.cpp                                  | 2 +-
 DDCore/src/Conditions.cpp                                | 2 +-
 DDCore/src/ConditionsInterna.cpp                         | 2 +-
 DDCore/src/ConditonsTypes.cpp                            | 2 +-
 DDCore/src/DD4hepRootPersistency.cpp                     | 2 +-
 DDCore/src/DetectorInterna.cpp                           | 2 +-
 DDCore/src/DetectorTools.cpp                             | 2 +-
 DDCore/src/Exceptions.cpp                                | 2 +-
 DDCore/src/InstanceCount.cpp                             | 2 +-
 DDCore/src/LCDDData.cpp                                  | 2 +-
 DDCore/src/LCDDHelper.cpp                                | 2 +-
 DDCore/src/LCDDLoad.cpp                                  | 2 +-
 DDCore/src/MatrixHelpers.cpp                             | 2 +-
 DDCore/src/NamedObject.cpp                               | 2 +-
 DDCore/src/ObjectExtensions.cpp                          | 2 +-
 DDCore/src/ObjectsInterna.cpp                            | 2 +-
 DDCore/src/Plugins.cpp                                   | 2 +-
 DDCore/src/Primitives.cpp                                | 2 +-
 DDCore/src/Printout.cpp                                  | 2 +-
 DDCore/src/SurfaceInstaller.cpp                          | 2 +-
 DDCore/src/ToStream.cpp                                  | 2 +-
 DDCore/src/VolumeManager.cpp                             | 2 +-
 DDCore/src/VolumeManagerInterna.cpp                      | 2 +-
 DDCore/src/XML/Utilities.cpp                             | 2 +-
 DDCore/src/XML/XMLChildValue.cpp                         | 2 +-
 DDCore/src/XML/XMLDimension.cpp                          | 2 +-
 DDCore/src/parsers/Grammars.h                            | 2 +-
 DDCore/src/parsers/GrammarsV2.h                          | 2 +-
 DDCore/src/parsers/Parsers.icpp                          | 2 +-
 DDCore/src/parsers/ParsersFactory.h                      | 2 +-
 DDCore/src/parsers/ParsersObjects.cpp                    | 2 +-
 DDCore/src/parsers/ParsersStandardList1.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardList2.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardList3.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardList4.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardListCommon.h           | 2 +-
 DDCore/src/parsers/ParsersStandardMisc1.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardMisc2.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardMisc3.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardMisc4.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardMisc5.cpp              | 2 +-
 DDCore/src/parsers/ParsersStandardMiscCommon.h           | 2 +-
 DDCore/src/parsers/ParsersStandardSingle.cpp             | 2 +-
 DDCore/src/plugins/GeometryWalk.cpp                      | 2 +-
 DDCore/src/plugins/LCDDHelperTest.cpp                    | 2 +-
 DDCore/src/plugins/PluginInvoker.cpp                     | 2 +-
 DDCore/src/plugins/ShapePlugins.cpp                      | 2 +-
 DDCore/src/plugins/VolumeMgrTest.cpp                     | 2 +-
 DDDetectors/CMakeLists.txt                               | 2 +-
 DDDetectors/src/BoxSegment_geo.cpp                       | 2 +-
 DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp     | 2 +-
 DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp     | 2 +-
 DDDetectors/src/DiskTracker_geo.cpp                      | 2 +-
 DDDetectors/src/EcalBarrel_geo.cpp                       | 2 +-
 DDDetectors/src/ForwardDetector_geo.cpp                  | 2 +-
 DDDetectors/src/LayeringExtensionPlugin.cpp              | 2 +-
 DDDetectors/src/MultiLayerTracker_geo.cpp                | 2 +-
 DDDetectors/src/PolyconeSupport_geo.cpp                  | 2 +-
 DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp      | 2 +-
 DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp      | 2 +-
 DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp | 2 +-
 DDDetectors/src/SiTrackerBarrel_geo.cpp                  | 2 +-
 DDDetectors/src/SiTrackerBarrel_surfaces.cpp             | 2 +-
 DDDetectors/src/SiTrackerEndcap2_geo.cpp                 | 2 +-
 DDDetectors/src/SiTrackerEndcap_surfaces.cpp             | 2 +-
 DDDetectors/src/SubdetectorAssembly_geo.cpp              | 2 +-
 DDDetectors/src/SubdetectorExtensionPlugin.cpp           | 2 +-
 DDDetectors/src/SurfaceExamplePlugin.cpp                 | 2 +-
 DDDetectors/src/TubeSegment_geo.cpp                      | 2 +-
 DDEve/CMakeLists.txt                                     | 2 +-
 DDEve/DDEve/DDEve.C                                      | 2 +-
 DDEve/DDEve/DDG4IO.C                                     | 2 +-
 DDEve/include/DDEve/Annotation.h                         | 2 +-
 DDEve/include/DDEve/Calo2DProjection.h                   | 2 +-
 DDEve/include/DDEve/Calo3DProjection.h                   | 2 +-
 DDEve/include/DDEve/CaloLego.h                           | 2 +-
 DDEve/include/DDEve/ContextMenu.h                        | 2 +-
 DDEve/include/DDEve/DD4hepMenu.h                         | 2 +-
 DDEve/include/DDEve/DDEveEventData.h                     | 2 +-
 DDEve/include/DDEve/DDG4EventHandler.h                   | 2 +-
 DDEve/include/DDEve/Dictionary.h                         | 2 +-
 DDEve/include/DDEve/Display.h                            | 2 +-
 DDEve/include/DDEve/DisplayConfiguration.h               | 2 +-
 DDEve/include/DDEve/ElementList.h                        | 2 +-
 DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h     | 2 +-
 DDEve/include/DDEve/EveShapeContextMenu.h                | 2 +-
 DDEve/include/DDEve/EveUserContextMenu.h                 | 2 +-
 DDEve/include/DDEve/EventControl.h                       | 2 +-
 DDEve/include/DDEve/EventHandler.h                       | 2 +-
 DDEve/include/DDEve/Factories.h                          | 2 +-
 DDEve/include/DDEve/FrameControl.h                       | 2 +-
 DDEve/include/DDEve/GenericEventHandler.h                | 2 +-
 DDEve/include/DDEve/HitActors.h                          | 2 +-
 DDEve/include/DDEve/MultiView.h                          | 2 +-
 DDEve/include/DDEve/ParticleActors.h                     | 2 +-
 DDEve/include/DDEve/PopupMenu.h                          | 2 +-
 DDEve/include/DDEve/Projection.h                         | 2 +-
 DDEve/include/DDEve/RhoPhiProjection.h                   | 2 +-
 DDEve/include/DDEve/RhoZProjection.h                     | 2 +-
 DDEve/include/DDEve/Utilities.h                          | 2 +-
 DDEve/include/DDEve/View.h                               | 2 +-
 DDEve/include/DDEve/View3D.h                             | 2 +-
 DDEve/include/DDEve/ViewMenu.h                           | 2 +-
 DDEve/lcio/LCIOEventHandler.cpp                          | 2 +-
 DDEve/lcio/LCIOEventHandler.h                            | 2 +-
 DDEve/src/Annotation.cpp                                 | 2 +-
 DDEve/src/Calo2DProjection.cpp                           | 2 +-
 DDEve/src/Calo3DProjection.cpp                           | 2 +-
 DDEve/src/CaloLego.cpp                                   | 2 +-
 DDEve/src/ContextMenu.cpp                                | 2 +-
 DDEve/src/DD4hepMenu.cpp                                 | 2 +-
 DDEve/src/DDEveEventData.cpp                             | 2 +-
 DDEve/src/DDEvePlugins.cpp                               | 2 +-
 DDEve/src/DDG4EventHandler.cpp                           | 2 +-
 DDEve/src/Display.cpp                                    | 2 +-
 DDEve/src/DisplayConfiguration.cpp                       | 2 +-
 DDEve/src/DisplayConfigurationParser.cpp                 | 2 +-
 DDEve/src/ElementList.cpp                                | 2 +-
 DDEve/src/EvePgonSetProjectedContextMenu.cpp             | 2 +-
 DDEve/src/EveShapeContextMenu.cpp                        | 2 +-
 DDEve/src/EveUserContextMenu.cpp                         | 2 +-
 DDEve/src/EventControl.cpp                               | 2 +-
 DDEve/src/EventHandler.cpp                               | 2 +-
 DDEve/src/FrameControl.cpp                               | 2 +-
 DDEve/src/GenericEventHandler.cpp                        | 2 +-
 DDEve/src/HitActors.cpp                                  | 2 +-
 DDEve/src/MultiView.cpp                                  | 2 +-
 DDEve/src/ParticleActors.cpp                             | 2 +-
 DDEve/src/PopupMenu.cpp                                  | 2 +-
 DDEve/src/Projection.cpp                                 | 2 +-
 DDEve/src/RhoPhiProjection.cpp                           | 2 +-
 DDEve/src/RhoZProjection.cpp                             | 2 +-
 DDEve/src/Utilities.cpp                                  | 2 +-
 DDEve/src/View.cpp                                       | 2 +-
 DDEve/src/View3D.cpp                                     | 2 +-
 DDEve/src/ViewMenu.cpp                                   | 2 +-
 DDG4/CMakeLists.txt                                      | 2 +-
 DDG4/g4FromXML.cpp                                       | 2 +-
 DDG4/g4gdmlDisplay.cpp                                   | 2 +-
 DDG4/include/DDG4/ComponentProperties.h                  | 2 +-
 DDG4/include/DDG4/ComponentProperties_inl.h              | 2 +-
 DDG4/include/DDG4/ComponentUtils.h                       | 2 +-
 DDG4/include/DDG4/DDG4Dict.h                             | 2 +-
 DDG4/include/DDG4/Geant4Action.h                         | 2 +-
 DDG4/include/DDG4/Geant4ActionPhase.h                    | 2 +-
 DDG4/include/DDG4/Geant4AssemblyVolume.h                 | 2 +-
 DDG4/include/DDG4/Geant4Call.h                           | 2 +-
 DDG4/include/DDG4/Geant4Callback.h                       | 2 +-
 DDG4/include/DDG4/Geant4Config.h                         | 2 +-
 DDG4/include/DDG4/Geant4Context.h                        | 2 +-
 DDG4/include/DDG4/Geant4Data.h                           | 2 +-
 DDG4/include/DDG4/Geant4DataConversion.h                 | 2 +-
 DDG4/include/DDG4/Geant4DataDump.h                       | 2 +-
 DDG4/include/DDG4/Geant4EventAction.h                    | 2 +-
 DDG4/include/DDG4/Geant4GDMLDetector.h                   | 2 +-
 DDG4/include/DDG4/Geant4GeneratorAction.h                | 2 +-
 DDG4/include/DDG4/Geant4GeneratorActionInit.h            | 2 +-
 DDG4/include/DDG4/Geant4GeometryInfo.h                   | 2 +-
 DDG4/include/DDG4/Geant4Handle.h                         | 2 +-
 DDG4/include/DDG4/Geant4HierarchyDump.h                  | 2 +-
 DDG4/include/DDG4/Geant4HitCollection.h                  | 2 +-
 DDG4/include/DDG4/Geant4InputAction.h                    | 2 +-
 DDG4/include/DDG4/Geant4InputHandling.h                  | 2 +-
 DDG4/include/DDG4/Geant4InteractionMerger.h              | 2 +-
 DDG4/include/DDG4/Geant4InteractionVertexBoost.h         | 2 +-
 DDG4/include/DDG4/Geant4InteractionVertexSmear.h         | 2 +-
 DDG4/include/DDG4/Geant4IsotropeGenerator.h              | 2 +-
 DDG4/include/DDG4/Geant4Kernel.h                         | 2 +-
 DDG4/include/DDG4/Geant4Mapping.h                        | 2 +-
 DDG4/include/DDG4/Geant4Output2ROOT.h                    | 2 +-
 DDG4/include/DDG4/Geant4OutputAction.h                   | 2 +-
 DDG4/include/DDG4/Geant4Particle.h                       | 2 +-
 DDG4/include/DDG4/Geant4ParticleGenerator.h              | 2 +-
 DDG4/include/DDG4/Geant4ParticleGun.h                    | 2 +-
 DDG4/include/DDG4/Geant4ParticleHandler.h                | 2 +-
 DDG4/include/DDG4/Geant4ParticlePrint.h                  | 2 +-
 DDG4/include/DDG4/Geant4PhysicsList.h                    | 2 +-
 DDG4/include/DDG4/Geant4Primary.h                        | 2 +-
 DDG4/include/DDG4/Geant4PrimaryHandler.h                 | 2 +-
 DDG4/include/DDG4/Geant4Primitives.h                     | 2 +-
 DDG4/include/DDG4/Geant4Random.h                         | 2 +-
 DDG4/include/DDG4/Geant4RunAction.h                      | 2 +-
 DDG4/include/DDG4/Geant4SensDetAction.h                  | 2 +-
 DDG4/include/DDG4/Geant4SensDetAction.inl                | 2 +-
 DDG4/include/DDG4/Geant4StackingAction.h                 | 2 +-
 DDG4/include/DDG4/Geant4SteppingAction.h                 | 2 +-
 DDG4/include/DDG4/Geant4TestActions.h                    | 2 +-
 DDG4/include/DDG4/Geant4TouchableHandler.h               | 2 +-
 DDG4/include/DDG4/Geant4TrackHandler.h                   | 2 +-
 DDG4/include/DDG4/Geant4TrackInformation.h               | 2 +-
 DDG4/include/DDG4/Geant4TrackingAction.h                 | 2 +-
 DDG4/include/DDG4/Geant4TrackingPostAction.h             | 2 +-
 DDG4/include/DDG4/Geant4TrackingPreAction.h              | 2 +-
 DDG4/include/DDG4/Geant4UIManager.h                      | 2 +-
 DDG4/include/DDG4/Geant4UIMessenger.h                    | 2 +-
 DDG4/include/DDG4/Geant4UserParticleHandler.h            | 2 +-
 DDG4/include/DDG4/Geant4UserPhysicsList.h                | 2 +-
 DDG4/include/DDG4/Geant4Vertex.h                         | 2 +-
 DDG4/include/DDG4/Geant4VolumeManager.h                  | 2 +-
 DDG4/include/DDG4/IoStreams.h                            | 2 +-
 DDG4/lcio/Geant4Output2LCIO.cpp                          | 4 ++--
 DDG4/lcio/LCIOConversions.cpp                            | 2 +-
 DDG4/lcio/LCIOEventReader.cpp                            | 2 +-
 DDG4/lcio/LCIOEventReader.h                              | 2 +-
 DDG4/lcio/LCIOFileReader.cpp                             | 2 +-
 DDG4/lcio/LCIOSDTestActions.cpp                          | 2 +-
 DDG4/lcio/LCIOStdHepReader.cpp                           | 4 ++--
 DDG4/legacy/Geant4CalorimeterSD.cpp                      | 2 +-
 DDG4/legacy/Geant4TrackerCombineSD.cpp                   | 2 +-
 DDG4/legacy/Geant4TrackerSD.cpp                          | 2 +-
 DDG4/plugins/Geant4.10.PhysicsConstructors.h             | 2 +-
 DDG4/plugins/Geant4.9.PhysicsConstructors.h              | 2 +-
 DDG4/plugins/Geant4EscapeCounter.cpp                     | 2 +-
 DDG4/plugins/Geant4EventReaderHepEvt.cpp                 | 2 +-
 DDG4/plugins/Geant4EventReaderHepMC.cpp                  | 2 +-
 DDG4/plugins/Geant4Factories.cpp                         | 2 +-
 DDG4/plugins/Geant4FieldTrackingSetup.cpp                | 4 ++--
 DDG4/plugins/Geant4HitExtractor.cpp                      | 2 +-
 DDG4/plugins/Geant4MaterialScanner.cpp                   | 4 ++--
 DDG4/plugins/Geant4Particles.cpp                         | 2 +-
 DDG4/plugins/Geant4PhysicsConstructors.cpp               | 2 +-
 DDG4/plugins/Geant4PhysicsLists.cpp                      | 2 +-
 DDG4/plugins/Geant4Processes.cpp                         | 2 +-
 DDG4/plugins/Geant4SDActions.cpp                         | 2 +-
 DDG4/plugins/Geant4SensDet.cpp                           | 2 +-
 DDG4/plugins/Geant4SensDetFilters.cpp                    | 2 +-
 DDG4/plugins/Geant4Steppers.cpp                          | 2 +-
 DDG4/plugins/Geant4TCUserParticleHandler.cpp             | 2 +-
 DDG4/plugins/Geant4XMLSetup.cpp                          | 2 +-
 DDG4/python/DD4hep.py                                    | 2 +-
 DDG4/python/DDG4.py                                      | 2 +-
 DDG4/python/DDG4Dict.C                                   | 2 +-
 DDG4/python/checkGeometry.py                             | 2 +-
 DDG4/python/checkOverlaps.py                             | 2 +-
 DDG4/scripts/dumpDDG4.C                                  | 2 +-
 DDG4/src/ComponentProperties.cpp                         | 2 +-
 DDG4/src/Geant4Action.cpp                                | 2 +-
 DDG4/src/Geant4ActionPhase.cpp                           | 2 +-
 DDG4/src/Geant4Call.cpp                                  | 2 +-
 DDG4/src/Geant4Context.cpp                               | 2 +-
 DDG4/src/Geant4Data.cpp                                  | 2 +-
 DDG4/src/Geant4DataConversion.cpp                        | 2 +-
 DDG4/src/Geant4DataDump.cpp                              | 2 +-
 DDG4/src/Geant4EventAction.cpp                           | 2 +-
 DDG4/src/Geant4Exec.cpp                                  | 2 +-
 DDG4/src/Geant4GDMLDetector.cpp                          | 2 +-
 DDG4/src/Geant4GeneratorAction.cpp                       | 2 +-
 DDG4/src/Geant4GeneratorActionInit.cpp                   | 2 +-
 DDG4/src/Geant4GeometryInfo.cpp                          | 2 +-
 DDG4/src/Geant4Handle.cpp                                | 2 +-
 DDG4/src/Geant4HierarchyDump.cpp                         | 2 +-
 DDG4/src/Geant4HitCollection.cpp                         | 2 +-
 DDG4/src/Geant4InputAction.cpp                           | 2 +-
 DDG4/src/Geant4InputHandling.cpp                         | 2 +-
 DDG4/src/Geant4InteractionMerger.cpp                     | 2 +-
 DDG4/src/Geant4InteractionVertexBoost.cpp                | 2 +-
 DDG4/src/Geant4InteractionVertexSmear.cpp                | 2 +-
 DDG4/src/Geant4IsotropeGenerator.cpp                     | 2 +-
 DDG4/src/Geant4Kernel.cpp                                | 2 +-
 DDG4/src/Geant4Mapping.cpp                               | 2 +-
 DDG4/src/Geant4MonteCarloTruth.cpp                       | 2 +-
 DDG4/src/Geant4Output2ROOT.cpp                           | 2 +-
 DDG4/src/Geant4OutputAction.cpp                          | 2 +-
 DDG4/src/Geant4Particle.cpp                              | 2 +-
 DDG4/src/Geant4ParticleGun.cpp                           | 2 +-
 DDG4/src/Geant4ParticleHandler.cpp                       | 2 +-
 DDG4/src/Geant4ParticlePrint.cpp                         | 2 +-
 DDG4/src/Geant4PhysicsList.cpp                           | 2 +-
 DDG4/src/Geant4Plugins.cpp                               | 2 +-
 DDG4/src/Geant4Primary.cpp                               | 2 +-
 DDG4/src/Geant4PrimaryHandler.cpp                        | 2 +-
 DDG4/src/Geant4ROOTDump.cpp                              | 2 +-
 DDG4/src/Geant4Random.cpp                                | 2 +-
 DDG4/src/Geant4RunAction.cpp                             | 2 +-
 DDG4/src/Geant4SensDetAction.cpp                         | 2 +-
 DDG4/src/Geant4StackingAction.cpp                        | 2 +-
 DDG4/src/Geant4SteppingAction.cpp                        | 2 +-
 DDG4/src/Geant4TestActions.cpp                           | 2 +-
 DDG4/src/Geant4TouchableHandler.cpp                      | 2 +-
 DDG4/src/Geant4TrackInformation.cpp                      | 2 +-
 DDG4/src/Geant4TrackingAction.cpp                        | 2 +-
 DDG4/src/Geant4TrackingPostAction.cpp                    | 2 +-
 DDG4/src/Geant4TrackingPreAction.cpp                     | 2 +-
 DDG4/src/Geant4UIManager.cpp                             | 2 +-
 DDG4/src/Geant4UIMessenger.cpp                           | 2 +-
 DDG4/src/Geant4UserParticleHandler.cpp                   | 2 +-
 DDG4/src/Geant4Vertex.cpp                                | 2 +-
 DDG4/src/Geant4VolumeManager.cpp                         | 2 +-
 DDG4/src/IoStreams.cpp                                   | 2 +-
 DDSegmentation/include/DDSegmentation/CartesianGridYZ.h  | 2 +-
 DDSegmentation/src/CartesianGridYZ.cpp                   | 2 +-
 UtilityApps/CMakeLists.txt                               | 2 +-
 UtilityApps/src/EvNavHandler.h                           | 2 +-
 UtilityApps/src/LinkDef.h                                | 2 +-
 UtilityApps/src/MultiView.h                              | 4 ++--
 UtilityApps/src/dumpdetector.cpp                         | 2 +-
 UtilityApps/src/materialScan.cpp                         | 2 +-
 UtilityApps/src/next_event_dummy.cpp                     | 2 +-
 UtilityApps/src/next_event_lcio.cpp                      | 2 +-
 UtilityApps/src/print_materials.cpp                      | 2 +-
 UtilityApps/src/test_surfaces.cpp                        | 2 +-
 UtilityApps/src/teve_display.cpp                         | 2 +-
 373 files changed, 380 insertions(+), 380 deletions(-)

diff --git a/DDAlign/CMakeLists.txt b/DDAlign/CMakeLists.txt
index a43b17c3e..d8dc97e93 100644
--- a/DDAlign/CMakeLists.txt
+++ b/DDAlign/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentCache.h b/DDAlign/include/DDAlign/AlignmentCache.h
index 2f182d2a2..a85d260e6 100644
--- a/DDAlign/include/DDAlign/AlignmentCache.h
+++ b/DDAlign/include/DDAlign/AlignmentCache.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentOperators.h b/DDAlign/include/DDAlign/AlignmentOperators.h
index a38ae6e97..89edb3dc9 100644
--- a/DDAlign/include/DDAlign/AlignmentOperators.h
+++ b/DDAlign/include/DDAlign/AlignmentOperators.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentStack.h b/DDAlign/include/DDAlign/AlignmentStack.h
index 883a7acfb..785cd6962 100644
--- a/DDAlign/include/DDAlign/AlignmentStack.h
+++ b/DDAlign/include/DDAlign/AlignmentStack.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentTags.h b/DDAlign/include/DDAlign/AlignmentTags.h
index 979e84e8f..78ce944f8 100644
--- a/DDAlign/include/DDAlign/AlignmentTags.h
+++ b/DDAlign/include/DDAlign/AlignmentTags.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentTransaction.h b/DDAlign/include/DDAlign/AlignmentTransaction.h
index acec73c6a..515195eee 100644
--- a/DDAlign/include/DDAlign/AlignmentTransaction.h
+++ b/DDAlign/include/DDAlign/AlignmentTransaction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/AlignmentWriter.h b/DDAlign/include/DDAlign/AlignmentWriter.h
index 85841bf2f..f8c1cd85a 100644
--- a/DDAlign/include/DDAlign/AlignmentWriter.h
+++ b/DDAlign/include/DDAlign/AlignmentWriter.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/include/DDAlign/DetectorAlignment.h b/DDAlign/include/DDAlign/DetectorAlignment.h
index 3df31fb9a..906c07771 100644
--- a/DDAlign/include/DDAlign/DetectorAlignment.h
+++ b/DDAlign/include/DDAlign/DetectorAlignment.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentCache.cpp b/DDAlign/src/AlignmentCache.cpp
index f7ec2c2f6..c711a2669 100644
--- a/DDAlign/src/AlignmentCache.cpp
+++ b/DDAlign/src/AlignmentCache.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentOperators.cpp b/DDAlign/src/AlignmentOperators.cpp
index c8d1df23b..952bdf971 100644
--- a/DDAlign/src/AlignmentOperators.cpp
+++ b/DDAlign/src/AlignmentOperators.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentParser.cpp b/DDAlign/src/AlignmentParser.cpp
index b09e41508..0e0dc8e2d 100644
--- a/DDAlign/src/AlignmentParser.cpp
+++ b/DDAlign/src/AlignmentParser.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentStack.cpp b/DDAlign/src/AlignmentStack.cpp
index 1b01e926a..8ecf50f4c 100644
--- a/DDAlign/src/AlignmentStack.cpp
+++ b/DDAlign/src/AlignmentStack.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentTags.cpp b/DDAlign/src/AlignmentTags.cpp
index a1cf1aae9..c819d0146 100644
--- a/DDAlign/src/AlignmentTags.cpp
+++ b/DDAlign/src/AlignmentTags.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentTransaction.cpp b/DDAlign/src/AlignmentTransaction.cpp
index 8b4ae91fe..7bdddd43b 100644
--- a/DDAlign/src/AlignmentTransaction.cpp
+++ b/DDAlign/src/AlignmentTransaction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/AlignmentWriter.cpp b/DDAlign/src/AlignmentWriter.cpp
index 5ba48f70a..26e9ec4ae 100644
--- a/DDAlign/src/AlignmentWriter.cpp
+++ b/DDAlign/src/AlignmentWriter.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDAlign/src/DetectorAlignment.cpp b/DDAlign/src/DetectorAlignment.cpp
index 39563ae8f..1f8e3ce8d 100644
--- a/DDAlign/src/DetectorAlignment.cpp
+++ b/DDAlign/src/DetectorAlignment.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/CMakeLists.txt b/DDCond/CMakeLists.txt
index 614f91b79..30b5f560b 100644
--- a/DDCond/CMakeLists.txt
+++ b/DDCond/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionValidator.h b/DDCond/include/DDCond/ConditionValidator.h
index ad1f6cb05..5b7410ea4 100644
--- a/DDCond/include/DDCond/ConditionValidator.h
+++ b/DDCond/include/DDCond/ConditionValidator.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsHandler.h b/DDCond/include/DDCond/ConditionsHandler.h
index 10622a217..4fe6835ca 100644
--- a/DDCond/include/DDCond/ConditionsHandler.h
+++ b/DDCond/include/DDCond/ConditionsHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsOperators.h b/DDCond/include/DDCond/ConditionsOperators.h
index 5de94cb55..0cceccc71 100644
--- a/DDCond/include/DDCond/ConditionsOperators.h
+++ b/DDCond/include/DDCond/ConditionsOperators.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsStack.h b/DDCond/include/DDCond/ConditionsStack.h
index 0da3cda20..e9dc9ee49 100644
--- a/DDCond/include/DDCond/ConditionsStack.h
+++ b/DDCond/include/DDCond/ConditionsStack.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsTags.h b/DDCond/include/DDCond/ConditionsTags.h
index 17ccefc6c..505db883c 100644
--- a/DDCond/include/DDCond/ConditionsTags.h
+++ b/DDCond/include/DDCond/ConditionsTags.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/include/DDCond/ConditionsTransaction.h b/DDCond/include/DDCond/ConditionsTransaction.h
index e8267c717..9cb211859 100644
--- a/DDCond/include/DDCond/ConditionsTransaction.h
+++ b/DDCond/include/DDCond/ConditionsTransaction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionTest.cpp b/DDCond/src/ConditionTest.cpp
index 5db6649a3..903d243c5 100644
--- a/DDCond/src/ConditionTest.cpp
+++ b/DDCond/src/ConditionTest.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionValidator.cpp b/DDCond/src/ConditionValidator.cpp
index 63a89888c..23deff009 100644
--- a/DDCond/src/ConditionValidator.cpp
+++ b/DDCond/src/ConditionValidator.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsHandler.cpp b/DDCond/src/ConditionsHandler.cpp
index abb454417..cb0b2acaf 100644
--- a/DDCond/src/ConditionsHandler.cpp
+++ b/DDCond/src/ConditionsHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsParser.cpp b/DDCond/src/ConditionsParser.cpp
index 481333599..8da8c373c 100644
--- a/DDCond/src/ConditionsParser.cpp
+++ b/DDCond/src/ConditionsParser.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsStack.cpp b/DDCond/src/ConditionsStack.cpp
index fc2e21e39..d174b0f29 100644
--- a/DDCond/src/ConditionsStack.cpp
+++ b/DDCond/src/ConditionsStack.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsTags.cpp b/DDCond/src/ConditionsTags.cpp
index 6d12540ef..50c5ab75c 100644
--- a/DDCond/src/ConditionsTags.cpp
+++ b/DDCond/src/ConditionsTags.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCond/src/ConditionsTransaction.cpp b/DDCond/src/ConditionsTransaction.cpp
index c83285069..3247263c9 100644
--- a/DDCond/src/ConditionsTransaction.cpp
+++ b/DDCond/src/ConditionsTransaction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/CMakeLists.txt b/DDCore/CMakeLists.txt
index e28bdccf9..8fcf570ae 100644
--- a/DDCore/CMakeLists.txt
+++ b/DDCore/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Alignment.h b/DDCore/include/DD4hep/Alignment.h
index 56a96935a..20b48c321 100644
--- a/DDCore/include/DD4hep/Alignment.h
+++ b/DDCore/include/DD4hep/Alignment.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/BasicGrammar.h b/DDCore/include/DD4hep/BasicGrammar.h
index 7126f6a1b..6a999a57d 100644
--- a/DDCore/include/DD4hep/BasicGrammar.h
+++ b/DDCore/include/DD4hep/BasicGrammar.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Callback.h b/DDCore/include/DD4hep/Callback.h
index 9672d249a..7b0bdc411 100644
--- a/DDCore/include/DD4hep/Callback.h
+++ b/DDCore/include/DD4hep/Callback.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/ConditionTypes.h b/DDCore/include/DD4hep/ConditionTypes.h
index 9da242660..e67a7a0f9 100644
--- a/DDCore/include/DD4hep/ConditionTypes.h
+++ b/DDCore/include/DD4hep/ConditionTypes.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Conditions.h b/DDCore/include/DD4hep/Conditions.h
index e09ba800c..70e0338a4 100644
--- a/DDCore/include/DD4hep/Conditions.h
+++ b/DDCore/include/DD4hep/Conditions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/DD4hepRootPersistency.h b/DDCore/include/DD4hep/DD4hepRootPersistency.h
index c73142adc..7467bcfa3 100644
--- a/DDCore/include/DD4hep/DD4hepRootPersistency.h
+++ b/DDCore/include/DD4hep/DD4hepRootPersistency.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/DD4hepUnits.h b/DDCore/include/DD4hep/DD4hepUnits.h
index 4b4f38006..e78e70f51 100644
--- a/DDCore/include/DD4hep/DD4hepUnits.h
+++ b/DDCore/include/DD4hep/DD4hepUnits.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -275,7 +275,7 @@ namespace dd4hep {
   static const double perMillion = 0.000001;
 
   // -*- C++ -*-
-  // $Id:$
+  // $Id: $
   // ----------------------------------------------------------------------
   // HEP coherent Physical Constants
   //
diff --git a/DDCore/include/DD4hep/DetectorTools.h b/DDCore/include/DD4hep/DetectorTools.h
index 6f5656a82..9de15fe7d 100644
--- a/DDCore/include/DD4hep/DetectorTools.h
+++ b/DDCore/include/DD4hep/DetectorTools.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Dictionary.h b/DDCore/include/DD4hep/Dictionary.h
index 7b4591519..2b8e6cfa8 100644
--- a/DDCore/include/DD4hep/Dictionary.h
+++ b/DDCore/include/DD4hep/Dictionary.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Exceptions.h b/DDCore/include/DD4hep/Exceptions.h
index 42eb317b2..c11b61d91 100644
--- a/DDCore/include/DD4hep/Exceptions.h
+++ b/DDCore/include/DD4hep/Exceptions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Handle.inl b/DDCore/include/DD4hep/Handle.inl
index 971e5bf74..56ed2146d 100644
--- a/DDCore/include/DD4hep/Handle.inl
+++ b/DDCore/include/DD4hep/Handle.inl
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/InstanceCount.h b/DDCore/include/DD4hep/InstanceCount.h
index 0fe867739..3f74373e2 100644
--- a/DDCore/include/DD4hep/InstanceCount.h
+++ b/DDCore/include/DD4hep/InstanceCount.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/LCDDData.h b/DDCore/include/DD4hep/LCDDData.h
index fa38cb7c4..af6179ea0 100644
--- a/DDCore/include/DD4hep/LCDDData.h
+++ b/DDCore/include/DD4hep/LCDDData.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/LCDDHelper.h b/DDCore/include/DD4hep/LCDDHelper.h
index a74e834c9..f150d2cca 100644
--- a/DDCore/include/DD4hep/LCDDHelper.h
+++ b/DDCore/include/DD4hep/LCDDHelper.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/LCDDLoad.h b/DDCore/include/DD4hep/LCDDLoad.h
index 88aade6d1..6621bb568 100644
--- a/DDCore/include/DD4hep/LCDDLoad.h
+++ b/DDCore/include/DD4hep/LCDDLoad.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/MatrixHelpers.h b/DDCore/include/DD4hep/MatrixHelpers.h
index 0c86f3f72..dae1e97de 100644
--- a/DDCore/include/DD4hep/MatrixHelpers.h
+++ b/DDCore/include/DD4hep/MatrixHelpers.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Memory.h b/DDCore/include/DD4hep/Memory.h
index 129a7a2d3..acded026a 100644
--- a/DDCore/include/DD4hep/Memory.h
+++ b/DDCore/include/DD4hep/Memory.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/NamedObject.h b/DDCore/include/DD4hep/NamedObject.h
index fdf6c8a7c..43e88d473 100644
--- a/DDCore/include/DD4hep/NamedObject.h
+++ b/DDCore/include/DD4hep/NamedObject.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/ObjectExtensions.h b/DDCore/include/DD4hep/ObjectExtensions.h
index 3fa6f2e15..e7bbc1c13 100644
--- a/DDCore/include/DD4hep/ObjectExtensions.h
+++ b/DDCore/include/DD4hep/ObjectExtensions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Parsers.h b/DDCore/include/DD4hep/Parsers.h
index 1eb68a526..3aa506987 100644
--- a/DDCore/include/DD4hep/Parsers.h
+++ b/DDCore/include/DD4hep/Parsers.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Plugins.h b/DDCore/include/DD4hep/Plugins.h
index 176b88813..adec0e847 100644
--- a/DDCore/include/DD4hep/Plugins.h
+++ b/DDCore/include/DD4hep/Plugins.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Plugins.inl b/DDCore/include/DD4hep/Plugins.inl
index 5841e0c2d..6e2b94450 100644
--- a/DDCore/include/DD4hep/Plugins.inl
+++ b/DDCore/include/DD4hep/Plugins.inl
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Primitives.h b/DDCore/include/DD4hep/Primitives.h
index 056aad51c..ab62b5096 100644
--- a/DDCore/include/DD4hep/Primitives.h
+++ b/DDCore/include/DD4hep/Primitives.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/Printout.h b/DDCore/include/DD4hep/Printout.h
index 6c59062cd..247646e2a 100644
--- a/DDCore/include/DD4hep/Printout.h
+++ b/DDCore/include/DD4hep/Printout.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/SurfaceInstaller.h b/DDCore/include/DD4hep/SurfaceInstaller.h
index b88459609..25fe31d26 100644
--- a/DDCore/include/DD4hep/SurfaceInstaller.h
+++ b/DDCore/include/DD4hep/SurfaceInstaller.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/ToStream.h b/DDCore/include/DD4hep/ToStream.h
index 3c771c7cb..34d087e19 100644
--- a/DDCore/include/DD4hep/ToStream.h
+++ b/DDCore/include/DD4hep/ToStream.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/VolumeManager.h b/DDCore/include/DD4hep/VolumeManager.h
index 4ed5fe487..a1b9c187e 100644
--- a/DDCore/include/DD4hep/VolumeManager.h
+++ b/DDCore/include/DD4hep/VolumeManager.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/config.h b/DDCore/include/DD4hep/config.h
index 7fc707c8f..9c26f44ac 100644
--- a/DDCore/include/DD4hep/config.h
+++ b/DDCore/include/DD4hep/config.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
index 1a2746e5c..a2406a4bd 100644
--- a/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
+++ b/DDCore/include/DD4hep/objects/BasicGrammar_inl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/ConditionsInterna.h b/DDCore/include/DD4hep/objects/ConditionsInterna.h
index 3e273683b..5f46f354b 100644
--- a/DDCore/include/DD4hep/objects/ConditionsInterna.h
+++ b/DDCore/include/DD4hep/objects/ConditionsInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/DetectorInterna.h b/DDCore/include/DD4hep/objects/DetectorInterna.h
index 169a55c27..e913ae95b 100644
--- a/DDCore/include/DD4hep/objects/DetectorInterna.h
+++ b/DDCore/include/DD4hep/objects/DetectorInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/ObjectsInterna.h b/DDCore/include/DD4hep/objects/ObjectsInterna.h
index 3a7cdcf6e..5cd8a4583 100644
--- a/DDCore/include/DD4hep/objects/ObjectsInterna.h
+++ b/DDCore/include/DD4hep/objects/ObjectsInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/DD4hep/objects/VolumeManagerInterna.h b/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
index 5484be697..92fa27edd 100644
--- a/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
+++ b/DDCore/include/DD4hep/objects/VolumeManagerInterna.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/XML/Utilities.h b/DDCore/include/XML/Utilities.h
index d86152cc3..010e0c7fc 100644
--- a/DDCore/include/XML/Utilities.h
+++ b/DDCore/include/XML/Utilities.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -42,7 +42,7 @@ namespace DD4hep {
      </envelope>
      @endverbatim
      *  @author S.Lu DESY, F. Gaede CERN/DESY 
-     *  @version $Id:$
+     *  @version $Id: $
      */
     Geometry::Volume createPlacedEnvelope( DD4hep::Geometry::LCDD& lcdd, DD4hep::XML::Handle_t e , 
                                            DD4hep::Geometry::DetElement sdet ) ;
diff --git a/DDCore/include/XML/XMLChildValue.h b/DDCore/include/XML/XMLChildValue.h
index 4d4dfc3a2..bdd233bbb 100644
--- a/DDCore/include/XML/XMLChildValue.h
+++ b/DDCore/include/XML/XMLChildValue.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/include/XML/XMLDimension.h b/DDCore/include/XML/XMLDimension.h
index 25eb8a37f..4a200aa5b 100644
--- a/DDCore/include/XML/XMLDimension.h
+++ b/DDCore/include/XML/XMLDimension.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/python/lcdd.py b/DDCore/python/lcdd.py
index 08baace76..6c62ef0cd 100644
--- a/DDCore/python/lcdd.py
+++ b/DDCore/python/lcdd.py
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDCore/src/Alignment.cpp b/DDCore/src/Alignment.cpp
index 02ec2f3c0..bee529ca9 100644
--- a/DDCore/src/Alignment.cpp
+++ b/DDCore/src/Alignment.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/BasicGrammar.cpp b/DDCore/src/BasicGrammar.cpp
index d81bfe1c7..9506cda6e 100644
--- a/DDCore/src/BasicGrammar.cpp
+++ b/DDCore/src/BasicGrammar.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/BasicGrammarTypes.cpp b/DDCore/src/BasicGrammarTypes.cpp
index 0cce29d22..a9bd36ce5 100644
--- a/DDCore/src/BasicGrammarTypes.cpp
+++ b/DDCore/src/BasicGrammarTypes.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Callback.cpp b/DDCore/src/Callback.cpp
index 61801abcb..ec08ff678 100644
--- a/DDCore/src/Callback.cpp
+++ b/DDCore/src/Callback.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Conditions.cpp b/DDCore/src/Conditions.cpp
index 7e6377ee7..b7964ed3a 100644
--- a/DDCore/src/Conditions.cpp
+++ b/DDCore/src/Conditions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ConditionsInterna.cpp b/DDCore/src/ConditionsInterna.cpp
index 869a203ba..b54d50356 100644
--- a/DDCore/src/ConditionsInterna.cpp
+++ b/DDCore/src/ConditionsInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ConditonsTypes.cpp b/DDCore/src/ConditonsTypes.cpp
index 7ac14f135..e09cba97b 100644
--- a/DDCore/src/ConditonsTypes.cpp
+++ b/DDCore/src/ConditonsTypes.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/DD4hepRootPersistency.cpp b/DDCore/src/DD4hepRootPersistency.cpp
index 25093f189..f1398382a 100644
--- a/DDCore/src/DD4hepRootPersistency.cpp
+++ b/DDCore/src/DD4hepRootPersistency.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/DetectorInterna.cpp b/DDCore/src/DetectorInterna.cpp
index 5d64cf5d5..6eb172600 100644
--- a/DDCore/src/DetectorInterna.cpp
+++ b/DDCore/src/DetectorInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/DetectorTools.cpp b/DDCore/src/DetectorTools.cpp
index 0a10a7f6e..ca4819179 100644
--- a/DDCore/src/DetectorTools.cpp
+++ b/DDCore/src/DetectorTools.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Exceptions.cpp b/DDCore/src/Exceptions.cpp
index 49fd40835..90acc12a8 100644
--- a/DDCore/src/Exceptions.cpp
+++ b/DDCore/src/Exceptions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/InstanceCount.cpp b/DDCore/src/InstanceCount.cpp
index 3fd7244b4..61ace8d06 100644
--- a/DDCore/src/InstanceCount.cpp
+++ b/DDCore/src/InstanceCount.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/LCDDData.cpp b/DDCore/src/LCDDData.cpp
index bc6d389f1..c3f04fd22 100644
--- a/DDCore/src/LCDDData.cpp
+++ b/DDCore/src/LCDDData.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/LCDDHelper.cpp b/DDCore/src/LCDDHelper.cpp
index c483e8290..6cc1f730d 100644
--- a/DDCore/src/LCDDHelper.cpp
+++ b/DDCore/src/LCDDHelper.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/LCDDLoad.cpp b/DDCore/src/LCDDLoad.cpp
index af9795420..63f4a051d 100644
--- a/DDCore/src/LCDDLoad.cpp
+++ b/DDCore/src/LCDDLoad.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/MatrixHelpers.cpp b/DDCore/src/MatrixHelpers.cpp
index a18e04f50..cd4c9c90d 100644
--- a/DDCore/src/MatrixHelpers.cpp
+++ b/DDCore/src/MatrixHelpers.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/NamedObject.cpp b/DDCore/src/NamedObject.cpp
index 9464ccddd..51d3e1dd0 100644
--- a/DDCore/src/NamedObject.cpp
+++ b/DDCore/src/NamedObject.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ObjectExtensions.cpp b/DDCore/src/ObjectExtensions.cpp
index d6ce863fc..c364b519e 100644
--- a/DDCore/src/ObjectExtensions.cpp
+++ b/DDCore/src/ObjectExtensions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ObjectsInterna.cpp b/DDCore/src/ObjectsInterna.cpp
index 371cd97ed..dc2d3ff2f 100644
--- a/DDCore/src/ObjectsInterna.cpp
+++ b/DDCore/src/ObjectsInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Plugins.cpp b/DDCore/src/Plugins.cpp
index 05560c737..8f8dcf495 100644
--- a/DDCore/src/Plugins.cpp
+++ b/DDCore/src/Plugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Primitives.cpp b/DDCore/src/Primitives.cpp
index 2dc267d8c..b8577ae92 100644
--- a/DDCore/src/Primitives.cpp
+++ b/DDCore/src/Primitives.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/Printout.cpp b/DDCore/src/Printout.cpp
index 153c188c5..ab19e5263 100644
--- a/DDCore/src/Printout.cpp
+++ b/DDCore/src/Printout.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/SurfaceInstaller.cpp b/DDCore/src/SurfaceInstaller.cpp
index 3a4bafadf..2bb578367 100644
--- a/DDCore/src/SurfaceInstaller.cpp
+++ b/DDCore/src/SurfaceInstaller.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/ToStream.cpp b/DDCore/src/ToStream.cpp
index 7f81cd68c..f809e2505 100644
--- a/DDCore/src/ToStream.cpp
+++ b/DDCore/src/ToStream.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/VolumeManager.cpp b/DDCore/src/VolumeManager.cpp
index 5a26732a9..fcfa9bc3a 100644
--- a/DDCore/src/VolumeManager.cpp
+++ b/DDCore/src/VolumeManager.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/VolumeManagerInterna.cpp b/DDCore/src/VolumeManagerInterna.cpp
index cbb50403c..9b2f12c39 100644
--- a/DDCore/src/VolumeManagerInterna.cpp
+++ b/DDCore/src/VolumeManagerInterna.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/XML/Utilities.cpp b/DDCore/src/XML/Utilities.cpp
index 8902e35cb..df6cd5a88 100644
--- a/DDCore/src/XML/Utilities.cpp
+++ b/DDCore/src/XML/Utilities.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/XML/XMLChildValue.cpp b/DDCore/src/XML/XMLChildValue.cpp
index e52435b67..a4f032309 100644
--- a/DDCore/src/XML/XMLChildValue.cpp
+++ b/DDCore/src/XML/XMLChildValue.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/XML/XMLDimension.cpp b/DDCore/src/XML/XMLDimension.cpp
index fbd977904..d5d5948cc 100644
--- a/DDCore/src/XML/XMLDimension.cpp
+++ b/DDCore/src/XML/XMLDimension.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/Grammars.h b/DDCore/src/parsers/Grammars.h
index 7aa0d12a9..1bccc8653 100644
--- a/DDCore/src/parsers/Grammars.h
+++ b/DDCore/src/parsers/Grammars.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/GrammarsV2.h b/DDCore/src/parsers/GrammarsV2.h
index 75d6e6a25..1b80b6e6a 100644
--- a/DDCore/src/parsers/GrammarsV2.h
+++ b/DDCore/src/parsers/GrammarsV2.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/Parsers.icpp b/DDCore/src/parsers/Parsers.icpp
index c0889fd32..55eaf8bf3 100644
--- a/DDCore/src/parsers/Parsers.icpp
+++ b/DDCore/src/parsers/Parsers.icpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersFactory.h b/DDCore/src/parsers/ParsersFactory.h
index b575a0085..84815d46d 100644
--- a/DDCore/src/parsers/ParsersFactory.h
+++ b/DDCore/src/parsers/ParsersFactory.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersObjects.cpp b/DDCore/src/parsers/ParsersObjects.cpp
index 1c2a047be..9114a035a 100644
--- a/DDCore/src/parsers/ParsersObjects.cpp
+++ b/DDCore/src/parsers/ParsersObjects.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList1.cpp b/DDCore/src/parsers/ParsersStandardList1.cpp
index 48568e7b2..e2d15fd18 100644
--- a/DDCore/src/parsers/ParsersStandardList1.cpp
+++ b/DDCore/src/parsers/ParsersStandardList1.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList2.cpp b/DDCore/src/parsers/ParsersStandardList2.cpp
index 45c34d750..b4efd54bd 100644
--- a/DDCore/src/parsers/ParsersStandardList2.cpp
+++ b/DDCore/src/parsers/ParsersStandardList2.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList3.cpp b/DDCore/src/parsers/ParsersStandardList3.cpp
index b97a649ad..ca60ff573 100644
--- a/DDCore/src/parsers/ParsersStandardList3.cpp
+++ b/DDCore/src/parsers/ParsersStandardList3.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardList4.cpp b/DDCore/src/parsers/ParsersStandardList4.cpp
index 000bb5bf5..582156cef 100644
--- a/DDCore/src/parsers/ParsersStandardList4.cpp
+++ b/DDCore/src/parsers/ParsersStandardList4.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardListCommon.h b/DDCore/src/parsers/ParsersStandardListCommon.h
index f60e45272..d5f15c1eb 100644
--- a/DDCore/src/parsers/ParsersStandardListCommon.h
+++ b/DDCore/src/parsers/ParsersStandardListCommon.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc1.cpp b/DDCore/src/parsers/ParsersStandardMisc1.cpp
index 36258a20d..288894e94 100644
--- a/DDCore/src/parsers/ParsersStandardMisc1.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc1.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc2.cpp b/DDCore/src/parsers/ParsersStandardMisc2.cpp
index 186ec615b..01fc42f96 100644
--- a/DDCore/src/parsers/ParsersStandardMisc2.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc2.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc3.cpp b/DDCore/src/parsers/ParsersStandardMisc3.cpp
index e3d472dea..f56a87a16 100644
--- a/DDCore/src/parsers/ParsersStandardMisc3.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc3.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc4.cpp b/DDCore/src/parsers/ParsersStandardMisc4.cpp
index a9b4b4e78..be09c833a 100644
--- a/DDCore/src/parsers/ParsersStandardMisc4.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc4.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMisc5.cpp b/DDCore/src/parsers/ParsersStandardMisc5.cpp
index 8dc9a6659..bde6cff38 100644
--- a/DDCore/src/parsers/ParsersStandardMisc5.cpp
+++ b/DDCore/src/parsers/ParsersStandardMisc5.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardMiscCommon.h b/DDCore/src/parsers/ParsersStandardMiscCommon.h
index 4eeb28d4a..6e8bf4d5a 100644
--- a/DDCore/src/parsers/ParsersStandardMiscCommon.h
+++ b/DDCore/src/parsers/ParsersStandardMiscCommon.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/parsers/ParsersStandardSingle.cpp b/DDCore/src/parsers/ParsersStandardSingle.cpp
index 2a494b437..63cc8be3e 100644
--- a/DDCore/src/parsers/ParsersStandardSingle.cpp
+++ b/DDCore/src/parsers/ParsersStandardSingle.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/GeometryWalk.cpp b/DDCore/src/plugins/GeometryWalk.cpp
index 4f54a17df..ffffcabe1 100644
--- a/DDCore/src/plugins/GeometryWalk.cpp
+++ b/DDCore/src/plugins/GeometryWalk.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/LCDDHelperTest.cpp b/DDCore/src/plugins/LCDDHelperTest.cpp
index 5d13f14b2..c45adbfb1 100644
--- a/DDCore/src/plugins/LCDDHelperTest.cpp
+++ b/DDCore/src/plugins/LCDDHelperTest.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/PluginInvoker.cpp b/DDCore/src/plugins/PluginInvoker.cpp
index 7fee06a58..9047300bc 100644
--- a/DDCore/src/plugins/PluginInvoker.cpp
+++ b/DDCore/src/plugins/PluginInvoker.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/ShapePlugins.cpp b/DDCore/src/plugins/ShapePlugins.cpp
index bd0a6b77b..e2a1ee58c 100644
--- a/DDCore/src/plugins/ShapePlugins.cpp
+++ b/DDCore/src/plugins/ShapePlugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDCore/src/plugins/VolumeMgrTest.cpp b/DDCore/src/plugins/VolumeMgrTest.cpp
index fec5457c3..5ab668974 100644
--- a/DDCore/src/plugins/VolumeMgrTest.cpp
+++ b/DDCore/src/plugins/VolumeMgrTest.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/CMakeLists.txt b/DDDetectors/CMakeLists.txt
index dfe21b4a5..b9be1e243 100644
--- a/DDDetectors/CMakeLists.txt
+++ b/DDDetectors/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDDetectors/src/BoxSegment_geo.cpp b/DDDetectors/src/BoxSegment_geo.cpp
index 1024b4c3f..33c9fcbc9 100644
--- a/DDDetectors/src/BoxSegment_geo.cpp
+++ b/DDDetectors/src/BoxSegment_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
index e865de693..2327e874c 100644
--- a/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalBarrelCalorimeter_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
index 6fddd3302..8ceb3201a 100644
--- a/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
+++ b/DDDetectors/src/CylindricalEndcapCalorimeter_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/DiskTracker_geo.cpp b/DDDetectors/src/DiskTracker_geo.cpp
index 7a093ae2b..f1e9a2d0a 100644
--- a/DDDetectors/src/DiskTracker_geo.cpp
+++ b/DDDetectors/src/DiskTracker_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/EcalBarrel_geo.cpp b/DDDetectors/src/EcalBarrel_geo.cpp
index 86dc9ad29..27e621f7e 100644
--- a/DDDetectors/src/EcalBarrel_geo.cpp
+++ b/DDDetectors/src/EcalBarrel_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/ForwardDetector_geo.cpp b/DDDetectors/src/ForwardDetector_geo.cpp
index 79937c611..540a28260 100644
--- a/DDDetectors/src/ForwardDetector_geo.cpp
+++ b/DDDetectors/src/ForwardDetector_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/LayeringExtensionPlugin.cpp b/DDDetectors/src/LayeringExtensionPlugin.cpp
index 68d0aaf04..deb50e634 100644
--- a/DDDetectors/src/LayeringExtensionPlugin.cpp
+++ b/DDDetectors/src/LayeringExtensionPlugin.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/MultiLayerTracker_geo.cpp b/DDDetectors/src/MultiLayerTracker_geo.cpp
index 708b9f0fe..c4028601a 100644
--- a/DDDetectors/src/MultiLayerTracker_geo.cpp
+++ b/DDDetectors/src/MultiLayerTracker_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyconeSupport_geo.cpp b/DDDetectors/src/PolyconeSupport_geo.cpp
index cbb0a35f0..2cf3b5f94 100644
--- a/DDDetectors/src/PolyconeSupport_geo.cpp
+++ b/DDDetectors/src/PolyconeSupport_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
index ff2197599..9c4a61f87 100644
--- a/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraBarrelCalorimeter2_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
index 94a797ab9..1c942ceb6 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
index 50d1dc8e6..f7351c2a1 100644
--- a/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
+++ b/DDDetectors/src/PolyhedraEndcapCalorimeter2_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerBarrel_geo.cpp b/DDDetectors/src/SiTrackerBarrel_geo.cpp
index 856d15f1a..b951ceaee 100644
--- a/DDDetectors/src/SiTrackerBarrel_geo.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
index af7baccc8..5d2366c18 100644
--- a/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerBarrel_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerEndcap2_geo.cpp b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
index 5c64732aa..25123ab4c 100644
--- a/DDDetectors/src/SiTrackerEndcap2_geo.cpp
+++ b/DDDetectors/src/SiTrackerEndcap2_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
index 39b19519c..60fda77ee 100644
--- a/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
+++ b/DDDetectors/src/SiTrackerEndcap_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SubdetectorAssembly_geo.cpp b/DDDetectors/src/SubdetectorAssembly_geo.cpp
index 1054b1617..f72ff8a95 100644
--- a/DDDetectors/src/SubdetectorAssembly_geo.cpp
+++ b/DDDetectors/src/SubdetectorAssembly_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SubdetectorExtensionPlugin.cpp b/DDDetectors/src/SubdetectorExtensionPlugin.cpp
index f3dfbc41f..3348ec299 100644
--- a/DDDetectors/src/SubdetectorExtensionPlugin.cpp
+++ b/DDDetectors/src/SubdetectorExtensionPlugin.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/SurfaceExamplePlugin.cpp b/DDDetectors/src/SurfaceExamplePlugin.cpp
index bd000a5d4..00c5494cb 100644
--- a/DDDetectors/src/SurfaceExamplePlugin.cpp
+++ b/DDDetectors/src/SurfaceExamplePlugin.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDDetectors/src/TubeSegment_geo.cpp b/DDDetectors/src/TubeSegment_geo.cpp
index 9f0caa4fa..8ad502d6e 100644
--- a/DDDetectors/src/TubeSegment_geo.cpp
+++ b/DDDetectors/src/TubeSegment_geo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/CMakeLists.txt b/DDEve/CMakeLists.txt
index ce283e132..cf95262ef 100644
--- a/DDEve/CMakeLists.txt
+++ b/DDEve/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDEve/DDEve/DDEve.C b/DDEve/DDEve/DDEve.C
index cfdd6d845..9acec4cc1 100644
--- a/DDEve/DDEve/DDEve.C
+++ b/DDEve/DDEve/DDEve.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/DDEve/DDG4IO.C b/DDEve/DDEve/DDG4IO.C
index de8904266..fbed3af2a 100644
--- a/DDEve/DDEve/DDG4IO.C
+++ b/DDEve/DDEve/DDG4IO.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Annotation.h b/DDEve/include/DDEve/Annotation.h
index b1fd8de74..7c1d45a75 100644
--- a/DDEve/include/DDEve/Annotation.h
+++ b/DDEve/include/DDEve/Annotation.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Calo2DProjection.h b/DDEve/include/DDEve/Calo2DProjection.h
index c01977410..86a6aab15 100644
--- a/DDEve/include/DDEve/Calo2DProjection.h
+++ b/DDEve/include/DDEve/Calo2DProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Calo3DProjection.h b/DDEve/include/DDEve/Calo3DProjection.h
index 3cbc40a5a..a4660cbf2 100644
--- a/DDEve/include/DDEve/Calo3DProjection.h
+++ b/DDEve/include/DDEve/Calo3DProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/CaloLego.h b/DDEve/include/DDEve/CaloLego.h
index cd56b2526..c8e706a5b 100644
--- a/DDEve/include/DDEve/CaloLego.h
+++ b/DDEve/include/DDEve/CaloLego.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ContextMenu.h b/DDEve/include/DDEve/ContextMenu.h
index da7dbb896..09e9920e3 100644
--- a/DDEve/include/DDEve/ContextMenu.h
+++ b/DDEve/include/DDEve/ContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DD4hepMenu.h b/DDEve/include/DDEve/DD4hepMenu.h
index b5c527bd9..66ee660cb 100644
--- a/DDEve/include/DDEve/DD4hepMenu.h
+++ b/DDEve/include/DDEve/DD4hepMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DDEveEventData.h b/DDEve/include/DDEve/DDEveEventData.h
index 55691f4ff..99ed15c57 100644
--- a/DDEve/include/DDEve/DDEveEventData.h
+++ b/DDEve/include/DDEve/DDEveEventData.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DDG4EventHandler.h b/DDEve/include/DDEve/DDG4EventHandler.h
index 07b0f2973..2b46e8f44 100644
--- a/DDEve/include/DDEve/DDG4EventHandler.h
+++ b/DDEve/include/DDEve/DDG4EventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Dictionary.h b/DDEve/include/DDEve/Dictionary.h
index e46a2dd4a..c9b8630b7 100644
--- a/DDEve/include/DDEve/Dictionary.h
+++ b/DDEve/include/DDEve/Dictionary.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Display.h b/DDEve/include/DDEve/Display.h
index 50ef91579..6442f74ce 100644
--- a/DDEve/include/DDEve/Display.h
+++ b/DDEve/include/DDEve/Display.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/DisplayConfiguration.h b/DDEve/include/DDEve/DisplayConfiguration.h
index 408962fbb..5fde5f9a8 100644
--- a/DDEve/include/DDEve/DisplayConfiguration.h
+++ b/DDEve/include/DDEve/DisplayConfiguration.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ElementList.h b/DDEve/include/DDEve/ElementList.h
index a9b694ba6..626277859 100644
--- a/DDEve/include/DDEve/ElementList.h
+++ b/DDEve/include/DDEve/ElementList.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h b/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
index b5ad27802..965afe620 100644
--- a/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
+++ b/DDEve/include/DDEve/EvePgonSetProjectedContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EveShapeContextMenu.h b/DDEve/include/DDEve/EveShapeContextMenu.h
index b25960e17..b31c361ea 100644
--- a/DDEve/include/DDEve/EveShapeContextMenu.h
+++ b/DDEve/include/DDEve/EveShapeContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EveUserContextMenu.h b/DDEve/include/DDEve/EveUserContextMenu.h
index 132b84e25..1cef1a7a2 100644
--- a/DDEve/include/DDEve/EveUserContextMenu.h
+++ b/DDEve/include/DDEve/EveUserContextMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EventControl.h b/DDEve/include/DDEve/EventControl.h
index 3d44d26e1..a636e93df 100644
--- a/DDEve/include/DDEve/EventControl.h
+++ b/DDEve/include/DDEve/EventControl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/EventHandler.h b/DDEve/include/DDEve/EventHandler.h
index a8d42ed78..026172171 100644
--- a/DDEve/include/DDEve/EventHandler.h
+++ b/DDEve/include/DDEve/EventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Factories.h b/DDEve/include/DDEve/Factories.h
index be53a7923..409a7f07a 100644
--- a/DDEve/include/DDEve/Factories.h
+++ b/DDEve/include/DDEve/Factories.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/FrameControl.h b/DDEve/include/DDEve/FrameControl.h
index ec9a3d656..33a0c778c 100644
--- a/DDEve/include/DDEve/FrameControl.h
+++ b/DDEve/include/DDEve/FrameControl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/GenericEventHandler.h b/DDEve/include/DDEve/GenericEventHandler.h
index 0bc375422..c995558b0 100644
--- a/DDEve/include/DDEve/GenericEventHandler.h
+++ b/DDEve/include/DDEve/GenericEventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/HitActors.h b/DDEve/include/DDEve/HitActors.h
index 9c78ad1c9..b080caca2 100644
--- a/DDEve/include/DDEve/HitActors.h
+++ b/DDEve/include/DDEve/HitActors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/MultiView.h b/DDEve/include/DDEve/MultiView.h
index 61db13f6d..ede90e14b 100644
--- a/DDEve/include/DDEve/MultiView.h
+++ b/DDEve/include/DDEve/MultiView.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ParticleActors.h b/DDEve/include/DDEve/ParticleActors.h
index 3f0e2feb3..8ee6e9b12 100644
--- a/DDEve/include/DDEve/ParticleActors.h
+++ b/DDEve/include/DDEve/ParticleActors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/PopupMenu.h b/DDEve/include/DDEve/PopupMenu.h
index 5f4b49af4..975be5082 100644
--- a/DDEve/include/DDEve/PopupMenu.h
+++ b/DDEve/include/DDEve/PopupMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Projection.h b/DDEve/include/DDEve/Projection.h
index d599e8032..c2301c6c1 100644
--- a/DDEve/include/DDEve/Projection.h
+++ b/DDEve/include/DDEve/Projection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/RhoPhiProjection.h b/DDEve/include/DDEve/RhoPhiProjection.h
index a10b89452..d1b611938 100644
--- a/DDEve/include/DDEve/RhoPhiProjection.h
+++ b/DDEve/include/DDEve/RhoPhiProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/RhoZProjection.h b/DDEve/include/DDEve/RhoZProjection.h
index bfd193dfb..e217fa6e2 100644
--- a/DDEve/include/DDEve/RhoZProjection.h
+++ b/DDEve/include/DDEve/RhoZProjection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/Utilities.h b/DDEve/include/DDEve/Utilities.h
index a09f7e15b..834febc71 100644
--- a/DDEve/include/DDEve/Utilities.h
+++ b/DDEve/include/DDEve/Utilities.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/View.h b/DDEve/include/DDEve/View.h
index 96985e8a5..374fd321c 100644
--- a/DDEve/include/DDEve/View.h
+++ b/DDEve/include/DDEve/View.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/View3D.h b/DDEve/include/DDEve/View3D.h
index ae1d38f9e..bf4a46671 100644
--- a/DDEve/include/DDEve/View3D.h
+++ b/DDEve/include/DDEve/View3D.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/include/DDEve/ViewMenu.h b/DDEve/include/DDEve/ViewMenu.h
index b7d750088..4c7a7181b 100644
--- a/DDEve/include/DDEve/ViewMenu.h
+++ b/DDEve/include/DDEve/ViewMenu.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/lcio/LCIOEventHandler.cpp b/DDEve/lcio/LCIOEventHandler.cpp
index 2554915c4..176ba2b9c 100644
--- a/DDEve/lcio/LCIOEventHandler.cpp
+++ b/DDEve/lcio/LCIOEventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/lcio/LCIOEventHandler.h b/DDEve/lcio/LCIOEventHandler.h
index 010cc17e1..1ec941fb6 100644
--- a/DDEve/lcio/LCIOEventHandler.h
+++ b/DDEve/lcio/LCIOEventHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Annotation.cpp b/DDEve/src/Annotation.cpp
index 2cc57d8f2..8781249b6 100644
--- a/DDEve/src/Annotation.cpp
+++ b/DDEve/src/Annotation.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Calo2DProjection.cpp b/DDEve/src/Calo2DProjection.cpp
index 421743a87..568694387 100644
--- a/DDEve/src/Calo2DProjection.cpp
+++ b/DDEve/src/Calo2DProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Calo3DProjection.cpp b/DDEve/src/Calo3DProjection.cpp
index 427cf387f..23400f179 100644
--- a/DDEve/src/Calo3DProjection.cpp
+++ b/DDEve/src/Calo3DProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/CaloLego.cpp b/DDEve/src/CaloLego.cpp
index 17c6c7305..ba1f4f01d 100644
--- a/DDEve/src/CaloLego.cpp
+++ b/DDEve/src/CaloLego.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ContextMenu.cpp b/DDEve/src/ContextMenu.cpp
index 69834e647..4596e6d07 100644
--- a/DDEve/src/ContextMenu.cpp
+++ b/DDEve/src/ContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DD4hepMenu.cpp b/DDEve/src/DD4hepMenu.cpp
index 8701f0af1..ad5279a58 100644
--- a/DDEve/src/DD4hepMenu.cpp
+++ b/DDEve/src/DD4hepMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DDEveEventData.cpp b/DDEve/src/DDEveEventData.cpp
index 45ab9044d..00f075ef0 100644
--- a/DDEve/src/DDEveEventData.cpp
+++ b/DDEve/src/DDEveEventData.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DDEvePlugins.cpp b/DDEve/src/DDEvePlugins.cpp
index 05c83a4ac..f35bf2cd3 100644
--- a/DDEve/src/DDEvePlugins.cpp
+++ b/DDEve/src/DDEvePlugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DDG4EventHandler.cpp b/DDEve/src/DDG4EventHandler.cpp
index 61ac94c63..29170f9d6 100644
--- a/DDEve/src/DDG4EventHandler.cpp
+++ b/DDEve/src/DDG4EventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Display.cpp b/DDEve/src/Display.cpp
index 64166395c..9114fc14e 100644
--- a/DDEve/src/Display.cpp
+++ b/DDEve/src/Display.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DisplayConfiguration.cpp b/DDEve/src/DisplayConfiguration.cpp
index 59c895a4c..9765d6614 100644
--- a/DDEve/src/DisplayConfiguration.cpp
+++ b/DDEve/src/DisplayConfiguration.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/DisplayConfigurationParser.cpp b/DDEve/src/DisplayConfigurationParser.cpp
index b6ad1f865..5f4117533 100644
--- a/DDEve/src/DisplayConfigurationParser.cpp
+++ b/DDEve/src/DisplayConfigurationParser.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ElementList.cpp b/DDEve/src/ElementList.cpp
index c422debca..a9925bcf7 100644
--- a/DDEve/src/ElementList.cpp
+++ b/DDEve/src/ElementList.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EvePgonSetProjectedContextMenu.cpp b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
index b31e4e087..7f7244ace 100644
--- a/DDEve/src/EvePgonSetProjectedContextMenu.cpp
+++ b/DDEve/src/EvePgonSetProjectedContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EveShapeContextMenu.cpp b/DDEve/src/EveShapeContextMenu.cpp
index 132cdb257..f01c2af57 100644
--- a/DDEve/src/EveShapeContextMenu.cpp
+++ b/DDEve/src/EveShapeContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EveUserContextMenu.cpp b/DDEve/src/EveUserContextMenu.cpp
index 8c12dade9..23c516e95 100644
--- a/DDEve/src/EveUserContextMenu.cpp
+++ b/DDEve/src/EveUserContextMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EventControl.cpp b/DDEve/src/EventControl.cpp
index 82d754e34..950df9b07 100644
--- a/DDEve/src/EventControl.cpp
+++ b/DDEve/src/EventControl.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/EventHandler.cpp b/DDEve/src/EventHandler.cpp
index daeeb55ea..63c46eddb 100644
--- a/DDEve/src/EventHandler.cpp
+++ b/DDEve/src/EventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/FrameControl.cpp b/DDEve/src/FrameControl.cpp
index cb17a6d47..7846da6bb 100644
--- a/DDEve/src/FrameControl.cpp
+++ b/DDEve/src/FrameControl.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/GenericEventHandler.cpp b/DDEve/src/GenericEventHandler.cpp
index 11d6cccf5..acd63390e 100644
--- a/DDEve/src/GenericEventHandler.cpp
+++ b/DDEve/src/GenericEventHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/HitActors.cpp b/DDEve/src/HitActors.cpp
index 094c8bd3a..8dcbe6f73 100644
--- a/DDEve/src/HitActors.cpp
+++ b/DDEve/src/HitActors.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/MultiView.cpp b/DDEve/src/MultiView.cpp
index d26849b2d..33e845f71 100644
--- a/DDEve/src/MultiView.cpp
+++ b/DDEve/src/MultiView.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ParticleActors.cpp b/DDEve/src/ParticleActors.cpp
index a9a78efee..67a11fb30 100644
--- a/DDEve/src/ParticleActors.cpp
+++ b/DDEve/src/ParticleActors.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/PopupMenu.cpp b/DDEve/src/PopupMenu.cpp
index 4cb799dbb..c9f19b8e5 100644
--- a/DDEve/src/PopupMenu.cpp
+++ b/DDEve/src/PopupMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Projection.cpp b/DDEve/src/Projection.cpp
index 4a8c78ea9..31a6dd427 100644
--- a/DDEve/src/Projection.cpp
+++ b/DDEve/src/Projection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/RhoPhiProjection.cpp b/DDEve/src/RhoPhiProjection.cpp
index 6aabed3bb..c26d2e8db 100644
--- a/DDEve/src/RhoPhiProjection.cpp
+++ b/DDEve/src/RhoPhiProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/RhoZProjection.cpp b/DDEve/src/RhoZProjection.cpp
index c7d293609..aadec6d52 100644
--- a/DDEve/src/RhoZProjection.cpp
+++ b/DDEve/src/RhoZProjection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/Utilities.cpp b/DDEve/src/Utilities.cpp
index ffa5d927b..89cdfbcd3 100644
--- a/DDEve/src/Utilities.cpp
+++ b/DDEve/src/Utilities.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/View.cpp b/DDEve/src/View.cpp
index 52bfef978..a129293d0 100644
--- a/DDEve/src/View.cpp
+++ b/DDEve/src/View.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/View3D.cpp b/DDEve/src/View3D.cpp
index a362c42ad..0296719fe 100644
--- a/DDEve/src/View3D.cpp
+++ b/DDEve/src/View3D.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDEve/src/ViewMenu.cpp b/DDEve/src/ViewMenu.cpp
index e54a7ad11..1e2849319 100644
--- a/DDEve/src/ViewMenu.cpp
+++ b/DDEve/src/ViewMenu.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index c91e1cf24..4b130e9ac 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/g4FromXML.cpp b/DDG4/g4FromXML.cpp
index a4e1bc147..f21bec1b9 100644
--- a/DDG4/g4FromXML.cpp
+++ b/DDG4/g4FromXML.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/g4gdmlDisplay.cpp b/DDG4/g4gdmlDisplay.cpp
index 05f18cd44..9aa3d9157 100644
--- a/DDG4/g4gdmlDisplay.cpp
+++ b/DDG4/g4gdmlDisplay.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/ComponentProperties.h b/DDG4/include/DDG4/ComponentProperties.h
index 50ed4bff6..a595d9678 100644
--- a/DDG4/include/DDG4/ComponentProperties.h
+++ b/DDG4/include/DDG4/ComponentProperties.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/ComponentProperties_inl.h b/DDG4/include/DDG4/ComponentProperties_inl.h
index 11453bba7..f75708de6 100644
--- a/DDG4/include/DDG4/ComponentProperties_inl.h
+++ b/DDG4/include/DDG4/ComponentProperties_inl.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/ComponentUtils.h b/DDG4/include/DDG4/ComponentUtils.h
index 9d5f47a86..f1a03358e 100644
--- a/DDG4/include/DDG4/ComponentUtils.h
+++ b/DDG4/include/DDG4/ComponentUtils.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/DDG4Dict.h b/DDG4/include/DDG4/DDG4Dict.h
index 4644f5c5c..7c23939b5 100644
--- a/DDG4/include/DDG4/DDG4Dict.h
+++ b/DDG4/include/DDG4/DDG4Dict.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Action.h b/DDG4/include/DDG4/Geant4Action.h
index 1b9433899..5e3db52c4 100644
--- a/DDG4/include/DDG4/Geant4Action.h
+++ b/DDG4/include/DDG4/Geant4Action.h
@@ -3,7 +3,7 @@
 #define DD4HEP_DDG4_GEANT4ACTION_H
 
 // Framework include files
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ActionPhase.h b/DDG4/include/DDG4/Geant4ActionPhase.h
index 55788f302..fe03723e2 100644
--- a/DDG4/include/DDG4/Geant4ActionPhase.h
+++ b/DDG4/include/DDG4/Geant4ActionPhase.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4AssemblyVolume.h b/DDG4/include/DDG4/Geant4AssemblyVolume.h
index 8fefc0733..03280f348 100644
--- a/DDG4/include/DDG4/Geant4AssemblyVolume.h
+++ b/DDG4/include/DDG4/Geant4AssemblyVolume.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Call.h b/DDG4/include/DDG4/Geant4Call.h
index 9d7f7778b..199990682 100644
--- a/DDG4/include/DDG4/Geant4Call.h
+++ b/DDG4/include/DDG4/Geant4Call.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Callback.h b/DDG4/include/DDG4/Geant4Callback.h
index d04b60a4d..39003810a 100644
--- a/DDG4/include/DDG4/Geant4Callback.h
+++ b/DDG4/include/DDG4/Geant4Callback.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Config.h b/DDG4/include/DDG4/Geant4Config.h
index f68f6d733..b8520a291 100644
--- a/DDG4/include/DDG4/Geant4Config.h
+++ b/DDG4/include/DDG4/Geant4Config.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Context.h b/DDG4/include/DDG4/Geant4Context.h
index 67a013848..e84471a22 100644
--- a/DDG4/include/DDG4/Geant4Context.h
+++ b/DDG4/include/DDG4/Geant4Context.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Data.h b/DDG4/include/DDG4/Geant4Data.h
index b6abcd2a2..4ef2994a0 100644
--- a/DDG4/include/DDG4/Geant4Data.h
+++ b/DDG4/include/DDG4/Geant4Data.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4DataConversion.h b/DDG4/include/DDG4/Geant4DataConversion.h
index 0f6948e14..3daa1a515 100644
--- a/DDG4/include/DDG4/Geant4DataConversion.h
+++ b/DDG4/include/DDG4/Geant4DataConversion.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4DataDump.h b/DDG4/include/DDG4/Geant4DataDump.h
index 1e14dc8a4..06860665b 100644
--- a/DDG4/include/DDG4/Geant4DataDump.h
+++ b/DDG4/include/DDG4/Geant4DataDump.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4EventAction.h b/DDG4/include/DDG4/Geant4EventAction.h
index 66554db49..4cb74040e 100644
--- a/DDG4/include/DDG4/Geant4EventAction.h
+++ b/DDG4/include/DDG4/Geant4EventAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GDMLDetector.h b/DDG4/include/DDG4/Geant4GDMLDetector.h
index f6c4b0b59..15426f2ee 100644
--- a/DDG4/include/DDG4/Geant4GDMLDetector.h
+++ b/DDG4/include/DDG4/Geant4GDMLDetector.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeneratorAction.h b/DDG4/include/DDG4/Geant4GeneratorAction.h
index daa7ca818..dc44809a1 100644
--- a/DDG4/include/DDG4/Geant4GeneratorAction.h
+++ b/DDG4/include/DDG4/Geant4GeneratorAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeneratorActionInit.h b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
index 1ace9c856..ac9b4c2c5 100644
--- a/DDG4/include/DDG4/Geant4GeneratorActionInit.h
+++ b/DDG4/include/DDG4/Geant4GeneratorActionInit.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4GeometryInfo.h b/DDG4/include/DDG4/Geant4GeometryInfo.h
index e9f11474f..860b5f1d7 100644
--- a/DDG4/include/DDG4/Geant4GeometryInfo.h
+++ b/DDG4/include/DDG4/Geant4GeometryInfo.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Handle.h b/DDG4/include/DDG4/Geant4Handle.h
index b2787f389..53ec8d813 100644
--- a/DDG4/include/DDG4/Geant4Handle.h
+++ b/DDG4/include/DDG4/Geant4Handle.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4HierarchyDump.h b/DDG4/include/DDG4/Geant4HierarchyDump.h
index 924924b1e..dac42d0df 100644
--- a/DDG4/include/DDG4/Geant4HierarchyDump.h
+++ b/DDG4/include/DDG4/Geant4HierarchyDump.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4HitCollection.h b/DDG4/include/DDG4/Geant4HitCollection.h
index 6f4e21486..06d9dc078 100644
--- a/DDG4/include/DDG4/Geant4HitCollection.h
+++ b/DDG4/include/DDG4/Geant4HitCollection.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InputAction.h b/DDG4/include/DDG4/Geant4InputAction.h
index ce3a50437..cb367992a 100644
--- a/DDG4/include/DDG4/Geant4InputAction.h
+++ b/DDG4/include/DDG4/Geant4InputAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InputHandling.h b/DDG4/include/DDG4/Geant4InputHandling.h
index 4dc807700..90a238e55 100644
--- a/DDG4/include/DDG4/Geant4InputHandling.h
+++ b/DDG4/include/DDG4/Geant4InputHandling.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InteractionMerger.h b/DDG4/include/DDG4/Geant4InteractionMerger.h
index 1dc691390..17866e2fb 100644
--- a/DDG4/include/DDG4/Geant4InteractionMerger.h
+++ b/DDG4/include/DDG4/Geant4InteractionMerger.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
index 59a6f7a19..f7f8e5faf 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexBoost.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
index 26665db0c..e42f6978f 100644
--- a/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
+++ b/DDG4/include/DDG4/Geant4InteractionVertexSmear.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4IsotropeGenerator.h b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
index 604c247ed..e6a67e679 100644
--- a/DDG4/include/DDG4/Geant4IsotropeGenerator.h
+++ b/DDG4/include/DDG4/Geant4IsotropeGenerator.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Kernel.h b/DDG4/include/DDG4/Geant4Kernel.h
index ff4ad7f32..b2e7832ed 100644
--- a/DDG4/include/DDG4/Geant4Kernel.h
+++ b/DDG4/include/DDG4/Geant4Kernel.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Mapping.h b/DDG4/include/DDG4/Geant4Mapping.h
index de4e3cd75..10355984b 100644
--- a/DDG4/include/DDG4/Geant4Mapping.h
+++ b/DDG4/include/DDG4/Geant4Mapping.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Output2ROOT.h b/DDG4/include/DDG4/Geant4Output2ROOT.h
index 84a0d1710..cba8bc437 100644
--- a/DDG4/include/DDG4/Geant4Output2ROOT.h
+++ b/DDG4/include/DDG4/Geant4Output2ROOT.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4OutputAction.h b/DDG4/include/DDG4/Geant4OutputAction.h
index b7e26cf70..4d19c8f30 100644
--- a/DDG4/include/DDG4/Geant4OutputAction.h
+++ b/DDG4/include/DDG4/Geant4OutputAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Particle.h b/DDG4/include/DDG4/Geant4Particle.h
index cf92e2ae4..ac258a35b 100644
--- a/DDG4/include/DDG4/Geant4Particle.h
+++ b/DDG4/include/DDG4/Geant4Particle.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleGenerator.h b/DDG4/include/DDG4/Geant4ParticleGenerator.h
index 5331f5c15..06d6e3033 100644
--- a/DDG4/include/DDG4/Geant4ParticleGenerator.h
+++ b/DDG4/include/DDG4/Geant4ParticleGenerator.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleGun.h b/DDG4/include/DDG4/Geant4ParticleGun.h
index bbd8dfc6b..71dd77c88 100644
--- a/DDG4/include/DDG4/Geant4ParticleGun.h
+++ b/DDG4/include/DDG4/Geant4ParticleGun.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticleHandler.h b/DDG4/include/DDG4/Geant4ParticleHandler.h
index 8ef5ee4ed..a129a7f4d 100644
--- a/DDG4/include/DDG4/Geant4ParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4ParticleHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4ParticlePrint.h b/DDG4/include/DDG4/Geant4ParticlePrint.h
index 2df4ba501..c74ef5bee 100644
--- a/DDG4/include/DDG4/Geant4ParticlePrint.h
+++ b/DDG4/include/DDG4/Geant4ParticlePrint.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4PhysicsList.h b/DDG4/include/DDG4/Geant4PhysicsList.h
index d2cc4de66..7d5adb070 100644
--- a/DDG4/include/DDG4/Geant4PhysicsList.h
+++ b/DDG4/include/DDG4/Geant4PhysicsList.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Primary.h b/DDG4/include/DDG4/Geant4Primary.h
index 73c4fb6a2..ac49f09eb 100644
--- a/DDG4/include/DDG4/Geant4Primary.h
+++ b/DDG4/include/DDG4/Geant4Primary.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4PrimaryHandler.h b/DDG4/include/DDG4/Geant4PrimaryHandler.h
index 3066fbf5f..4cb4b7f45 100644
--- a/DDG4/include/DDG4/Geant4PrimaryHandler.h
+++ b/DDG4/include/DDG4/Geant4PrimaryHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Primitives.h b/DDG4/include/DDG4/Geant4Primitives.h
index 501aee00c..917309a5c 100644
--- a/DDG4/include/DDG4/Geant4Primitives.h
+++ b/DDG4/include/DDG4/Geant4Primitives.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Random.h b/DDG4/include/DDG4/Geant4Random.h
index ca67a6312..d7cea8aaf 100644
--- a/DDG4/include/DDG4/Geant4Random.h
+++ b/DDG4/include/DDG4/Geant4Random.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4RunAction.h b/DDG4/include/DDG4/Geant4RunAction.h
index 210890b46..ed065e532 100644
--- a/DDG4/include/DDG4/Geant4RunAction.h
+++ b/DDG4/include/DDG4/Geant4RunAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4SensDetAction.h b/DDG4/include/DDG4/Geant4SensDetAction.h
index 2e77fe9e2..b607c336d 100644
--- a/DDG4/include/DDG4/Geant4SensDetAction.h
+++ b/DDG4/include/DDG4/Geant4SensDetAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4SensDetAction.inl b/DDG4/include/DDG4/Geant4SensDetAction.inl
index 74a2935b9..bdf3e6aa0 100644
--- a/DDG4/include/DDG4/Geant4SensDetAction.inl
+++ b/DDG4/include/DDG4/Geant4SensDetAction.inl
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4StackingAction.h b/DDG4/include/DDG4/Geant4StackingAction.h
index 70da879ca..4c05ffe5d 100644
--- a/DDG4/include/DDG4/Geant4StackingAction.h
+++ b/DDG4/include/DDG4/Geant4StackingAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4SteppingAction.h b/DDG4/include/DDG4/Geant4SteppingAction.h
index f3f239a2f..39a8fcc13 100644
--- a/DDG4/include/DDG4/Geant4SteppingAction.h
+++ b/DDG4/include/DDG4/Geant4SteppingAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TestActions.h b/DDG4/include/DDG4/Geant4TestActions.h
index 3b9a16e18..93784c8a3 100644
--- a/DDG4/include/DDG4/Geant4TestActions.h
+++ b/DDG4/include/DDG4/Geant4TestActions.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TouchableHandler.h b/DDG4/include/DDG4/Geant4TouchableHandler.h
index 9f687221f..466d0b5c9 100644
--- a/DDG4/include/DDG4/Geant4TouchableHandler.h
+++ b/DDG4/include/DDG4/Geant4TouchableHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackHandler.h b/DDG4/include/DDG4/Geant4TrackHandler.h
index d64088528..b8997c2f2 100644
--- a/DDG4/include/DDG4/Geant4TrackHandler.h
+++ b/DDG4/include/DDG4/Geant4TrackHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackInformation.h b/DDG4/include/DDG4/Geant4TrackInformation.h
index 0ca826ba0..97362729d 100644
--- a/DDG4/include/DDG4/Geant4TrackInformation.h
+++ b/DDG4/include/DDG4/Geant4TrackInformation.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingAction.h b/DDG4/include/DDG4/Geant4TrackingAction.h
index 3fd9666ac..23390de42 100644
--- a/DDG4/include/DDG4/Geant4TrackingAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingPostAction.h b/DDG4/include/DDG4/Geant4TrackingPostAction.h
index f33d23837..3ee803922 100644
--- a/DDG4/include/DDG4/Geant4TrackingPostAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPostAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4TrackingPreAction.h b/DDG4/include/DDG4/Geant4TrackingPreAction.h
index e18a672d5..671a395ee 100644
--- a/DDG4/include/DDG4/Geant4TrackingPreAction.h
+++ b/DDG4/include/DDG4/Geant4TrackingPreAction.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UIManager.h b/DDG4/include/DDG4/Geant4UIManager.h
index 0566660de..0eab53558 100644
--- a/DDG4/include/DDG4/Geant4UIManager.h
+++ b/DDG4/include/DDG4/Geant4UIManager.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UIMessenger.h b/DDG4/include/DDG4/Geant4UIMessenger.h
index a94539798..1a997f456 100644
--- a/DDG4/include/DDG4/Geant4UIMessenger.h
+++ b/DDG4/include/DDG4/Geant4UIMessenger.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UserParticleHandler.h b/DDG4/include/DDG4/Geant4UserParticleHandler.h
index a22e91321..7d9b11109 100644
--- a/DDG4/include/DDG4/Geant4UserParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4UserParticleHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4UserPhysicsList.h b/DDG4/include/DDG4/Geant4UserPhysicsList.h
index 96f02e02b..b1495eb06 100644
--- a/DDG4/include/DDG4/Geant4UserPhysicsList.h
+++ b/DDG4/include/DDG4/Geant4UserPhysicsList.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4Vertex.h b/DDG4/include/DDG4/Geant4Vertex.h
index fd6215175..2d3a772d8 100644
--- a/DDG4/include/DDG4/Geant4Vertex.h
+++ b/DDG4/include/DDG4/Geant4Vertex.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/Geant4VolumeManager.h b/DDG4/include/DDG4/Geant4VolumeManager.h
index e85ff0c01..4b1b5f20a 100644
--- a/DDG4/include/DDG4/Geant4VolumeManager.h
+++ b/DDG4/include/DDG4/Geant4VolumeManager.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/include/DDG4/IoStreams.h b/DDG4/include/DDG4/IoStreams.h
index fd0ee0860..716dadee8 100644
--- a/DDG4/include/DDG4/IoStreams.h
+++ b/DDG4/include/DDG4/IoStreams.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/Geant4Output2LCIO.cpp b/DDG4/lcio/Geant4Output2LCIO.cpp
index 8fa36913d..df2eae6de 100644
--- a/DDG4/lcio/Geant4Output2LCIO.cpp
+++ b/DDG4/lcio/Geant4Output2LCIO.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -75,7 +75,7 @@ namespace DD4hep {
 }      // End namespace DD4hep
 #endif // DD4HEP_DDG4_GEANT4OUTPUT2LCIO_H
 
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOConversions.cpp b/DDG4/lcio/LCIOConversions.cpp
index ff59579c5..8e1772b78 100644
--- a/DDG4/lcio/LCIOConversions.cpp
+++ b/DDG4/lcio/LCIOConversions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOEventReader.cpp b/DDG4/lcio/LCIOEventReader.cpp
index 7d5da86a4..a79badf86 100644
--- a/DDG4/lcio/LCIOEventReader.cpp
+++ b/DDG4/lcio/LCIOEventReader.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOEventReader.h b/DDG4/lcio/LCIOEventReader.h
index df3b6cd4c..03bc1e0bf 100644
--- a/DDG4/lcio/LCIOEventReader.h
+++ b/DDG4/lcio/LCIOEventReader.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOFileReader.cpp b/DDG4/lcio/LCIOFileReader.cpp
index 91a43159c..0a8cf0eda 100644
--- a/DDG4/lcio/LCIOFileReader.cpp
+++ b/DDG4/lcio/LCIOFileReader.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOSDTestActions.cpp b/DDG4/lcio/LCIOSDTestActions.cpp
index e8ae0139a..510e80373 100644
--- a/DDG4/lcio/LCIOSDTestActions.cpp
+++ b/DDG4/lcio/LCIOSDTestActions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/lcio/LCIOStdHepReader.cpp b/DDG4/lcio/LCIOStdHepReader.cpp
index 55242a885..003cfe634 100644
--- a/DDG4/lcio/LCIOStdHepReader.cpp
+++ b/DDG4/lcio/LCIOStdHepReader.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -49,7 +49,7 @@ namespace DD4hep  {
 }       /* End namespace DD4hep */
 #endif  /* DD4HEP_DDG4_LCIOSTDHEPREADER_H */
 
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/legacy/Geant4CalorimeterSD.cpp b/DDG4/legacy/Geant4CalorimeterSD.cpp
index bfa928cfb..7ebef11c4 100644
--- a/DDG4/legacy/Geant4CalorimeterSD.cpp
+++ b/DDG4/legacy/Geant4CalorimeterSD.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/legacy/Geant4TrackerCombineSD.cpp b/DDG4/legacy/Geant4TrackerCombineSD.cpp
index ed7ecd3da..1a9221a71 100644
--- a/DDG4/legacy/Geant4TrackerCombineSD.cpp
+++ b/DDG4/legacy/Geant4TrackerCombineSD.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/legacy/Geant4TrackerSD.cpp b/DDG4/legacy/Geant4TrackerSD.cpp
index c5a8d0941..231cecc05 100644
--- a/DDG4/legacy/Geant4TrackerSD.cpp
+++ b/DDG4/legacy/Geant4TrackerSD.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4.10.PhysicsConstructors.h b/DDG4/plugins/Geant4.10.PhysicsConstructors.h
index e705b944f..4a4acc5a2 100644
--- a/DDG4/plugins/Geant4.10.PhysicsConstructors.h
+++ b/DDG4/plugins/Geant4.10.PhysicsConstructors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4.9.PhysicsConstructors.h b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
index 94b0be6bc..79f1d78ab 100644
--- a/DDG4/plugins/Geant4.9.PhysicsConstructors.h
+++ b/DDG4/plugins/Geant4.9.PhysicsConstructors.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4EscapeCounter.cpp b/DDG4/plugins/Geant4EscapeCounter.cpp
index b5037601e..9090cfe46 100644
--- a/DDG4/plugins/Geant4EscapeCounter.cpp
+++ b/DDG4/plugins/Geant4EscapeCounter.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4EventReaderHepEvt.cpp b/DDG4/plugins/Geant4EventReaderHepEvt.cpp
index 68f7f6b8d..2369ca88b 100644
--- a/DDG4/plugins/Geant4EventReaderHepEvt.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepEvt.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4EventReaderHepMC.cpp b/DDG4/plugins/Geant4EventReaderHepMC.cpp
index a03824901..0d8cf4f0e 100644
--- a/DDG4/plugins/Geant4EventReaderHepMC.cpp
+++ b/DDG4/plugins/Geant4EventReaderHepMC.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Factories.cpp b/DDG4/plugins/Geant4Factories.cpp
index 1de6cefca..9ddc2f7f2 100644
--- a/DDG4/plugins/Geant4Factories.cpp
+++ b/DDG4/plugins/Geant4Factories.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4FieldTrackingSetup.cpp b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
index 9a67364ad..56fa11ea9 100644
--- a/DDG4/plugins/Geant4FieldTrackingSetup.cpp
+++ b/DDG4/plugins/Geant4FieldTrackingSetup.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -94,7 +94,7 @@ namespace DD4hep {
 #endif // DD4HEP_DDG4_GEANT4FIELDTRACKINGSETUP_H
 
 
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4HitExtractor.cpp b/DDG4/plugins/Geant4HitExtractor.cpp
index 3e24b2f21..8c897a660 100644
--- a/DDG4/plugins/Geant4HitExtractor.cpp
+++ b/DDG4/plugins/Geant4HitExtractor.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4MaterialScanner.cpp b/DDG4/plugins/Geant4MaterialScanner.cpp
index d535deffb..700a6e0f3 100644
--- a/DDG4/plugins/Geant4MaterialScanner.cpp
+++ b/DDG4/plugins/Geant4MaterialScanner.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -76,7 +76,7 @@ namespace DD4hep {
   }
 }
 
-// $Id:$
+// $Id: $
 //====================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Particles.cpp b/DDG4/plugins/Geant4Particles.cpp
index a5189606a..66e4891c2 100644
--- a/DDG4/plugins/Geant4Particles.cpp
+++ b/DDG4/plugins/Geant4Particles.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4PhysicsConstructors.cpp b/DDG4/plugins/Geant4PhysicsConstructors.cpp
index f55720047..2577b6380 100644
--- a/DDG4/plugins/Geant4PhysicsConstructors.cpp
+++ b/DDG4/plugins/Geant4PhysicsConstructors.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4PhysicsLists.cpp b/DDG4/plugins/Geant4PhysicsLists.cpp
index d43849e42..5ee3af210 100644
--- a/DDG4/plugins/Geant4PhysicsLists.cpp
+++ b/DDG4/plugins/Geant4PhysicsLists.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Processes.cpp b/DDG4/plugins/Geant4Processes.cpp
index 2706c6199..acb54b661 100644
--- a/DDG4/plugins/Geant4Processes.cpp
+++ b/DDG4/plugins/Geant4Processes.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4SDActions.cpp b/DDG4/plugins/Geant4SDActions.cpp
index aa4488c2b..fcb427b2f 100644
--- a/DDG4/plugins/Geant4SDActions.cpp
+++ b/DDG4/plugins/Geant4SDActions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4SensDet.cpp b/DDG4/plugins/Geant4SensDet.cpp
index 262477e08..b0d72aebb 100644
--- a/DDG4/plugins/Geant4SensDet.cpp
+++ b/DDG4/plugins/Geant4SensDet.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4SensDetFilters.cpp b/DDG4/plugins/Geant4SensDetFilters.cpp
index 4f155b4e1..12047d9b6 100644
--- a/DDG4/plugins/Geant4SensDetFilters.cpp
+++ b/DDG4/plugins/Geant4SensDetFilters.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4Steppers.cpp b/DDG4/plugins/Geant4Steppers.cpp
index c2f80ec9b..09be6c08b 100644
--- a/DDG4/plugins/Geant4Steppers.cpp
+++ b/DDG4/plugins/Geant4Steppers.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4TCUserParticleHandler.cpp b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
index 2cae3bb6f..c7e3400ad 100644
--- a/DDG4/plugins/Geant4TCUserParticleHandler.cpp
+++ b/DDG4/plugins/Geant4TCUserParticleHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/plugins/Geant4XMLSetup.cpp b/DDG4/plugins/Geant4XMLSetup.cpp
index 99e0b8837..6f7a8b380 100644
--- a/DDG4/plugins/Geant4XMLSetup.cpp
+++ b/DDG4/plugins/Geant4XMLSetup.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/python/DD4hep.py b/DDG4/python/DD4hep.py
index d41a9cfe7..aaf6c3848 100644
--- a/DDG4/python/DD4hep.py
+++ b/DDG4/python/DD4hep.py
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/python/DDG4.py b/DDG4/python/DDG4.py
index 008ef63c6..4bdddce30 100644
--- a/DDG4/python/DDG4.py
+++ b/DDG4/python/DDG4.py
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/python/DDG4Dict.C b/DDG4/python/DDG4Dict.C
index 71cd90c9b..b51c633b8 100644
--- a/DDG4/python/DDG4Dict.C
+++ b/DDG4/python/DDG4Dict.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/python/checkGeometry.py b/DDG4/python/checkGeometry.py
index 1e857492b..15c4fa036 100755
--- a/DDG4/python/checkGeometry.py
+++ b/DDG4/python/checkGeometry.py
@@ -1,5 +1,5 @@
 #!/bin/python
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/python/checkOverlaps.py b/DDG4/python/checkOverlaps.py
index 7f41ed02d..959580a65 100755
--- a/DDG4/python/checkOverlaps.py
+++ b/DDG4/python/checkOverlaps.py
@@ -1,5 +1,5 @@
 #!/bin/python
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/DDG4/scripts/dumpDDG4.C b/DDG4/scripts/dumpDDG4.C
index d8e56164b..aaf7e1fa6 100644
--- a/DDG4/scripts/dumpDDG4.C
+++ b/DDG4/scripts/dumpDDG4.C
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/ComponentProperties.cpp b/DDG4/src/ComponentProperties.cpp
index d13f9aeee..fd4995cc9 100644
--- a/DDG4/src/ComponentProperties.cpp
+++ b/DDG4/src/ComponentProperties.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Action.cpp b/DDG4/src/Geant4Action.cpp
index e5d96f628..cc982f47f 100644
--- a/DDG4/src/Geant4Action.cpp
+++ b/DDG4/src/Geant4Action.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ActionPhase.cpp b/DDG4/src/Geant4ActionPhase.cpp
index da60e9f24..d6683ffb4 100644
--- a/DDG4/src/Geant4ActionPhase.cpp
+++ b/DDG4/src/Geant4ActionPhase.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Call.cpp b/DDG4/src/Geant4Call.cpp
index ac3f57d7e..2504e5a92 100644
--- a/DDG4/src/Geant4Call.cpp
+++ b/DDG4/src/Geant4Call.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Context.cpp b/DDG4/src/Geant4Context.cpp
index b0add8c41..6a68706d9 100644
--- a/DDG4/src/Geant4Context.cpp
+++ b/DDG4/src/Geant4Context.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Data.cpp b/DDG4/src/Geant4Data.cpp
index 8e59a0141..7e6d877a1 100644
--- a/DDG4/src/Geant4Data.cpp
+++ b/DDG4/src/Geant4Data.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4DataConversion.cpp b/DDG4/src/Geant4DataConversion.cpp
index 684f7752e..c6944865a 100644
--- a/DDG4/src/Geant4DataConversion.cpp
+++ b/DDG4/src/Geant4DataConversion.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4DataDump.cpp b/DDG4/src/Geant4DataDump.cpp
index 5378eeab9..539d43ee1 100644
--- a/DDG4/src/Geant4DataDump.cpp
+++ b/DDG4/src/Geant4DataDump.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4EventAction.cpp b/DDG4/src/Geant4EventAction.cpp
index 0394f343c..01e3c763c 100644
--- a/DDG4/src/Geant4EventAction.cpp
+++ b/DDG4/src/Geant4EventAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Exec.cpp b/DDG4/src/Geant4Exec.cpp
index 8f068d499..d4d72c116 100644
--- a/DDG4/src/Geant4Exec.cpp
+++ b/DDG4/src/Geant4Exec.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GDMLDetector.cpp b/DDG4/src/Geant4GDMLDetector.cpp
index aa045fbaf..18816057e 100644
--- a/DDG4/src/Geant4GDMLDetector.cpp
+++ b/DDG4/src/Geant4GDMLDetector.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeneratorAction.cpp b/DDG4/src/Geant4GeneratorAction.cpp
index 593d352c3..f6a1d6fea 100644
--- a/DDG4/src/Geant4GeneratorAction.cpp
+++ b/DDG4/src/Geant4GeneratorAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeneratorActionInit.cpp b/DDG4/src/Geant4GeneratorActionInit.cpp
index cf94c5195..05ccf9c68 100644
--- a/DDG4/src/Geant4GeneratorActionInit.cpp
+++ b/DDG4/src/Geant4GeneratorActionInit.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4GeometryInfo.cpp b/DDG4/src/Geant4GeometryInfo.cpp
index 1a1ac0cd9..ab4bfb686 100644
--- a/DDG4/src/Geant4GeometryInfo.cpp
+++ b/DDG4/src/Geant4GeometryInfo.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Handle.cpp b/DDG4/src/Geant4Handle.cpp
index a8e1ce298..38e9091a5 100644
--- a/DDG4/src/Geant4Handle.cpp
+++ b/DDG4/src/Geant4Handle.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4HierarchyDump.cpp b/DDG4/src/Geant4HierarchyDump.cpp
index fbe4cbd9e..9f5d9c72d 100644
--- a/DDG4/src/Geant4HierarchyDump.cpp
+++ b/DDG4/src/Geant4HierarchyDump.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4HitCollection.cpp b/DDG4/src/Geant4HitCollection.cpp
index 3ff42e016..1b1a2f28b 100644
--- a/DDG4/src/Geant4HitCollection.cpp
+++ b/DDG4/src/Geant4HitCollection.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InputAction.cpp b/DDG4/src/Geant4InputAction.cpp
index 0f8aadfd1..6ba2f36d2 100644
--- a/DDG4/src/Geant4InputAction.cpp
+++ b/DDG4/src/Geant4InputAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InputHandling.cpp b/DDG4/src/Geant4InputHandling.cpp
index b14926080..280b66d8c 100644
--- a/DDG4/src/Geant4InputHandling.cpp
+++ b/DDG4/src/Geant4InputHandling.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionMerger.cpp b/DDG4/src/Geant4InteractionMerger.cpp
index 1fd4dfb85..ea47479f4 100644
--- a/DDG4/src/Geant4InteractionMerger.cpp
+++ b/DDG4/src/Geant4InteractionMerger.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionVertexBoost.cpp b/DDG4/src/Geant4InteractionVertexBoost.cpp
index 2af167fbd..9b3e6b112 100644
--- a/DDG4/src/Geant4InteractionVertexBoost.cpp
+++ b/DDG4/src/Geant4InteractionVertexBoost.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4InteractionVertexSmear.cpp b/DDG4/src/Geant4InteractionVertexSmear.cpp
index 3e87684e1..00254a5d7 100644
--- a/DDG4/src/Geant4InteractionVertexSmear.cpp
+++ b/DDG4/src/Geant4InteractionVertexSmear.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4IsotropeGenerator.cpp b/DDG4/src/Geant4IsotropeGenerator.cpp
index c08c372c3..b98a3df6d 100644
--- a/DDG4/src/Geant4IsotropeGenerator.cpp
+++ b/DDG4/src/Geant4IsotropeGenerator.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Kernel.cpp b/DDG4/src/Geant4Kernel.cpp
index d583e7219..6dccbc048 100644
--- a/DDG4/src/Geant4Kernel.cpp
+++ b/DDG4/src/Geant4Kernel.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Mapping.cpp b/DDG4/src/Geant4Mapping.cpp
index cb71c8324..77ec145a1 100644
--- a/DDG4/src/Geant4Mapping.cpp
+++ b/DDG4/src/Geant4Mapping.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4MonteCarloTruth.cpp b/DDG4/src/Geant4MonteCarloTruth.cpp
index 5e1d7c2b6..a5e80e997 100644
--- a/DDG4/src/Geant4MonteCarloTruth.cpp
+++ b/DDG4/src/Geant4MonteCarloTruth.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Output2ROOT.cpp b/DDG4/src/Geant4Output2ROOT.cpp
index 1d409303f..b78710f26 100644
--- a/DDG4/src/Geant4Output2ROOT.cpp
+++ b/DDG4/src/Geant4Output2ROOT.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4OutputAction.cpp b/DDG4/src/Geant4OutputAction.cpp
index 97e2dc113..7bad4ffe1 100644
--- a/DDG4/src/Geant4OutputAction.cpp
+++ b/DDG4/src/Geant4OutputAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Particle.cpp b/DDG4/src/Geant4Particle.cpp
index d7567c266..f2a82824c 100644
--- a/DDG4/src/Geant4Particle.cpp
+++ b/DDG4/src/Geant4Particle.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ParticleGun.cpp b/DDG4/src/Geant4ParticleGun.cpp
index 20df50325..e4d0be7b6 100644
--- a/DDG4/src/Geant4ParticleGun.cpp
+++ b/DDG4/src/Geant4ParticleGun.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ParticleHandler.cpp b/DDG4/src/Geant4ParticleHandler.cpp
index d122868d3..d15bca5db 100644
--- a/DDG4/src/Geant4ParticleHandler.cpp
+++ b/DDG4/src/Geant4ParticleHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ParticlePrint.cpp b/DDG4/src/Geant4ParticlePrint.cpp
index caf6e6184..25dc0b9e3 100644
--- a/DDG4/src/Geant4ParticlePrint.cpp
+++ b/DDG4/src/Geant4ParticlePrint.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4PhysicsList.cpp b/DDG4/src/Geant4PhysicsList.cpp
index ec1937816..daef90924 100644
--- a/DDG4/src/Geant4PhysicsList.cpp
+++ b/DDG4/src/Geant4PhysicsList.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Plugins.cpp b/DDG4/src/Geant4Plugins.cpp
index 4af274e56..ec4513de1 100644
--- a/DDG4/src/Geant4Plugins.cpp
+++ b/DDG4/src/Geant4Plugins.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Primary.cpp b/DDG4/src/Geant4Primary.cpp
index 72d427270..1f4773bfb 100644
--- a/DDG4/src/Geant4Primary.cpp
+++ b/DDG4/src/Geant4Primary.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4PrimaryHandler.cpp b/DDG4/src/Geant4PrimaryHandler.cpp
index 095f4d9e8..ba65062be 100644
--- a/DDG4/src/Geant4PrimaryHandler.cpp
+++ b/DDG4/src/Geant4PrimaryHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4ROOTDump.cpp b/DDG4/src/Geant4ROOTDump.cpp
index e997b2dea..0fefa91ba 100644
--- a/DDG4/src/Geant4ROOTDump.cpp
+++ b/DDG4/src/Geant4ROOTDump.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Random.cpp b/DDG4/src/Geant4Random.cpp
index e6b94c5a8..da0306366 100644
--- a/DDG4/src/Geant4Random.cpp
+++ b/DDG4/src/Geant4Random.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4RunAction.cpp b/DDG4/src/Geant4RunAction.cpp
index c44b229ae..cb2045c7c 100644
--- a/DDG4/src/Geant4RunAction.cpp
+++ b/DDG4/src/Geant4RunAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4SensDetAction.cpp b/DDG4/src/Geant4SensDetAction.cpp
index 88240c7fc..b75d9b7da 100644
--- a/DDG4/src/Geant4SensDetAction.cpp
+++ b/DDG4/src/Geant4SensDetAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4StackingAction.cpp b/DDG4/src/Geant4StackingAction.cpp
index b00a6589d..839509afd 100644
--- a/DDG4/src/Geant4StackingAction.cpp
+++ b/DDG4/src/Geant4StackingAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4SteppingAction.cpp b/DDG4/src/Geant4SteppingAction.cpp
index ba1339d0b..289d8668c 100644
--- a/DDG4/src/Geant4SteppingAction.cpp
+++ b/DDG4/src/Geant4SteppingAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TestActions.cpp b/DDG4/src/Geant4TestActions.cpp
index e41edc809..4254503c6 100644
--- a/DDG4/src/Geant4TestActions.cpp
+++ b/DDG4/src/Geant4TestActions.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TouchableHandler.cpp b/DDG4/src/Geant4TouchableHandler.cpp
index 656c1d1dd..9b9d51df1 100644
--- a/DDG4/src/Geant4TouchableHandler.cpp
+++ b/DDG4/src/Geant4TouchableHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackInformation.cpp b/DDG4/src/Geant4TrackInformation.cpp
index 450daeb34..15afa5ba5 100644
--- a/DDG4/src/Geant4TrackInformation.cpp
+++ b/DDG4/src/Geant4TrackInformation.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingAction.cpp b/DDG4/src/Geant4TrackingAction.cpp
index 556652771..1ea3c6d89 100644
--- a/DDG4/src/Geant4TrackingAction.cpp
+++ b/DDG4/src/Geant4TrackingAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingPostAction.cpp b/DDG4/src/Geant4TrackingPostAction.cpp
index 5e4552061..696a5b7d5 100644
--- a/DDG4/src/Geant4TrackingPostAction.cpp
+++ b/DDG4/src/Geant4TrackingPostAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4TrackingPreAction.cpp b/DDG4/src/Geant4TrackingPreAction.cpp
index fcce3efbb..dbde08366 100644
--- a/DDG4/src/Geant4TrackingPreAction.cpp
+++ b/DDG4/src/Geant4TrackingPreAction.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UIManager.cpp b/DDG4/src/Geant4UIManager.cpp
index b4e5b2fe9..9c435af7f 100644
--- a/DDG4/src/Geant4UIManager.cpp
+++ b/DDG4/src/Geant4UIManager.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UIMessenger.cpp b/DDG4/src/Geant4UIMessenger.cpp
index c4ed5c3c5..44b872b44 100644
--- a/DDG4/src/Geant4UIMessenger.cpp
+++ b/DDG4/src/Geant4UIMessenger.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4UserParticleHandler.cpp b/DDG4/src/Geant4UserParticleHandler.cpp
index 454f76a68..6f1dc7017 100644
--- a/DDG4/src/Geant4UserParticleHandler.cpp
+++ b/DDG4/src/Geant4UserParticleHandler.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4Vertex.cpp b/DDG4/src/Geant4Vertex.cpp
index 8f96088e0..3648e50b6 100644
--- a/DDG4/src/Geant4Vertex.cpp
+++ b/DDG4/src/Geant4Vertex.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/Geant4VolumeManager.cpp b/DDG4/src/Geant4VolumeManager.cpp
index 0bdaf5ab6..a9c2c1e09 100644
--- a/DDG4/src/Geant4VolumeManager.cpp
+++ b/DDG4/src/Geant4VolumeManager.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDG4/src/IoStreams.cpp b/DDG4/src/IoStreams.cpp
index 04d61a5c8..d963cb1e4 100644
--- a/DDG4/src/IoStreams.cpp
+++ b/DDG4/src/IoStreams.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h b/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h
index a9f3fba8e..9060b60a1 100644
--- a/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h
+++ b/DDSegmentation/include/DDSegmentation/CartesianGridYZ.h
@@ -11,7 +11,7 @@ namespace DDSegmentation {
  *
  *  @date: Sep 03, 2014
  *  @author: F.Gaede CERN/Desy
- *  @version: $Id$
+ *  @version: $Id: $
  *     direkt copy of CartesianGridXY
  *     by Christian Grefe, CERN
  */
diff --git a/DDSegmentation/src/CartesianGridYZ.cpp b/DDSegmentation/src/CartesianGridYZ.cpp
index 66be1861d..82db02bbd 100644
--- a/DDSegmentation/src/CartesianGridYZ.cpp
+++ b/DDSegmentation/src/CartesianGridYZ.cpp
@@ -2,7 +2,7 @@
  *
  *  @date: Sep 03, 2014
  *  @author: F.Gaede CERN/Desy
- *  @version: $Id$
+ *  @version: $Id: $
  *     direkt copy of CartesianGridXY
  *     by Christian Grefe, CERN
  */
diff --git a/UtilityApps/CMakeLists.txt b/UtilityApps/CMakeLists.txt
index de5c2be50..4f2e162ae 100644
--- a/UtilityApps/CMakeLists.txt
+++ b/UtilityApps/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: $
 #==========================================================================
 #  AIDA Detector description implementation for LCD
 #--------------------------------------------------------------------------
diff --git a/UtilityApps/src/EvNavHandler.h b/UtilityApps/src/EvNavHandler.h
index 43bcfd50e..e348e5384 100644
--- a/UtilityApps/src/EvNavHandler.h
+++ b/UtilityApps/src/EvNavHandler.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/LinkDef.h b/UtilityApps/src/LinkDef.h
index 3a576a189..c843552a7 100644
--- a/UtilityApps/src/LinkDef.h
+++ b/UtilityApps/src/LinkDef.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/MultiView.h b/UtilityApps/src/MultiView.h
index f2f3b5404..3a6c9776c 100644
--- a/UtilityApps/src/MultiView.h
+++ b/UtilityApps/src/MultiView.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
@@ -35,7 +35,7 @@
  * Should be used in compiled mode.
  * 
  * @author F.Gaede, DESY (modified original version from Matevz Tadel)
- * @version "$Id:$"
+ * @version "$Id: $"
  */
 
 class MultiView {
diff --git a/UtilityApps/src/dumpdetector.cpp b/UtilityApps/src/dumpdetector.cpp
index 8180b018c..f1c485d37 100644
--- a/UtilityApps/src/dumpdetector.cpp
+++ b/UtilityApps/src/dumpdetector.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/materialScan.cpp b/UtilityApps/src/materialScan.cpp
index 006b32d59..db7841085 100644
--- a/UtilityApps/src/materialScan.cpp
+++ b/UtilityApps/src/materialScan.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/next_event_dummy.cpp b/UtilityApps/src/next_event_dummy.cpp
index 01f142037..ae4c0da07 100644
--- a/UtilityApps/src/next_event_dummy.cpp
+++ b/UtilityApps/src/next_event_dummy.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/next_event_lcio.cpp b/UtilityApps/src/next_event_lcio.cpp
index 3e114ef20..27413628d 100644
--- a/UtilityApps/src/next_event_lcio.cpp
+++ b/UtilityApps/src/next_event_lcio.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/print_materials.cpp b/UtilityApps/src/print_materials.cpp
index e834f1c82..9a424ad65 100644
--- a/UtilityApps/src/print_materials.cpp
+++ b/UtilityApps/src/print_materials.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/test_surfaces.cpp b/UtilityApps/src/test_surfaces.cpp
index 9c1a2a669..1c619bcf2 100644
--- a/UtilityApps/src/test_surfaces.cpp
+++ b/UtilityApps/src/test_surfaces.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
diff --git a/UtilityApps/src/teve_display.cpp b/UtilityApps/src/teve_display.cpp
index dc492eefd..5a1982b8b 100644
--- a/UtilityApps/src/teve_display.cpp
+++ b/UtilityApps/src/teve_display.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: $
 //==========================================================================
 //  AIDA Detector description implementation for LCD
 //--------------------------------------------------------------------------
-- 
GitLab