Merge Base to Core

cms-sw · Jun 5, 2017 · bdf08d0 · bdf08d0
1 parent 9acdc29
commit bdf08d0
Show file tree

Hide file tree

Showing 214 changed files with 235 additions and 262 deletions.
diff --git a/Alignment/CocoaFit/src/CocoaDBMgr.cc b/Alignment/CocoaFit/src/CocoaDBMgr.cc
@@ -12,8 +12,6 @@
 #include "CondFormats/OptAlignObjects/interface/OpticalAlignMeasurementInfo.h" 
 #include "CondFormats/DataRecord/interface/OpticalAlignmentsRcd.h" 
 #include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h" 
-#include "DetectorDescription/Core/interface/DDFilteredView.h"
-#include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"

diff --git a/DetectorDescription/Algorithm/BuildFile.xml b/DetectorDescription/Algorithm/BuildFile.xml
@@ -1,4 +1,3 @@
-<use   name="DetectorDescription/Base"/>
 <use   name="DetectorDescription/Core"/>
 <use   name="FWCore/PluginManager"/>
 <use   name="clhep"/>

diff --git a/DetectorDescription/Algorithm/interface/DDAlgorithm.h b/DetectorDescription/Algorithm/interface/DDAlgorithm.h
@@ -1,7 +1,7 @@
 #ifndef DD_ALGO_PLUGIN_DD_ALGORITHM_H
 #define DD_ALGO_PLUGIN_DD_ALGORITHM_H
 
-#include "DetectorDescription/Base/interface/DDTypes.h"
+#include "DetectorDescription/Core/interface/DDTypes.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include <vector>

diff --git a/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h b/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
-#include "DetectorDescription/Base/interface/DDTypes.h"
+#include "DetectorDescription/Core/interface/DDTypes.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 
 class DDAlgorithm;

diff --git a/DetectorDescription/Algorithm/plugins/DDAngular.cc b/DetectorDescription/Algorithm/plugins/DDAngular.cc
@@ -4,7 +4,7 @@
 
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
-#include "DetectorDescription/Base/interface/DDAlgoPar.h"
+#include "DetectorDescription/Core/interface/DDAlgoPar.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"

diff --git a/DetectorDescription/Algorithm/plugins/DDAngular.h b/DetectorDescription/Algorithm/plugins/DDAngular.h
@@ -6,9 +6,9 @@
 #include <vector>
 
 # include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
-# include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
-# include "DetectorDescription/Base/interface/DDTypes.h"
+# include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
+# include "DetectorDescription/Core/interface/DDTypes.h"
 
 class DDCompactView;
 

diff --git a/DetectorDescription/Algorithm/plugins/DDLinear.cc b/DetectorDescription/Algorithm/plugins/DDLinear.cc
@@ -4,8 +4,8 @@
 
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"

diff --git a/DetectorDescription/Algorithm/plugins/DDLinear.h b/DetectorDescription/Algorithm/plugins/DDLinear.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 # include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
-# include "DetectorDescription/Base/interface/DDTypes.h"
+# include "DetectorDescription/Core/interface/DDTypes.h"
 
 class DDCompactView;
 

diff --git a/DetectorDescription/Base/BuildFile.xml b/DetectorDescription/Base/BuildFile.xml
diff --git a/DetectorDescription/Base/test/BuildFile.xml b/DetectorDescription/Base/test/BuildFile.xml
diff --git a/DetectorDescription/Core/BuildFile.xml b/DetectorDescription/Core/BuildFile.xml
@@ -1,4 +1,3 @@
-<use   name="DetectorDescription/Base"/>
 <use   name="DetectorDescription/ExprAlgo"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/MessageLogger"/>

diff --git a/...torDescription/Base/interface/DDAlgoPar.h → ...torDescription/Core/interface/DDAlgoPar.h b/...torDescription/Base/interface/DDAlgoPar.h → ...torDescription/Core/interface/DDAlgoPar.h
diff --git a/DetectorDescription/Core/interface/DDAxes.h b/DetectorDescription/Core/interface/DDAxes.h
@@ -1,7 +1,7 @@
 #ifndef DDAxes_h
 #define DDAxes_h
 
-#include "DetectorDescription/Base/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
 
 #include <string>
 #include <map>

diff --git a/DetectorDescription/Core/interface/DDBase.h b/DetectorDescription/Core/interface/DDBase.h
@@ -2,9 +2,9 @@
 #define DDCore_DDBase_h
 
 #include <utility>
-#include "DetectorDescription/Base/interface/Singleton.h"
-#include "DetectorDescription/Base/interface/Store.h"
-#include "DetectorDescription/Base/interface/rep_type.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Store.h"
+#include "DetectorDescription/Core/interface/rep_type.h"
 
 template <class N, class C>
 class DDBase

diff --git a/DetectorDescription/Core/interface/DDCompactView.h b/DetectorDescription/Core/interface/DDCompactView.h
@@ -7,9 +7,9 @@
 #include <utility>
 # include <vector>
 
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/Store.h"
 # include "DetectorDescription/Core/interface/DDLogicalPart.h"
 # include "DetectorDescription/Core/interface/DDPosData.h"
 #include "DetectorDescription/Core/interface/DDTransform.h"

diff --git a/DetectorDescription/Core/interface/DDCompactViewImpl.h b/DetectorDescription/Core/interface/DDCompactViewImpl.h
@@ -1,7 +1,7 @@
 #ifndef DDCompactViewImpl_h
 # define DDCompactViewImpl_h
 
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 # include "DetectorDescription/Core/interface/DDLogicalPart.h"
 # include "DetectorDescription/Core/interface/DDPosData.h"
 #include "DetectorDescription/Core/interface/DDTransform.h"

diff --git a/DetectorDescription/Core/interface/DDDivision.h b/DetectorDescription/Core/interface/DDDivision.h
@@ -58,7 +58,7 @@
 #include <string>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
 #include "DetectorDescription/Core/interface/DDAxes.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"

diff --git a/DetectorDescription/Core/interface/DDExpandedNode.h b/DetectorDescription/Core/interface/DDExpandedNode.h
@@ -4,8 +4,8 @@
 #include <iosfwd>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDTransform.h"
 

diff --git a/DetectorDescription/Core/interface/DDExpandedView.h b/DetectorDescription/Core/interface/DDExpandedView.h
@@ -8,8 +8,8 @@
 #include <utility>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "DetectorDescription/Core/interface/DDExpandedNode.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"

diff --git a/DetectorDescription/Core/interface/DDFilteredView.h b/DetectorDescription/Core/interface/DDFilteredView.h
@@ -4,8 +4,8 @@
 #include <utility>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDExpandedNode.h"
 #include "DetectorDescription/Core/interface/DDExpandedView.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"

diff --git a/DetectorDescription/Core/interface/DDLogicalPart.h b/DetectorDescription/Core/interface/DDLogicalPart.h
@@ -7,7 +7,7 @@
 #include <utility>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDEnums.h"
 #include "DetectorDescription/Core/interface/DDName.h"

diff --git a/DetectorDescription/Core/interface/DDMap.h b/DetectorDescription/Core/interface/DDMap.h
@@ -5,7 +5,7 @@
 #include <map>
 #include <string>
 
-#include "DetectorDescription/Base/interface/DDReadMapType.h"
+#include "DetectorDescription/Core/interface/DDReadMapType.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDName.h"
 

diff --git a/DetectorDescription/Core/interface/DDPosData.h b/DetectorDescription/Core/interface/DDPosData.h
@@ -2,7 +2,7 @@
 #define DetectorDescription_Core_DDPosData_h
 
 #include "DetectorDescription/Core/interface/DDTransform.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDDivision.h"
 
 //! Relative position of a child-volume inside a parent-volume

diff --git a/...escription/Base/interface/DDReadMapType.h → ...escription/Core/interface/DDReadMapType.h b/...escription/Base/interface/DDReadMapType.h → ...escription/Core/interface/DDReadMapType.h
diff --git a/DetectorDescription/Core/interface/DDRegistry.h b/DetectorDescription/Core/interface/DDRegistry.h
@@ -2,7 +2,7 @@
 #define DDD_DDRegistry_h
 
 #include <map>
-//#include "DetectorDescription/Base/interface/Singleton.h"
+//#include "DetectorDescription/Core/interface/Singleton.h"
 #include "DetectorDescription/Core/interface/DDName.h"
 
 template <class T>

diff --git a/DetectorDescription/Core/interface/DDRoot.h b/DetectorDescription/Core/interface/DDRoot.h
@@ -2,7 +2,7 @@
 #define DDRoot_h
 
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
-#include "DetectorDescription/Base/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
 
 //!  Defines the root of the CompactView
 /**

diff --git a/...ription/Base/interface/DDRotationMatrix.h → ...ription/Core/interface/DDRotationMatrix.h b/...ription/Base/interface/DDRotationMatrix.h → ...ription/Core/interface/DDRotationMatrix.h
diff --git a/DetectorDescription/Core/interface/DDSolid.h b/DetectorDescription/Core/interface/DDSolid.h
@@ -5,7 +5,7 @@
 #include <iosfwd>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDName.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"

diff --git a/DetectorDescription/Core/interface/DDTransform.h b/DetectorDescription/Core/interface/DDTransform.h
@@ -3,7 +3,7 @@
 
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDName.h"
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
 
 class DDRotation;
 

diff --git a/...escription/Base/interface/DDTranslation.h → ...escription/Core/interface/DDTranslation.h b/...escription/Base/interface/DDTranslation.h → ...escription/Core/interface/DDTranslation.h
diff --git a/DetectorDescription/Base/interface/DDTypes.h → DetectorDescription/Core/interface/DDTypes.h b/DetectorDescription/Base/interface/DDTypes.h → DetectorDescription/Core/interface/DDTypes.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "DetectorDescription/Base/interface/DDReadMapType.h"
+#include "DetectorDescription/Core/interface/DDReadMapType.h"
 #include <iosfwd>
 
 //! corresponds to a collection of named doubles 

diff --git a/DetectorDescription/Base/interface/DDutils.h → DetectorDescription/Core/interface/DDutils.h b/DetectorDescription/Base/interface/DDutils.h → DetectorDescription/Core/interface/DDutils.h
diff --git a/...torDescription/Base/interface/Singleton.h → ...torDescription/Core/interface/Singleton.h b/...torDescription/Base/interface/Singleton.h → ...torDescription/Core/interface/Singleton.h
diff --git a/...rDescription/Base/interface/Singleton.icc → ...rDescription/Core/interface/Singleton.icc b/...rDescription/Base/interface/Singleton.icc → ...rDescription/Core/interface/Singleton.icc
diff --git a/DetectorDescription/Base/interface/Store.h → DetectorDescription/Core/interface/Store.h b/DetectorDescription/Base/interface/Store.h → DetectorDescription/Core/interface/Store.h
@@ -2,7 +2,7 @@
 #define DDI_Store_h
 
 #include <map>
-#include "DetectorDescription/Base/interface/rep_type.h"
+#include "DetectorDescription/Core/interface/rep_type.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //;

diff --git a/...ctorDescription/Base/interface/rep_type.h → ...ctorDescription/Core/interface/rep_type.h b/...ctorDescription/Base/interface/rep_type.h → ...ctorDescription/Core/interface/rep_type.h
diff --git a/DetectorDescription/Core/src/Boolean.h b/DetectorDescription/Core/src/Boolean.h
@@ -1,7 +1,7 @@
 #ifndef DETECTOR_DESCRIPTION_CORE_DDI_BOOLEAN_H
 #define DETECTOR_DESCRIPTION_CORE_DDI_BOOLEAN_H
 
-#include "DetectorDescription/Base/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/interface/DDTransform.h"

diff --git a/DetectorDescription/Core/src/DDCheckMaterials.cc b/DetectorDescription/Core/src/DDCheckMaterials.cc
@@ -3,7 +3,7 @@
 #include <utility>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDMaterial.h"
 #include "DetectorDescription/Core/interface/DDName.h"

diff --git a/DetectorDescription/Core/src/DDCompactView.cc b/DetectorDescription/Core/src/DDCompactView.cc
@@ -2,7 +2,7 @@
 
 #include <stdlib.h>
 
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDCompactViewImpl.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"

diff --git a/DetectorDescription/Core/src/DDConstant.cc b/DetectorDescription/Core/src/DDConstant.cc
@@ -4,7 +4,7 @@
 #include <utility>
 #include <vector>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h"
 #include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DetectorDescription/Core/src/DDDivision.cc b/DetectorDescription/Core/src/DDDivision.cc
@@ -2,7 +2,7 @@
 
 #include <ostream>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "Division.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/DetectorDescription/Core/src/DDLogicalPart.cc b/DetectorDescription/Core/src/DDLogicalPart.cc
@@ -2,7 +2,7 @@
 
 #include <ostream>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "DetectorDescription/Core/interface/DDMaterial.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/src/LogicalPart.h"

diff --git a/DetectorDescription/Core/src/DDMap.cc b/DetectorDescription/Core/src/DDMap.cc
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 
 DDMap::DDMap() : DDBase<DDName,dd_map_type*>() { }
 

diff --git a/DetectorDescription/Core/src/DDMaterial.cc b/DetectorDescription/Core/src/DDMaterial.cc
@@ -4,7 +4,7 @@
 
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDMaterial.h"
 #include "DetectorDescription/Core/interface/DDName.h"

diff --git a/DetectorDescription/Core/src/DDName.cc b/DetectorDescription/Core/src/DDName.cc
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-#include "DetectorDescription/Base/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
 #include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
 #include "DetectorDescription/Core/interface/DDSplit.h"
 #include "FWCore/Utilities/interface/Exception.h"

diff --git a/DetectorDescription/Core/src/DDPartSelection.cc b/DetectorDescription/Core/src/DDPartSelection.cc
@@ -1,4 +1,4 @@
-#include "DetectorDescription/Base/interface/Singleton.h"
+#include "DetectorDescription/Core/interface/Singleton.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDName.h"
 #include "DetectorDescription/Core/interface/DDPartSelection.h"
@@ -272,4 +272,4 @@ std::ostream & operator<<(std::ostream & os, const std::vector<DDPartSelection>
 template class DDI::Singleton<DDSelLevelFtor>;
 //template class DDI::Singleton<DDI::Store<DDName, DDSelLevelCollector> >;
 template class DDI::Singleton<DDSelLevelCollector>;
-#include <DetectorDescription/Base/interface/Singleton.icc>
+#include <DetectorDescription/Core/interface/Singleton.icc>
diff --git a/...ctorDescription/Base/src/DDReadMapType.cc → ...ctorDescription/Core/src/DDReadMapType.cc b/...ctorDescription/Base/src/DDReadMapType.cc → ...ctorDescription/Core/src/DDReadMapType.cc
@@ -1,4 +1,4 @@
-#include "DetectorDescription/Base/interface/DDReadMapType.h"
+#include "DetectorDescription/Core/interface/DDReadMapType.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace dddDetails {

diff --git a/DetectorDescription/Core/src/DDRotation.cc b/DetectorDescription/Core/src/DDRotation.cc
@@ -6,9 +6,9 @@
 
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/SystemOfUnits.h"
-#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
-#include "DetectorDescription/Base/interface/DDTranslation.h"
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "DetectorDescription/Core/interface/DDBase.h"
 #include "DetectorDescription/Core/interface/DDName.h"
 #include "DetectorDescription/Core/interface/DDTransform.h"

diff --git a/DetectorDescription/Core/src/DDSolid.cc b/DetectorDescription/Core/src/DDSolid.cc
@@ -4,7 +4,7 @@
 #include <string>
 #include <array>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "DetectorDescription/Core/src/Boolean.h"
 #include "DetectorDescription/Core/src/Box.h"
 #include "DetectorDescription/Core/src/Cons.h"

diff --git a/DetectorDescription/Core/src/DDSpecifics.cc b/DetectorDescription/Core/src/DDSpecifics.cc
@@ -2,7 +2,7 @@
 
 #include <ostream>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 #include "DetectorDescription/Core/interface/DDExpandedView.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/src/Specific.h"

diff --git a/DetectorDescription/Core/src/DDStrVector.cc b/DetectorDescription/Core/src/DDStrVector.cc
@@ -2,7 +2,7 @@
 
 #include <utility>
 
-#include "DetectorDescription/Base/interface/Store.h"
+#include "DetectorDescription/Core/interface/Store.h"
 
 DDStrVector::DDStrVector() : DDBase<DDName,std::vector<std::string>*>() { }