From bdf08d0ca7732ebbe7376c7308f8403e1340f513 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Mon, 5 Jun 2017 11:58:31 +0200 Subject: [PATCH 1/2] Merge Base to Core --- Alignment/CocoaFit/src/CocoaDBMgr.cc | 2 -- DetectorDescription/Algorithm/BuildFile.xml | 1 - DetectorDescription/Algorithm/interface/DDAlgorithm.h | 2 +- .../Algorithm/interface/DDAlgorithmHandler.h | 2 +- DetectorDescription/Algorithm/plugins/DDAngular.cc | 2 +- DetectorDescription/Algorithm/plugins/DDAngular.h | 6 +++--- DetectorDescription/Algorithm/plugins/DDLinear.cc | 4 ++-- DetectorDescription/Algorithm/plugins/DDLinear.h | 2 +- DetectorDescription/Base/BuildFile.xml | 4 ---- DetectorDescription/Base/test/BuildFile.xml | 3 --- DetectorDescription/Core/BuildFile.xml | 1 - .../{Base => Core}/interface/DDAlgoPar.h | 0 DetectorDescription/Core/interface/DDAxes.h | 2 +- DetectorDescription/Core/interface/DDBase.h | 6 +++--- DetectorDescription/Core/interface/DDCompactView.h | 6 +++--- DetectorDescription/Core/interface/DDCompactViewImpl.h | 2 +- DetectorDescription/Core/interface/DDDivision.h | 2 +- DetectorDescription/Core/interface/DDExpandedNode.h | 4 ++-- DetectorDescription/Core/interface/DDExpandedView.h | 4 ++-- DetectorDescription/Core/interface/DDFilteredView.h | 4 ++-- DetectorDescription/Core/interface/DDLogicalPart.h | 2 +- DetectorDescription/Core/interface/DDMap.h | 2 +- DetectorDescription/Core/interface/DDPosData.h | 2 +- .../{Base => Core}/interface/DDReadMapType.h | 0 DetectorDescription/Core/interface/DDRegistry.h | 2 +- DetectorDescription/Core/interface/DDRoot.h | 2 +- .../{Base => Core}/interface/DDRotationMatrix.h | 0 DetectorDescription/Core/interface/DDSolid.h | 2 +- DetectorDescription/Core/interface/DDTransform.h | 2 +- .../{Base => Core}/interface/DDTranslation.h | 0 DetectorDescription/{Base => Core}/interface/DDTypes.h | 2 +- DetectorDescription/{Base => Core}/interface/DDutils.h | 0 .../{Base => Core}/interface/Singleton.h | 0 .../{Base => Core}/interface/Singleton.icc | 0 DetectorDescription/{Base => Core}/interface/Store.h | 2 +- .../{Base => Core}/interface/rep_type.h | 0 DetectorDescription/Core/src/Boolean.h | 2 +- DetectorDescription/Core/src/DDCheckMaterials.cc | 2 +- DetectorDescription/Core/src/DDCompactView.cc | 2 +- DetectorDescription/Core/src/DDConstant.cc | 2 +- DetectorDescription/Core/src/DDDivision.cc | 2 +- DetectorDescription/Core/src/DDLogicalPart.cc | 2 +- DetectorDescription/Core/src/DDMap.cc | 2 +- DetectorDescription/Core/src/DDMaterial.cc | 2 +- DetectorDescription/Core/src/DDName.cc | 2 +- DetectorDescription/Core/src/DDPartSelection.cc | 4 ++-- .../{Base => Core}/src/DDReadMapType.cc | 2 +- DetectorDescription/Core/src/DDRotation.cc | 6 +++--- DetectorDescription/Core/src/DDSolid.cc | 2 +- DetectorDescription/Core/src/DDSpecifics.cc | 2 +- DetectorDescription/Core/src/DDStrVector.cc | 2 +- DetectorDescription/Core/src/DDString.cc | 4 ++-- DetectorDescription/{Base => Core}/src/DDTypes.cc | 2 +- DetectorDescription/Core/src/DDVector.cc | 4 ++-- DetectorDescription/Core/src/StoresInstantiation.cc | 10 +++++----- DetectorDescription/Core/test/BuildFile.xml | 2 ++ DetectorDescription/Core/test/DDIsValid.cppunit.cc | 2 +- DetectorDescription/{Base => Core}/test/Singleton_.cpp | 4 ++-- DetectorDescription/Core/test/clhepToROOTMath.cpp | 4 ++-- .../ExprAlgo/interface/ExprEvalSingleton.h | 2 +- .../OfflineDBLoader/src/DDCoreToDDXMLOutput.cc | 4 ++-- .../OfflineDBLoader/src/GeometryInfoDump.cc | 4 ++-- DetectorDescription/Parser/BuildFile.xml | 1 - .../Parser/interface/DDLElementRegistry.h | 4 ++-- DetectorDescription/Parser/src/DDDividedBox.h | 2 +- DetectorDescription/Parser/src/DDDividedCons.cc | 2 +- DetectorDescription/Parser/src/DDDividedCons.h | 2 +- .../Parser/src/DDDividedGeometryObject.h | 4 ++-- DetectorDescription/Parser/src/DDDividedPolycone.cc | 2 +- DetectorDescription/Parser/src/DDDividedPolycone.h | 2 +- DetectorDescription/Parser/src/DDDividedPolyhedra.cc | 2 +- DetectorDescription/Parser/src/DDDividedPolyhedra.h | 2 +- DetectorDescription/Parser/src/DDDividedTrd.h | 2 +- DetectorDescription/Parser/src/DDDividedTubs.cc | 2 +- DetectorDescription/Parser/src/DDDividedTubs.h | 2 +- DetectorDescription/Parser/src/DDLAlgorithm.cc | 2 +- DetectorDescription/Parser/src/DDLBooleanSolid.cc | 2 +- DetectorDescription/Parser/src/DDLElementRegistry.cc | 2 +- DetectorDescription/Parser/src/DDLMap.h | 2 +- DetectorDescription/Parser/src/DDLMultiUnionSolid.cc | 2 +- DetectorDescription/Parser/src/DDLNumeric.h | 2 +- DetectorDescription/Parser/src/DDLPosPart.cc | 4 ++-- .../Parser/src/DDLRotationAndReflection.cc | 2 +- .../Parser/src/DDLRotationAndReflection.h | 2 +- DetectorDescription/Parser/src/DDLRotationByAxis.h | 2 +- DetectorDescription/Parser/src/DDLRotationSequence.cc | 2 +- DetectorDescription/Parser/src/DDLString.h | 2 +- DetectorDescription/Parser/src/DDLVector.h | 4 ++-- DetectorDescription/Parser/test/BuildFile.xml | 5 ----- DetectorDescription/RegressionTest/BuildFile.xml | 1 - .../RegressionTest/interface/DDCompareTools.h | 4 ++-- .../RegressionTest/interface/DDErrorDetection.h | 2 +- .../RegressionTest/src/DDErrorDetection.cc | 4 ++-- .../RegressionTest/src/DDExpandedViewDump.cc | 4 ++-- .../RegressionTest/src/DDHtmlFormatter.cc | 8 ++++---- DetectorDescription/RegressionTest/src/build.cc | 4 ++-- DetectorDescription/RegressionTest/src/ddstats.cc | 6 +++--- DetectorDescription/RegressionTest/test/BuildFile.xml | 4 ---- .../RegressionTest/test/partsel_example.cpp | 2 +- DetectorDescription/RegressionTest/test/test_module.cc | 2 +- DetectorDescription/RegressionTest/test/tutorial.cc | 4 ++-- Geometry/EcalCommonData/interface/DDEcalAPDAlgo.h | 2 +- Geometry/EcalCommonData/interface/DDEcalBarrelAlgo.h | 2 +- .../EcalCommonData/interface/DDEcalBarrelNewAlgo.h | 2 +- Geometry/EcalCommonData/interface/DDEcalEndcapAlgo.h | 2 +- Geometry/EcalCommonData/interface/DDEcalEndcapTrap.h | 6 +++--- Geometry/EcalCommonData/src/DDEcalAPDAlgo.cc | 2 +- Geometry/EcalCommonData/src/DDEcalBarrelAlgo.cc | 2 +- Geometry/EcalCommonData/src/DDEcalBarrelNewAlgo.cc | 2 +- Geometry/EcalCommonData/src/DDEcalPreshowerAlgo.cc | 2 +- Geometry/EcalTestBeam/plugins/BuildFile.xml | 1 - Geometry/EcalTestBeam/plugins/DDTBH4Algo.h | 2 +- Geometry/ForwardCommonData/plugins/DDBHMAngular.cc | 2 +- Geometry/ForwardCommonData/plugins/DDBHMAngular.h | 2 +- Geometry/HGCalCommonData/BuildFile.xml | 1 - Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.cc | 2 +- Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.h | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.h | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.h | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalModule.cc | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalModule.h | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.cc | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.h | 2 +- .../HGCalCommonData/plugins/DDHGCalNoTaperEndcap.h | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalTBModule.cc | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalTBModule.h | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalWafer.cc | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalWafer.h | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.cc | 2 +- Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.h | 2 +- .../HGCalCommonData/src/FastTimeParametersFromDD.cc | 2 +- Geometry/HGCalCommonData/src/HGCalGeomParameters.cc | 2 +- Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc | 2 +- Geometry/HcalAlgo/plugins/DDHCalAngular.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc | 2 +- Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc | 2 +- Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc | 2 +- Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalFibreBundle.cc | 2 +- Geometry/HcalAlgo/plugins/DDHCalFibreBundle.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.cc | 2 +- Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalLinearXY.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalTBCableAlgo.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalTBZposAlgo.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalTestBeamAlgo.h | 2 +- Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.h | 2 +- Geometry/HcalCommonData/BuildFile.xml | 1 - Geometry/HcalCommonData/src/HcalGeomParameters.cc | 2 +- Geometry/HcalCommonData/src/HcalParametersFromDD.cc | 2 +- .../HcalTestBeamData/plugins/DDEcalPreshowerAlgoTB.cc | 4 ++-- Geometry/MTCCTrackerCommonData/plugins/BuildFile.xml | 1 - .../plugins/DDTIBLayerAlgo_MTCC.h | 2 +- .../plugins/DDTIBRadCableAlgo_MTCC.h | 2 +- Geometry/MuonCommonData/plugins/DDGEMAngular.h | 2 +- Geometry/MuonCommonData/plugins/DDMuonAngular.h | 2 +- .../TrackerCommonData/plugins/DDCutTubsFromPoints.h | 2 +- Geometry/TrackerCommonData/plugins/DDPixBarLayerAlgo.h | 2 +- .../plugins/DDPixBarLayerUpgradeAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDPixFwdBlades.cc | 2 +- Geometry/TrackerCommonData/plugins/DDPixFwdBlades.h | 2 +- Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.h | 2 +- .../plugins/DDPixPhase1FwdDiskAlgo.cc | 2 +- .../TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.h | 2 +- .../TrackerCommonData/plugins/DDTECAxialCableAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.cc | 2 +- Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTECOptoHybAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTECPhiAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTECPhiAltAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTIBLayerAlgo.h | 2 +- .../TrackerCommonData/plugins/DDTIDAxialCableAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTIDModuleAlgo.h | 2 +- .../TrackerCommonData/plugins/DDTIDModulePosAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTIDRingAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTOBAxCableAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTOBRadCableAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTOBRodAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTrackerAngular.h | 2 +- .../TrackerCommonData/plugins/DDTrackerAngularV1.h | 2 +- Geometry/TrackerCommonData/plugins/DDTrackerLinear.h | 2 +- Geometry/TrackerCommonData/plugins/DDTrackerLinearXY.h | 2 +- Geometry/TrackerCommonData/plugins/DDTrackerPhiAlgo.h | 2 +- .../TrackerCommonData/plugins/DDTrackerPhiAltAlgo.h | 2 +- .../TrackerCommonData/plugins/DDTrackerRingAlgo.cc | 2 +- Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.h | 2 +- .../TrackerCommonData/plugins/DDTrackerXYZPosAlgo.h | 2 +- Geometry/TrackerCommonData/plugins/DDTrackerZPosAlgo.h | 2 +- .../src/TrackerParametersFromDD.cc | 2 +- Geometry/TrackerNumberingBuilder/BuildFile.xml | 1 - .../TrackerNumberingBuilder/interface/GeometricDet.h | 4 ++-- .../interface/GeometricDetExtra.h | 4 ++-- .../plugins/TrackerGeometricDetESModule.cc | 2 +- .../TrackerNumberingBuilder/src/GeometricDetExtra.cc | 4 ++-- .../VeryForwardGeometryBuilder/interface/DetGeomDesc.h | 4 ++-- .../plugins/TotemRPGeometryESModule.cc | 2 +- GeometryReaders/XMLIdealGeometryESSource/BuildFile.xml | 1 - .../src/XMLIdealGeometryESProducer.cc | 2 +- .../src/XMLIdealGeometryESSource.cc | 2 +- .../src/XMLIdealMagneticFieldGeometryESProducer.cc | 2 +- MagneticField/GeomBuilder/BuildFile.xml | 1 - MagneticField/GeomBuilder/src/volumeHandle.cc | 2 +- .../interface/DDPixBarLayerUpgradeAlgoCoverage.h | 2 +- .../Geometry/interface/DDPixBarStackLayerAlgo.h | 2 +- .../Geometry/interface/DDPixBarStackLinear.h | 2 +- .../Geometry/interface/DDPixBarStackLinearGap.h | 2 +- .../Geometry/interface/DDPixBarStackTrigLayerAlgo.h | 2 +- .../Geometry/interface/DDPixBarTPGStackLayerAlgo.h | 2 +- SimG4CMS/Forward/src/FastTimerSD.cc | 2 +- 214 files changed, 235 insertions(+), 262 deletions(-) delete mode 100644 DetectorDescription/Base/BuildFile.xml delete mode 100644 DetectorDescription/Base/test/BuildFile.xml rename DetectorDescription/{Base => Core}/interface/DDAlgoPar.h (100%) rename DetectorDescription/{Base => Core}/interface/DDReadMapType.h (100%) rename DetectorDescription/{Base => Core}/interface/DDRotationMatrix.h (100%) rename DetectorDescription/{Base => Core}/interface/DDTranslation.h (100%) rename DetectorDescription/{Base => Core}/interface/DDTypes.h (95%) rename DetectorDescription/{Base => Core}/interface/DDutils.h (100%) rename DetectorDescription/{Base => Core}/interface/Singleton.h (100%) rename DetectorDescription/{Base => Core}/interface/Singleton.icc (100%) rename DetectorDescription/{Base => Core}/interface/Store.h (98%) rename DetectorDescription/{Base => Core}/interface/rep_type.h (100%) rename DetectorDescription/{Base => Core}/src/DDReadMapType.cc (78%) rename DetectorDescription/{Base => Core}/src/DDTypes.cc (96%) rename DetectorDescription/{Base => Core}/test/Singleton_.cpp (89%) diff --git a/Alignment/CocoaFit/src/CocoaDBMgr.cc b/Alignment/CocoaFit/src/CocoaDBMgr.cc index 29421a0f8fc62..97dbaa14eab35 100644 --- 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 index 58bf4cab3b4cf..876774de99bc6 100644 --- a/DetectorDescription/Algorithm/BuildFile.xml +++ b/DetectorDescription/Algorithm/BuildFile.xml @@ -1,4 +1,3 @@ - diff --git a/DetectorDescription/Algorithm/interface/DDAlgorithm.h b/DetectorDescription/Algorithm/interface/DDAlgorithm.h index 5c51fb0dc023e..4260c2d65bca0 100644 --- 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 diff --git a/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h b/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h index 5d45553f43aa8..862aee07d6ec8 100644 --- a/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h +++ b/DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h @@ -4,7 +4,7 @@ #include #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 index 4332999cec647..957778e60267f 100644 --- 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 index 895ccc1e7955d..f38cd8dfaf2c2 100644 --- a/DetectorDescription/Algorithm/plugins/DDAngular.h +++ b/DetectorDescription/Algorithm/plugins/DDAngular.h @@ -6,9 +6,9 @@ #include # 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 index dde6c99af83e3..bd410ac3f4add 100644 --- 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 index aff95746cc7b5..60bcfafa46977 100644 --- a/DetectorDescription/Algorithm/plugins/DDLinear.h +++ b/DetectorDescription/Algorithm/plugins/DDLinear.h @@ -6,7 +6,7 @@ #include # 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 deleted file mode 100644 index ef1ffc33270ef..0000000000000 --- a/DetectorDescription/Base/BuildFile.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/DetectorDescription/Base/test/BuildFile.xml b/DetectorDescription/Base/test/BuildFile.xml deleted file mode 100644 index 25c3ea6fc4b37..0000000000000 --- a/DetectorDescription/Base/test/BuildFile.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/DetectorDescription/Core/BuildFile.xml b/DetectorDescription/Core/BuildFile.xml index 1b9f38991bc15..f3f5a6f236813 100644 --- a/DetectorDescription/Core/BuildFile.xml +++ b/DetectorDescription/Core/BuildFile.xml @@ -1,4 +1,3 @@ - diff --git a/DetectorDescription/Base/interface/DDAlgoPar.h b/DetectorDescription/Core/interface/DDAlgoPar.h similarity index 100% rename from DetectorDescription/Base/interface/DDAlgoPar.h rename to DetectorDescription/Core/interface/DDAlgoPar.h diff --git a/DetectorDescription/Core/interface/DDAxes.h b/DetectorDescription/Core/interface/DDAxes.h index 911c0b4feb8c1..f973d66fbeb68 100644 --- 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 #include diff --git a/DetectorDescription/Core/interface/DDBase.h b/DetectorDescription/Core/interface/DDBase.h index c36e523ddceb8..76947163caeb0 100644 --- a/DetectorDescription/Core/interface/DDBase.h +++ b/DetectorDescription/Core/interface/DDBase.h @@ -2,9 +2,9 @@ #define DDCore_DDBase_h #include -#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 DDBase diff --git a/DetectorDescription/Core/interface/DDCompactView.h b/DetectorDescription/Core/interface/DDCompactView.h index fecb8bf4b7f4f..edca4a5d6e2f3 100644 --- a/DetectorDescription/Core/interface/DDCompactView.h +++ b/DetectorDescription/Core/interface/DDCompactView.h @@ -7,9 +7,9 @@ #include # include -#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 index 0a87d5cf53087..851819350b677 100644 --- 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 index 22e1d9845a857..83056703d43a9 100644 --- a/DetectorDescription/Core/interface/DDDivision.h +++ b/DetectorDescription/Core/interface/DDDivision.h @@ -58,7 +58,7 @@ #include #include -#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 index 5bc1c2a8d3a51..287e8c0c9b1dc 100644 --- a/DetectorDescription/Core/interface/DDExpandedNode.h +++ b/DetectorDescription/Core/interface/DDExpandedNode.h @@ -4,8 +4,8 @@ #include #include -#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 index 853c2ddb54835..f53a0354cf696 100644 --- a/DetectorDescription/Core/interface/DDExpandedView.h +++ b/DetectorDescription/Core/interface/DDExpandedView.h @@ -8,8 +8,8 @@ #include #include -#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 index 55f60eab32245..ce91748d9ebf1 100644 --- a/DetectorDescription/Core/interface/DDFilteredView.h +++ b/DetectorDescription/Core/interface/DDFilteredView.h @@ -4,8 +4,8 @@ #include #include -#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 index b54f9440c64f7..366a3d2a94da3 100644 --- a/DetectorDescription/Core/interface/DDLogicalPart.h +++ b/DetectorDescription/Core/interface/DDLogicalPart.h @@ -7,7 +7,7 @@ #include #include -#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 index 93429e7c31982..906c4ce21966e 100644 --- a/DetectorDescription/Core/interface/DDMap.h +++ b/DetectorDescription/Core/interface/DDMap.h @@ -5,7 +5,7 @@ #include #include -#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 index e09796ba97ce9..7a4f258eb8dc0 100644 --- 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/DetectorDescription/Base/interface/DDReadMapType.h b/DetectorDescription/Core/interface/DDReadMapType.h similarity index 100% rename from DetectorDescription/Base/interface/DDReadMapType.h rename to DetectorDescription/Core/interface/DDReadMapType.h diff --git a/DetectorDescription/Core/interface/DDRegistry.h b/DetectorDescription/Core/interface/DDRegistry.h index b8ee553c65f9e..30e7c3097b36a 100644 --- a/DetectorDescription/Core/interface/DDRegistry.h +++ b/DetectorDescription/Core/interface/DDRegistry.h @@ -2,7 +2,7 @@ #define DDD_DDRegistry_h #include -//#include "DetectorDescription/Base/interface/Singleton.h" +//#include "DetectorDescription/Core/interface/Singleton.h" #include "DetectorDescription/Core/interface/DDName.h" template diff --git a/DetectorDescription/Core/interface/DDRoot.h b/DetectorDescription/Core/interface/DDRoot.h index f4e2d6a1b2685..61c558c5ab715 100644 --- 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/DetectorDescription/Base/interface/DDRotationMatrix.h b/DetectorDescription/Core/interface/DDRotationMatrix.h similarity index 100% rename from DetectorDescription/Base/interface/DDRotationMatrix.h rename to DetectorDescription/Core/interface/DDRotationMatrix.h diff --git a/DetectorDescription/Core/interface/DDSolid.h b/DetectorDescription/Core/interface/DDSolid.h index 34f4cab0aca5d..3d1ad7ae250bc 100644 --- a/DetectorDescription/Core/interface/DDSolid.h +++ b/DetectorDescription/Core/interface/DDSolid.h @@ -5,7 +5,7 @@ #include #include -#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 index a1e6c746ef605..966cd8fbd6c30 100644 --- 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/DetectorDescription/Base/interface/DDTranslation.h b/DetectorDescription/Core/interface/DDTranslation.h similarity index 100% rename from DetectorDescription/Base/interface/DDTranslation.h rename to DetectorDescription/Core/interface/DDTranslation.h diff --git a/DetectorDescription/Base/interface/DDTypes.h b/DetectorDescription/Core/interface/DDTypes.h similarity index 95% rename from DetectorDescription/Base/interface/DDTypes.h rename to DetectorDescription/Core/interface/DDTypes.h index c755b028aa322..f806f1423fd1f 100644 --- a/DetectorDescription/Base/interface/DDTypes.h +++ b/DetectorDescription/Core/interface/DDTypes.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDReadMapType.h" +#include "DetectorDescription/Core/interface/DDReadMapType.h" #include //! corresponds to a collection of named doubles diff --git a/DetectorDescription/Base/interface/DDutils.h b/DetectorDescription/Core/interface/DDutils.h similarity index 100% rename from DetectorDescription/Base/interface/DDutils.h rename to DetectorDescription/Core/interface/DDutils.h diff --git a/DetectorDescription/Base/interface/Singleton.h b/DetectorDescription/Core/interface/Singleton.h similarity index 100% rename from DetectorDescription/Base/interface/Singleton.h rename to DetectorDescription/Core/interface/Singleton.h diff --git a/DetectorDescription/Base/interface/Singleton.icc b/DetectorDescription/Core/interface/Singleton.icc similarity index 100% rename from DetectorDescription/Base/interface/Singleton.icc rename to DetectorDescription/Core/interface/Singleton.icc diff --git a/DetectorDescription/Base/interface/Store.h b/DetectorDescription/Core/interface/Store.h similarity index 98% rename from DetectorDescription/Base/interface/Store.h rename to DetectorDescription/Core/interface/Store.h index 7259726d84245..b8a8731b0fb5d 100644 --- a/DetectorDescription/Base/interface/Store.h +++ b/DetectorDescription/Core/interface/Store.h @@ -2,7 +2,7 @@ #define DDI_Store_h #include -#include "DetectorDescription/Base/interface/rep_type.h" +#include "DetectorDescription/Core/interface/rep_type.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" //; diff --git a/DetectorDescription/Base/interface/rep_type.h b/DetectorDescription/Core/interface/rep_type.h similarity index 100% rename from DetectorDescription/Base/interface/rep_type.h rename to DetectorDescription/Core/interface/rep_type.h diff --git a/DetectorDescription/Core/src/Boolean.h b/DetectorDescription/Core/src/Boolean.h index afd9cb7f49e4d..786f18e78d39b 100644 --- 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 index 4f07d7edf6ee9..5ade0061ba2a5 100644 --- a/DetectorDescription/Core/src/DDCheckMaterials.cc +++ b/DetectorDescription/Core/src/DDCheckMaterials.cc @@ -3,7 +3,7 @@ #include #include -#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 index 9578c589f6bd8..46d16ffbd82b3 100644 --- a/DetectorDescription/Core/src/DDCompactView.cc +++ b/DetectorDescription/Core/src/DDCompactView.cc @@ -2,7 +2,7 @@ #include -#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 index e465a7635e506..549a75094bf1d 100644 --- a/DetectorDescription/Core/src/DDConstant.cc +++ b/DetectorDescription/Core/src/DDConstant.cc @@ -4,7 +4,7 @@ #include #include -#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 index 68e02a4e81e8b..00e78d788be2d 100644 --- a/DetectorDescription/Core/src/DDDivision.cc +++ b/DetectorDescription/Core/src/DDDivision.cc @@ -2,7 +2,7 @@ #include -#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 index 1bc8d233aa5b6..328130403e8fc 100644 --- a/DetectorDescription/Core/src/DDLogicalPart.cc +++ b/DetectorDescription/Core/src/DDLogicalPart.cc @@ -2,7 +2,7 @@ #include -#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 index c1ac97d65e5e5..525e0d17fe9eb 100644 --- a/DetectorDescription/Core/src/DDMap.cc +++ b/DetectorDescription/Core/src/DDMap.cc @@ -2,7 +2,7 @@ #include -#include "DetectorDescription/Base/interface/Store.h" +#include "DetectorDescription/Core/interface/Store.h" DDMap::DDMap() : DDBase() { } diff --git a/DetectorDescription/Core/src/DDMaterial.cc b/DetectorDescription/Core/src/DDMaterial.cc index 213bc2cb639d2..f884c1d03ebe5 100644 --- 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 index c0f04b1dd84a1..4a97141647726 100644 --- a/DetectorDescription/Core/src/DDName.cc +++ b/DetectorDescription/Core/src/DDName.cc @@ -4,7 +4,7 @@ #include #include -#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 index 3bb0312b34119..936a44dbce81a 100644 --- 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 template class DDI::Singleton; //template class DDI::Singleton >; template class DDI::Singleton; -#include +#include diff --git a/DetectorDescription/Base/src/DDReadMapType.cc b/DetectorDescription/Core/src/DDReadMapType.cc similarity index 78% rename from DetectorDescription/Base/src/DDReadMapType.cc rename to DetectorDescription/Core/src/DDReadMapType.cc index 69600c0e80679..814aa0e29462c 100644 --- a/DetectorDescription/Base/src/DDReadMapType.cc +++ b/DetectorDescription/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 index dae972ff14b6c..47a83a55bc1ae 100644 --- 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 index 099f3af7ee2c0..78013afbdc797 100644 --- a/DetectorDescription/Core/src/DDSolid.cc +++ b/DetectorDescription/Core/src/DDSolid.cc @@ -4,7 +4,7 @@ #include #include -#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 index 14830706958ed..6cd6921aae090 100644 --- a/DetectorDescription/Core/src/DDSpecifics.cc +++ b/DetectorDescription/Core/src/DDSpecifics.cc @@ -2,7 +2,7 @@ #include -#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 index a9761692dc5ad..020f1beeb1923 100644 --- a/DetectorDescription/Core/src/DDStrVector.cc +++ b/DetectorDescription/Core/src/DDStrVector.cc @@ -2,7 +2,7 @@ #include -#include "DetectorDescription/Base/interface/Store.h" +#include "DetectorDescription/Core/interface/Store.h" DDStrVector::DDStrVector() : DDBase*>() { } diff --git a/DetectorDescription/Core/src/DDString.cc b/DetectorDescription/Core/src/DDString.cc index 6a6d8f21808e7..eb53b8a8da2c3 100644 --- a/DetectorDescription/Core/src/DDString.cc +++ b/DetectorDescription/Core/src/DDString.cc @@ -2,8 +2,8 @@ #include -#include "DetectorDescription/Base/interface/Store.h" -//#include "DetectorDescription/Base/interface/DDException.h" +#include "DetectorDescription/Core/interface/Store.h" +//#include "DetectorDescription/Core/interface/DDException.h" // Evaluator //#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" diff --git a/DetectorDescription/Base/src/DDTypes.cc b/DetectorDescription/Core/src/DDTypes.cc similarity index 96% rename from DetectorDescription/Base/src/DDTypes.cc rename to DetectorDescription/Core/src/DDTypes.cc index b64c0d5d98376..14fd474c7ea39 100644 --- a/DetectorDescription/Base/src/DDTypes.cc +++ b/DetectorDescription/Core/src/DDTypes.cc @@ -1,6 +1,6 @@ -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include #include diff --git a/DetectorDescription/Core/src/DDVector.cc b/DetectorDescription/Core/src/DDVector.cc index 96b742fea8dc8..3410646a943db 100644 --- a/DetectorDescription/Core/src/DDVector.cc +++ b/DetectorDescription/Core/src/DDVector.cc @@ -2,8 +2,8 @@ #include -#include "DetectorDescription/Base/interface/Store.h" -//#include "DetectorDescription/Base/interface/DDException.h" +#include "DetectorDescription/Core/interface/Store.h" +//#include "DetectorDescription/Core/interface/DDException.h" // Evaluator //#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" diff --git a/DetectorDescription/Core/src/StoresInstantiation.cc b/DetectorDescription/Core/src/StoresInstantiation.cc index fb37fb84a7db1..309e477731cb6 100644 --- a/DetectorDescription/Core/src/StoresInstantiation.cc +++ b/DetectorDescription/Core/src/StoresInstantiation.cc @@ -1,8 +1,8 @@ -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" -#include "DetectorDescription/Base/interface/DDReadMapType.h" -#include "DetectorDescription/Base/interface/Singleton.h" -#include "DetectorDescription/Base/interface/Singleton.icc" -#include "DetectorDescription/Base/interface/Store.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDReadMapType.h" +#include "DetectorDescription/Core/interface/Singleton.h" +#include "DetectorDescription/Core/interface/Singleton.icc" +#include "DetectorDescription/Core/interface/Store.h" #include "DetectorDescription/Core/interface/DDAxes.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDRoot.h" diff --git a/DetectorDescription/Core/test/BuildFile.xml b/DetectorDescription/Core/test/BuildFile.xml index b70dcefbc7662..cac99f6697bea 100644 --- a/DetectorDescription/Core/test/BuildFile.xml +++ b/DetectorDescription/Core/test/BuildFile.xml @@ -14,3 +14,5 @@ + + diff --git a/DetectorDescription/Core/test/DDIsValid.cppunit.cc b/DetectorDescription/Core/test/DDIsValid.cppunit.cc index 4ebd7c595b4c4..d87f43f20e140 100644 --- a/DetectorDescription/Core/test/DDIsValid.cppunit.cc +++ b/DetectorDescription/Core/test/DDIsValid.cppunit.cc @@ -10,7 +10,7 @@ #include #include -#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 "FWCore/ParameterSet/interface/FileInPath.h" diff --git a/DetectorDescription/Base/test/Singleton_.cpp b/DetectorDescription/Core/test/Singleton_.cpp similarity index 89% rename from DetectorDescription/Base/test/Singleton_.cpp rename to DetectorDescription/Core/test/Singleton_.cpp index 1cdb4fd9f61d6..17d2c8a76a1b7 100644 --- a/DetectorDescription/Base/test/Singleton_.cpp +++ b/DetectorDescription/Core/test/Singleton_.cpp @@ -1,7 +1,7 @@ #include "Utilities/Testing/interface/CppUnit_testdriver.icpp" #include "cppunit/extensions/HelperMacros.h" -#include "DetectorDescription/Base/interface/Singleton.h" -#include "DetectorDescription/Base/interface/Singleton.icc" +#include "DetectorDescription/Core/interface/Singleton.h" +#include "DetectorDescription/Core/interface/Singleton.icc" class Dummy { diff --git a/DetectorDescription/Core/test/clhepToROOTMath.cpp b/DetectorDescription/Core/test/clhepToROOTMath.cpp index d42ea2d38547c..5e5446e858d95 100644 --- a/DetectorDescription/Core/test/clhepToROOTMath.cpp +++ b/DetectorDescription/Core/test/clhepToROOTMath.cpp @@ -7,8 +7,8 @@ #include "CLHEP/Vector/Rotation.h" #include "CLHEP/Vector/RotationInterfaces.h" #include "CLHEP/Vector/ThreeVector.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 "Math/GenVector/Cartesian3D.h" #include "Math/GenVector/DisplacementVector3D.h" #include "Math/GenVector/Rotation3D.h" diff --git a/DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h b/DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h index f189e6d20c946..c1e7a6460134e 100644 --- a/DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h +++ b/DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h @@ -1,7 +1,7 @@ #ifndef ExprEvalSingleton_h #define ExprEvalSingleton_h -#include "DetectorDescription/Base/interface/Singleton.h" +#include "DetectorDescription/Core/interface/Singleton.h" #include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" class ClhepEvaluator; diff --git a/DetectorDescription/OfflineDBLoader/src/DDCoreToDDXMLOutput.cc b/DetectorDescription/OfflineDBLoader/src/DDCoreToDDXMLOutput.cc index 523f9cd663063..127d6ff87bbf7 100644 --- a/DetectorDescription/OfflineDBLoader/src/DDCoreToDDXMLOutput.cc +++ b/DetectorDescription/OfflineDBLoader/src/DDCoreToDDXMLOutput.cc @@ -10,8 +10,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/DDName.h" #include "DetectorDescription/Core/interface/DDPosData.h" #include "DetectorDescription/Core/interface/DDTransform.h" diff --git a/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc b/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc index c176ba8a65086..e5777e78adf43 100644 --- a/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc +++ b/DetectorDescription/OfflineDBLoader/src/GeometryInfoDump.cc @@ -7,8 +7,8 @@ #include #include -#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/DDExpandedView.h" diff --git a/DetectorDescription/Parser/BuildFile.xml b/DetectorDescription/Parser/BuildFile.xml index 88e87ed67392d..e2fe6a15cedff 100644 --- a/DetectorDescription/Parser/BuildFile.xml +++ b/DetectorDescription/Parser/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/DetectorDescription/Parser/interface/DDLElementRegistry.h b/DetectorDescription/Parser/interface/DDLElementRegistry.h index 83610d802eeaf..471db0c749575 100644 --- a/DetectorDescription/Parser/interface/DDLElementRegistry.h +++ b/DetectorDescription/Parser/interface/DDLElementRegistry.h @@ -1,8 +1,8 @@ #ifndef DETECTOR_DESCRIPTION_PARSER_DDL_ELEMENT_REGISTRY_H #define DETECTOR_DESCRIPTION_PARSER_DDL_ELEMENT_REGISTRY_H -#include "DetectorDescription/Base/interface/Singleton.h" -#include "DetectorDescription/Base/interface/Singleton.icc" +#include "DetectorDescription/Core/interface/Singleton.h" +#include "DetectorDescription/Core/interface/Singleton.icc" #include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" #include diff --git a/DetectorDescription/Parser/src/DDDividedBox.h b/DetectorDescription/Parser/src/DDDividedBox.h index 44ccd5ccf57c2..010dd95119e82 100644 --- a/DetectorDescription/Parser/src/DDDividedBox.h +++ b/DetectorDescription/Parser/src/DDDividedBox.h @@ -7,7 +7,7 @@ // ******************************************************************** #include "DDDividedGeometryObject.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDDivision.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDDividedCons.cc b/DetectorDescription/Parser/src/DDDividedCons.cc index 1e26abb0c4a96..a46b25c4e38a5 100644 --- a/DetectorDescription/Parser/src/DDDividedCons.cc +++ b/DetectorDescription/Parser/src/DDDividedCons.cc @@ -6,7 +6,7 @@ #include "CLHEP/Units/GlobalSystemOfUnits.h" #include "CLHEP/Units/SystemOfUnits.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDAxes.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/DetectorDescription/Parser/src/DDDividedCons.h b/DetectorDescription/Parser/src/DDDividedCons.h index 69141e112a5d5..c25dab0402e7b 100644 --- a/DetectorDescription/Parser/src/DDDividedCons.h +++ b/DetectorDescription/Parser/src/DDDividedCons.h @@ -6,7 +6,7 @@ // ******************************************************************** #include "DDDividedGeometryObject.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDDivision.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDDividedGeometryObject.h b/DetectorDescription/Parser/src/DDDividedGeometryObject.h index 65955b9c2ed49..85a59c93700b9 100644 --- a/DetectorDescription/Parser/src/DDDividedGeometryObject.h +++ b/DetectorDescription/Parser/src/DDDividedGeometryObject.h @@ -8,8 +8,8 @@ #include -#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/DDAxes.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/Core/interface/DDDivision.h" diff --git a/DetectorDescription/Parser/src/DDDividedPolycone.cc b/DetectorDescription/Parser/src/DDDividedPolycone.cc index 92aec72d02e07..3e4e183dc0ce7 100644 --- a/DetectorDescription/Parser/src/DDDividedPolycone.cc +++ b/DetectorDescription/Parser/src/DDDividedPolycone.cc @@ -8,7 +8,7 @@ #include "CLHEP/Units/GlobalSystemOfUnits.h" #include "CLHEP/Units/SystemOfUnits.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDName.h" diff --git a/DetectorDescription/Parser/src/DDDividedPolycone.h b/DetectorDescription/Parser/src/DDDividedPolycone.h index 2f3321bd3ef56..28d0edcb3158d 100644 --- a/DetectorDescription/Parser/src/DDDividedPolycone.h +++ b/DetectorDescription/Parser/src/DDDividedPolycone.h @@ -6,7 +6,7 @@ //--------------------------------------------------------------------- #include "DDDividedGeometryObject.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDDivision.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDDividedPolyhedra.cc b/DetectorDescription/Parser/src/DDDividedPolyhedra.cc index c38c46383df86..20316c46ebfba 100644 --- a/DetectorDescription/Parser/src/DDDividedPolyhedra.cc +++ b/DetectorDescription/Parser/src/DDDividedPolyhedra.cc @@ -8,7 +8,7 @@ #include "CLHEP/Units/GlobalSystemOfUnits.h" #include "CLHEP/Units/SystemOfUnits.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDName.h" diff --git a/DetectorDescription/Parser/src/DDDividedPolyhedra.h b/DetectorDescription/Parser/src/DDDividedPolyhedra.h index f87ce781c8d3d..2c24b6158f470 100644 --- a/DetectorDescription/Parser/src/DDDividedPolyhedra.h +++ b/DetectorDescription/Parser/src/DDDividedPolyhedra.h @@ -6,7 +6,7 @@ //--------------------------------------------------------------------- #include "DDDividedGeometryObject.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDDivision.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDDividedTrd.h b/DetectorDescription/Parser/src/DDDividedTrd.h index c7bbe6fd0d5f7..8566052b2fcb0 100644 --- a/DetectorDescription/Parser/src/DDDividedTrd.h +++ b/DetectorDescription/Parser/src/DDDividedTrd.h @@ -5,7 +5,7 @@ // ******************************************************************** #include "DDDividedGeometryObject.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDDivision.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDDividedTubs.cc b/DetectorDescription/Parser/src/DDDividedTubs.cc index e8fdb6a7c66da..131d32c871aae 100644 --- a/DetectorDescription/Parser/src/DDDividedTubs.cc +++ b/DetectorDescription/Parser/src/DDDividedTubs.cc @@ -5,7 +5,7 @@ #include "CLHEP/Units/GlobalSystemOfUnits.h" #include "CLHEP/Units/SystemOfUnits.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDAxes.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/DetectorDescription/Parser/src/DDDividedTubs.h b/DetectorDescription/Parser/src/DDDividedTubs.h index 08fa1f0a48193..adcc708c3b915 100644 --- a/DetectorDescription/Parser/src/DDDividedTubs.h +++ b/DetectorDescription/Parser/src/DDDividedTubs.h @@ -6,7 +6,7 @@ // ******************************************************************** #include "DDDividedGeometryObject.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDDivision.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDLAlgorithm.cc b/DetectorDescription/Parser/src/DDLAlgorithm.cc index e582313224dd8..70d79974635cf 100644 --- a/DetectorDescription/Parser/src/DDLAlgorithm.cc +++ b/DetectorDescription/Parser/src/DDLAlgorithm.cc @@ -5,7 +5,7 @@ #include #include "DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h" -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" diff --git a/DetectorDescription/Parser/src/DDLBooleanSolid.cc b/DetectorDescription/Parser/src/DDLBooleanSolid.cc index 71323910e9a3c..542dadd0b5005 100644 --- a/DetectorDescription/Parser/src/DDLBooleanSolid.cc +++ b/DetectorDescription/Parser/src/DDLBooleanSolid.cc @@ -1,5 +1,5 @@ #include "DetectorDescription/Parser/src/DDLBooleanSolid.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDTransform.h" diff --git a/DetectorDescription/Parser/src/DDLElementRegistry.cc b/DetectorDescription/Parser/src/DDLElementRegistry.cc index 1744c034d7828..bbcc7bc5bc1d4 100644 --- a/DetectorDescription/Parser/src/DDLElementRegistry.cc +++ b/DetectorDescription/Parser/src/DDLElementRegistry.cc @@ -5,7 +5,7 @@ #include #include -#include "DetectorDescription/Base/interface/Singleton.h" +#include "DetectorDescription/Core/interface/Singleton.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLAlgorithm.h" #include "DetectorDescription/Parser/src/DDLBooleanSolid.h" diff --git a/DetectorDescription/Parser/src/DDLMap.h b/DetectorDescription/Parser/src/DDLMap.h index 9a418f0b11483..c062d2bc40760 100644 --- a/DetectorDescription/Parser/src/DDLMap.h +++ b/DetectorDescription/Parser/src/DDLMap.h @@ -5,7 +5,7 @@ #include #include -#include "DetectorDescription/Base/interface/DDReadMapType.h" +#include "DetectorDescription/Core/interface/DDReadMapType.h" #include "DetectorDescription/Core/interface/DDMap.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" #include "boost/spirit/home/classic/core/non_terminal/grammar.hpp" diff --git a/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc b/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc index b0d936c8b9970..cbb6d1cb91004 100644 --- a/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc +++ b/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc @@ -1,5 +1,5 @@ #include "DetectorDescription/Parser/src/DDLMultiUnionSolid.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDTransform.h" diff --git a/DetectorDescription/Parser/src/DDLNumeric.h b/DetectorDescription/Parser/src/DDLNumeric.h index dc8c21d275bdc..fdea5e5c10a82 100644 --- a/DetectorDescription/Parser/src/DDLNumeric.h +++ b/DetectorDescription/Parser/src/DDLNumeric.h @@ -9,7 +9,7 @@ // Includes // ------------------------------------------------------------------------- #include "DDXMLElement.h" -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDNumeric.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDLPosPart.cc b/DetectorDescription/Parser/src/DDLPosPart.cc index b6d9d5e263c1b..a8c4e74ec6aee 100644 --- a/DetectorDescription/Parser/src/DDLPosPart.cc +++ b/DetectorDescription/Parser/src/DDLPosPart.cc @@ -3,8 +3,8 @@ #include #include -#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/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDName.h" diff --git a/DetectorDescription/Parser/src/DDLRotationAndReflection.cc b/DetectorDescription/Parser/src/DDLRotationAndReflection.cc index 75dcc052d7ecf..4b653500b644e 100644 --- a/DetectorDescription/Parser/src/DDLRotationAndReflection.cc +++ b/DetectorDescription/Parser/src/DDLRotationAndReflection.cc @@ -7,7 +7,7 @@ #include "CLHEP/Units/GlobalSystemOfUnits.h" #include "CLHEP/Units/SystemOfUnits.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDTransform.h" #include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" diff --git a/DetectorDescription/Parser/src/DDLRotationAndReflection.h b/DetectorDescription/Parser/src/DDLRotationAndReflection.h index d77e33d609492..b25d930406f64 100644 --- a/DetectorDescription/Parser/src/DDLRotationAndReflection.h +++ b/DetectorDescription/Parser/src/DDLRotationAndReflection.h @@ -4,7 +4,7 @@ #include #include "DDXMLElement.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" class DDCompactView; class DDLElementRegistry; diff --git a/DetectorDescription/Parser/src/DDLRotationByAxis.h b/DetectorDescription/Parser/src/DDLRotationByAxis.h index eb3178997c770..cbd5743e3243d 100644 --- a/DetectorDescription/Parser/src/DDLRotationByAxis.h +++ b/DetectorDescription/Parser/src/DDLRotationByAxis.h @@ -4,7 +4,7 @@ #include #include "DDXMLElement.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" class DDCompactView; class DDLElementRegistry; diff --git a/DetectorDescription/Parser/src/DDLRotationSequence.cc b/DetectorDescription/Parser/src/DDLRotationSequence.cc index 595b5750cfc17..edb5d26c1949a 100644 --- a/DetectorDescription/Parser/src/DDLRotationSequence.cc +++ b/DetectorDescription/Parser/src/DDLRotationSequence.cc @@ -4,7 +4,7 @@ #include #include -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDTransform.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLRotationByAxis.h" diff --git a/DetectorDescription/Parser/src/DDLString.h b/DetectorDescription/Parser/src/DDLString.h index be9176d9035e0..1e049d3b4fd7b 100644 --- a/DetectorDescription/Parser/src/DDLString.h +++ b/DetectorDescription/Parser/src/DDLString.h @@ -6,7 +6,7 @@ #include #include "DDXMLElement.h" -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDString.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDLVector.h b/DetectorDescription/Parser/src/DDLVector.h index e9ec9fa403ade..866929b9279a5 100644 --- a/DetectorDescription/Parser/src/DDLVector.h +++ b/DetectorDescription/Parser/src/DDLVector.h @@ -6,8 +6,8 @@ #include #include "DDXMLElement.h" -#include "DetectorDescription/Base/interface/DDReadMapType.h" -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDReadMapType.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDVector.h" class DDCompactView; diff --git a/DetectorDescription/Parser/test/BuildFile.xml b/DetectorDescription/Parser/test/BuildFile.xml index 75b71b53f8c8b..ef386b581947c 100644 --- a/DetectorDescription/Parser/test/BuildFile.xml +++ b/DetectorDescription/Parser/test/BuildFile.xml @@ -1,6 +1,5 @@ - @@ -18,7 +17,6 @@ - @@ -32,7 +30,6 @@ - @@ -44,7 +41,6 @@ - @@ -58,7 +54,6 @@ - diff --git a/DetectorDescription/RegressionTest/BuildFile.xml b/DetectorDescription/RegressionTest/BuildFile.xml index 92bd5d58b8f72..be2f5fd16ff3b 100644 --- a/DetectorDescription/RegressionTest/BuildFile.xml +++ b/DetectorDescription/RegressionTest/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/DetectorDescription/RegressionTest/interface/DDCompareTools.h b/DetectorDescription/RegressionTest/interface/DDCompareTools.h index 8a317ba400d8a..43f7293a571f3 100644 --- a/DetectorDescription/RegressionTest/interface/DDCompareTools.h +++ b/DetectorDescription/RegressionTest/interface/DDCompareTools.h @@ -1,8 +1,8 @@ #include #include -#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/DDExpandedView.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" diff --git a/DetectorDescription/RegressionTest/interface/DDErrorDetection.h b/DetectorDescription/RegressionTest/interface/DDErrorDetection.h index e127720040715..3a5a3bf040296 100644 --- a/DetectorDescription/RegressionTest/interface/DDErrorDetection.h +++ b/DetectorDescription/RegressionTest/interface/DDErrorDetection.h @@ -9,7 +9,7 @@ #include #include -#include "DetectorDescription/Base/interface/Singleton.h" +#include "DetectorDescription/Core/interface/Singleton.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDSolid.h" diff --git a/DetectorDescription/RegressionTest/src/DDErrorDetection.cc b/DetectorDescription/RegressionTest/src/DDErrorDetection.cc index 94f757a68b1e7..ddb9bc47718c8 100644 --- a/DetectorDescription/RegressionTest/src/DDErrorDetection.cc +++ b/DetectorDescription/RegressionTest/src/DDErrorDetection.cc @@ -4,9 +4,9 @@ namespace std { } using namespace std; #include -#include "DetectorDescription/Base/interface/Store.h" +#include "DetectorDescription/Core/interface/Store.h" //***** Explicit template instantiation of Singleton -#include "DetectorDescription/Base/interface/Singleton.icc" +#include "DetectorDescription/Core/interface/Singleton.icc" #include "DetectorDescription/Core/interface/DDBase.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" diff --git a/DetectorDescription/RegressionTest/src/DDExpandedViewDump.cc b/DetectorDescription/RegressionTest/src/DDExpandedViewDump.cc index c14f18586a64e..86db892704430 100644 --- a/DetectorDescription/RegressionTest/src/DDExpandedViewDump.cc +++ b/DetectorDescription/RegressionTest/src/DDExpandedViewDump.cc @@ -6,8 +6,8 @@ namespace std { } using namespace std; #include #include -#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/DDLogicalPart.h" diff --git a/DetectorDescription/RegressionTest/src/DDHtmlFormatter.cc b/DetectorDescription/RegressionTest/src/DDHtmlFormatter.cc index 692e0a6b788b7..f4f7a8fc81df2 100644 --- a/DetectorDescription/RegressionTest/src/DDHtmlFormatter.cc +++ b/DetectorDescription/RegressionTest/src/DDHtmlFormatter.cc @@ -10,10 +10,10 @@ namespace std { } using namespace std; #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/Singleton.h" -#include "DetectorDescription/Base/interface/Singleton.icc" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/Singleton.h" +#include "DetectorDescription/Core/interface/Singleton.icc" #include "DetectorDescription/Core/interface/DDBase.h" #include "DetectorDescription/Core/interface/DDEnums.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" diff --git a/DetectorDescription/RegressionTest/src/build.cc b/DetectorDescription/RegressionTest/src/build.cc index ce02f4a42cb55..5193e99706ccc 100644 --- a/DetectorDescription/RegressionTest/src/build.cc +++ b/DetectorDescription/RegressionTest/src/build.cc @@ -6,8 +6,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/DDExpandedView.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" diff --git a/DetectorDescription/RegressionTest/src/ddstats.cc b/DetectorDescription/RegressionTest/src/ddstats.cc index 22b3c44b6e891..f8db4f55f181a 100644 --- a/DetectorDescription/RegressionTest/src/ddstats.cc +++ b/DetectorDescription/RegressionTest/src/ddstats.cc @@ -5,9 +5,9 @@ #include #include -#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/DDCompactView.h" #include "DetectorDescription/Core/interface/DDExpandedView.h" diff --git a/DetectorDescription/RegressionTest/test/BuildFile.xml b/DetectorDescription/RegressionTest/test/BuildFile.xml index d409e527f4329..1970762f112b2 100644 --- a/DetectorDescription/RegressionTest/test/BuildFile.xml +++ b/DetectorDescription/RegressionTest/test/BuildFile.xml @@ -19,7 +19,6 @@ - @@ -29,7 +28,6 @@ - @@ -39,7 +37,6 @@ - @@ -48,7 +45,6 @@ - diff --git a/DetectorDescription/RegressionTest/test/partsel_example.cpp b/DetectorDescription/RegressionTest/test/partsel_example.cpp index 712ca91b761ab..812c9efb394e9 100644 --- a/DetectorDescription/RegressionTest/test/partsel_example.cpp +++ b/DetectorDescription/RegressionTest/test/partsel_example.cpp @@ -12,7 +12,7 @@ #include "DetectorDescription/Core/interface/DDValue.h" #include "DetectorDescription/Core/src/tutorial.h" #include "DetectorDescription/Core/src/Specific.h" -#include "DetectorDescription/Base/interface/DDException.h" +#include "DetectorDescription/Core/interface/DDException.h" #include "DetectorDescription/Core/interface/DDComparator.h" /********** diff --git a/DetectorDescription/RegressionTest/test/test_module.cc b/DetectorDescription/RegressionTest/test/test_module.cc index d02192bab12f8..76cea9ca5e3ef 100644 --- a/DetectorDescription/RegressionTest/test/test_module.cc +++ b/DetectorDescription/RegressionTest/test/test_module.cc @@ -3,7 +3,7 @@ #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithmFactory.h" -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "FWCore/PluginManager/interface/PluginFactory.h" class DDCompactView; diff --git a/DetectorDescription/RegressionTest/test/tutorial.cc b/DetectorDescription/RegressionTest/test/tutorial.cc index dbd13fa29bff2..a99917694ba7d 100644 --- a/DetectorDescription/RegressionTest/test/tutorial.cc +++ b/DetectorDescription/RegressionTest/test/tutorial.cc @@ -15,8 +15,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/DDEnums.h" #include "DetectorDescription/Core/interface/DDExpandedNode.h" diff --git a/Geometry/EcalCommonData/interface/DDEcalAPDAlgo.h b/Geometry/EcalCommonData/interface/DDEcalAPDAlgo.h index 5b3840a8b1274..63e4742805079 100644 --- a/Geometry/EcalCommonData/interface/DDEcalAPDAlgo.h +++ b/Geometry/EcalCommonData/interface/DDEcalAPDAlgo.h @@ -4,7 +4,7 @@ #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/EcalCommonData/interface/DDEcalBarrelAlgo.h b/Geometry/EcalCommonData/interface/DDEcalBarrelAlgo.h index f8a6719d9f758..98ddacf9ea282 100644 --- a/Geometry/EcalCommonData/interface/DDEcalBarrelAlgo.h +++ b/Geometry/EcalCommonData/interface/DDEcalBarrelAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/EcalCommonData/interface/DDEcalBarrelNewAlgo.h b/Geometry/EcalCommonData/interface/DDEcalBarrelNewAlgo.h index 5a70400b2a316..d5dd0404bba73 100644 --- a/Geometry/EcalCommonData/interface/DDEcalBarrelNewAlgo.h +++ b/Geometry/EcalCommonData/interface/DDEcalBarrelNewAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/EcalCommonData/interface/DDEcalEndcapAlgo.h b/Geometry/EcalCommonData/interface/DDEcalEndcapAlgo.h index 638474ce79188..9684e07c30695 100644 --- a/Geometry/EcalCommonData/interface/DDEcalEndcapAlgo.h +++ b/Geometry/EcalCommonData/interface/DDEcalEndcapAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/EcalCommonData/interface/DDEcalEndcapTrap.h b/Geometry/EcalCommonData/interface/DDEcalEndcapTrap.h index ebcdb27bd0dd0..5bf320b26ebc0 100644 --- a/Geometry/EcalCommonData/interface/DDEcalEndcapTrap.h +++ b/Geometry/EcalCommonData/interface/DDEcalEndcapTrap.h @@ -2,10 +2,10 @@ #define EcalAlgo_DDEcalEndcapTrap_h #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDTypes.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/EcalCommonData/src/DDEcalAPDAlgo.cc b/Geometry/EcalCommonData/src/DDEcalAPDAlgo.cc index 51f4a90955fb6..f9843def3791b 100644 --- a/Geometry/EcalCommonData/src/DDEcalAPDAlgo.cc +++ b/Geometry/EcalCommonData/src/DDEcalAPDAlgo.cc @@ -5,7 +5,7 @@ #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "Geometry/EcalCommonData/interface/DDEcalAPDAlgo.h" DDEcalAPDAlgo::DDEcalAPDAlgo() : diff --git a/Geometry/EcalCommonData/src/DDEcalBarrelAlgo.cc b/Geometry/EcalCommonData/src/DDEcalBarrelAlgo.cc index 4a6a7d035d1d8..48bc5797926cd 100644 --- a/Geometry/EcalCommonData/src/DDEcalBarrelAlgo.cc +++ b/Geometry/EcalCommonData/src/DDEcalBarrelAlgo.cc @@ -11,7 +11,7 @@ #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "Geometry/EcalCommonData/interface/DDEcalBarrelAlgo.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/EcalCommonData/src/DDEcalBarrelNewAlgo.cc b/Geometry/EcalCommonData/src/DDEcalBarrelNewAlgo.cc index b3f130e19a30d..f2271652fa300 100644 --- a/Geometry/EcalCommonData/src/DDEcalBarrelNewAlgo.cc +++ b/Geometry/EcalCommonData/src/DDEcalBarrelNewAlgo.cc @@ -11,7 +11,7 @@ #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "Geometry/EcalCommonData/interface/DDEcalBarrelNewAlgo.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/EcalCommonData/src/DDEcalPreshowerAlgo.cc b/Geometry/EcalCommonData/src/DDEcalPreshowerAlgo.cc index e75068ec248bf..b4b03dc3eaa0c 100644 --- a/Geometry/EcalCommonData/src/DDEcalPreshowerAlgo.cc +++ b/Geometry/EcalCommonData/src/DDEcalPreshowerAlgo.cc @@ -4,7 +4,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/EcalTestBeam/plugins/BuildFile.xml b/Geometry/EcalTestBeam/plugins/BuildFile.xml index bb27fdd067c8b..a8e44d1a3c69c 100644 --- a/Geometry/EcalTestBeam/plugins/BuildFile.xml +++ b/Geometry/EcalTestBeam/plugins/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/Geometry/EcalTestBeam/plugins/DDTBH4Algo.h b/Geometry/EcalTestBeam/plugins/DDTBH4Algo.h index beafafa52e3d2..1290001a0271a 100644 --- a/Geometry/EcalTestBeam/plugins/DDTBH4Algo.h +++ b/Geometry/EcalTestBeam/plugins/DDTBH4Algo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDTransform.h" diff --git a/Geometry/ForwardCommonData/plugins/DDBHMAngular.cc b/Geometry/ForwardCommonData/plugins/DDBHMAngular.cc index 59ed88465259a..a2d614ffb43ac 100644 --- a/Geometry/ForwardCommonData/plugins/DDBHMAngular.cc +++ b/Geometry/ForwardCommonData/plugins/DDBHMAngular.cc @@ -8,7 +8,7 @@ #include "DDBHMAngular.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" #include "DetectorDescription/Core/interface/DDSplit.h" diff --git a/Geometry/ForwardCommonData/plugins/DDBHMAngular.h b/Geometry/ForwardCommonData/plugins/DDBHMAngular.h index 5108034694910..1f7ae3ec67080 100644 --- a/Geometry/ForwardCommonData/plugins/DDBHMAngular.h +++ b/Geometry/ForwardCommonData/plugins/DDBHMAngular.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDBHMAngular : public DDAlgorithm { diff --git a/Geometry/HGCalCommonData/BuildFile.xml b/Geometry/HGCalCommonData/BuildFile.xml index f18d9f047c0a1..81be94f7d21b3 100644 --- a/Geometry/HGCalCommonData/BuildFile.xml +++ b/Geometry/HGCalCommonData/BuildFile.xml @@ -1,5 +1,4 @@ - diff --git a/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.cc b/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.cc index 1284aa84e8a99..419e05b2f7fe2 100644 --- a/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.h b/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.h index 16865d559df25..1c5e0eebeb8cc 100644 --- a/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.h +++ b/Geometry/HGCalCommonData/plugins/DDAHcalModuleAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc index 1b235d1531e4e..d9d36e93a69e9 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.h b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.h index 75af3ff64fb9d..6d8a71d019e74 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHGCalEEAlgo : public DDAlgorithm { diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc index 7ac64396e1f7e..2da2770f792bc 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.h b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.h index d625ec4b7e1d6..9f9c42faad422 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHGCalHEAlgo : public DDAlgorithm { diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalModule.cc b/Geometry/HGCalCommonData/plugins/DDHGCalModule.cc index 7b53b4a14851c..ed87750242149 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalModule.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalModule.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalModule.h b/Geometry/HGCalCommonData/plugins/DDHGCalModule.h index 6b489e3957ec4..1b5c218dc7a64 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalModule.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalModule.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.cc index 37b892db1945e..fe827117da7aa 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.h b/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.h index 3d0d3b4d4bcbe..9527ed5cc50c5 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalModuleAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalNoTaperEndcap.h b/Geometry/HGCalCommonData/plugins/DDHGCalNoTaperEndcap.h index 1d86f9aa9d4a5..908ed54726ebb 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalNoTaperEndcap.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalNoTaperEndcap.h @@ -3,7 +3,7 @@ #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHGCalNoTaperEndcap : public DDAlgorithm { diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.cc b/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.cc index 58dd56c425b00..206413a7c4e77 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.cc @@ -2,7 +2,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.h b/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.h index 0d13b63e124d8..978d76eb6103d 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalTBModule.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalWafer.cc b/Geometry/HGCalCommonData/plugins/DDHGCalWafer.cc index 8fce08c5ae408..35cad1407bccc 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalWafer.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalWafer.cc @@ -2,7 +2,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" #include "DetectorDescription/Core/interface/DDSplit.h" diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalWafer.h b/Geometry/HGCalCommonData/plugins/DDHGCalWafer.h index 8fb68b934950d..c80f764b881a1 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalWafer.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalWafer.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHGCalWafer : public DDAlgorithm { diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.cc index f0df0d83af7be..ff202e5288e20 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.cc +++ b/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" #include "Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.h" diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.h b/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.h index cc360ed7d305c..809b93646b70a 100644 --- a/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.h +++ b/Geometry/HGCalCommonData/plugins/DDHGCalWaferAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHGCalWaferAlgo : public DDAlgorithm { diff --git a/Geometry/HGCalCommonData/src/FastTimeParametersFromDD.cc b/Geometry/HGCalCommonData/src/FastTimeParametersFromDD.cc index 403e9373025c1..8a94ff2c14a49 100644 --- a/Geometry/HGCalCommonData/src/FastTimeParametersFromDD.cc +++ b/Geometry/HGCalCommonData/src/FastTimeParametersFromDD.cc @@ -3,7 +3,7 @@ #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/Core/interface/DDFilteredView.h" #include "DetectorDescription/Core/interface/DDVectorGetter.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc index 83d51681c4b13..72ff415f181bc 100644 --- a/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc +++ b/Geometry/HGCalCommonData/src/HGCalGeomParameters.cc @@ -3,7 +3,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDValue.h" #include "DetectorDescription/Core/interface/DDFilter.h" #include "DetectorDescription/Core/interface/DDSolid.h" diff --git a/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc b/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc index f2bcfe2138991..738dab0e5808a 100644 --- a/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc +++ b/Geometry/HGCalCommonData/src/HGCalParametersFromDD.cc @@ -5,7 +5,7 @@ #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/Core/interface/DDFilteredView.h" #include "DetectorDescription/Core/interface/DDVectorGetter.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/HcalAlgo/plugins/DDHCalAngular.h b/Geometry/HcalAlgo/plugins/DDHCalAngular.h index e6b1886c2216f..5bfe4660c68b4 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalAngular.h +++ b/Geometry/HcalAlgo/plugins/DDHCalAngular.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalAngular : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc index b61ad4edad024..afa4c2c60d5cd 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc +++ b/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc @@ -10,7 +10,7 @@ namespace std{} using namespace std; #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.h index 63aa9aca2c657..31023efbb2e57 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalBarrelAlgo : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc index 54bd95e00f572..75dd56f2d682a 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc +++ b/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc @@ -9,7 +9,7 @@ namespace std{} using namespace std; #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.h index 14813ee984c84..963075362d2e2 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalEndcapAlgo : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc index 3c9d65c0faa25..8a24b1d78ac2e 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc +++ b/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc @@ -8,7 +8,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.h index ce4de1f350c66..8f5157dcf8949 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalEndcapModuleAlgo : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.cc b/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.cc index 96ad04133a481..1a46f68425620 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.cc +++ b/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.h b/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.h index f9fdc9c35f952..cb4257afc0129 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.h +++ b/Geometry/HcalAlgo/plugins/DDHCalFibreBundle.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalFibreBundle : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.cc index c9be8f4b7c8eb..44d5c29c2a6a2 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.cc +++ b/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.cc @@ -8,7 +8,7 @@ namespace std{} using namespace std; #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.h index 9cc92683f8698..b218a256a8aeb 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalForwardAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalForwardAlgo : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalLinearXY.h b/Geometry/HcalAlgo/plugins/DDHCalLinearXY.h index d9da18938379c..0bd9fea7a2946 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalLinearXY.h +++ b/Geometry/HcalAlgo/plugins/DDHCalLinearXY.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalLinearXY : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalTBCableAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalTBCableAlgo.h index 01e7405527383..9cab8a07c7595 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalTBCableAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalTBCableAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalTBCableAlgo : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalTBZposAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalTBZposAlgo.h index 2e46bae9a350e..da3c7260a6d3c 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalTBZposAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalTBZposAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalTBZposAlgo : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalTestBeamAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalTestBeamAlgo.h index b3f1647cec480..11d148fbe85ac 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalTestBeamAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalTestBeamAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalTestBeamAlgo : public DDAlgorithm { diff --git a/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.h b/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.h index f2301c76d56a6..f6dee769a5830 100644 --- a/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.h +++ b/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDHCalXtalAlgo : public DDAlgorithm { diff --git a/Geometry/HcalCommonData/BuildFile.xml b/Geometry/HcalCommonData/BuildFile.xml index 1f2b5a56441d1..39e87ccedae22 100644 --- a/Geometry/HcalCommonData/BuildFile.xml +++ b/Geometry/HcalCommonData/BuildFile.xml @@ -1,4 +1,3 @@ - diff --git a/Geometry/HcalCommonData/src/HcalGeomParameters.cc b/Geometry/HcalCommonData/src/HcalGeomParameters.cc index 6657ffdc2bfb5..f8d2cc3f3db2f 100644 --- a/Geometry/HcalCommonData/src/HcalGeomParameters.cc +++ b/Geometry/HcalCommonData/src/HcalGeomParameters.cc @@ -3,7 +3,7 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDValue.h" #include "DetectorDescription/Core/interface/DDFilter.h" #include "DetectorDescription/Core/interface/DDSolid.h" diff --git a/Geometry/HcalCommonData/src/HcalParametersFromDD.cc b/Geometry/HcalCommonData/src/HcalParametersFromDD.cc index 88e3039d973b4..a47b6e49963ce 100644 --- a/Geometry/HcalCommonData/src/HcalParametersFromDD.cc +++ b/Geometry/HcalCommonData/src/HcalParametersFromDD.cc @@ -5,7 +5,7 @@ #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/Core/interface/DDFilteredView.h" #include "DetectorDescription/Core/interface/DDVectorGetter.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/HcalTestBeamData/plugins/DDEcalPreshowerAlgoTB.cc b/Geometry/HcalTestBeamData/plugins/DDEcalPreshowerAlgoTB.cc index d4a44d2e7e42f..13ca0cc93dfcb 100644 --- a/Geometry/HcalTestBeamData/plugins/DDEcalPreshowerAlgoTB.cc +++ b/Geometry/HcalTestBeamData/plugins/DDEcalPreshowerAlgoTB.cc @@ -5,8 +5,8 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDTypes.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/MTCCTrackerCommonData/plugins/BuildFile.xml b/Geometry/MTCCTrackerCommonData/plugins/BuildFile.xml index 7ad1e0680e241..07666b0b935a0 100644 --- a/Geometry/MTCCTrackerCommonData/plugins/BuildFile.xml +++ b/Geometry/MTCCTrackerCommonData/plugins/BuildFile.xml @@ -1,7 +1,6 @@ - diff --git a/Geometry/MTCCTrackerCommonData/plugins/DDTIBLayerAlgo_MTCC.h b/Geometry/MTCCTrackerCommonData/plugins/DDTIBLayerAlgo_MTCC.h index fee57466e8016..75d6ad2193385 100644 --- a/Geometry/MTCCTrackerCommonData/plugins/DDTIBLayerAlgo_MTCC.h +++ b/Geometry/MTCCTrackerCommonData/plugins/DDTIBLayerAlgo_MTCC.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTIBLayerAlgo_MTCC : public DDAlgorithm { diff --git a/Geometry/MTCCTrackerCommonData/plugins/DDTIBRadCableAlgo_MTCC.h b/Geometry/MTCCTrackerCommonData/plugins/DDTIBRadCableAlgo_MTCC.h index 385095c590a92..4a67cd86676dd 100644 --- a/Geometry/MTCCTrackerCommonData/plugins/DDTIBRadCableAlgo_MTCC.h +++ b/Geometry/MTCCTrackerCommonData/plugins/DDTIBRadCableAlgo_MTCC.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTIBRadCableAlgo_MTCC : public DDAlgorithm { diff --git a/Geometry/MuonCommonData/plugins/DDGEMAngular.h b/Geometry/MuonCommonData/plugins/DDGEMAngular.h index d863189bd426d..3ce46c821f51f 100644 --- a/Geometry/MuonCommonData/plugins/DDGEMAngular.h +++ b/Geometry/MuonCommonData/plugins/DDGEMAngular.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDGEMAngular : public DDAlgorithm { diff --git a/Geometry/MuonCommonData/plugins/DDMuonAngular.h b/Geometry/MuonCommonData/plugins/DDMuonAngular.h index d5717309a4c76..7ec1fd3db0de2 100644 --- a/Geometry/MuonCommonData/plugins/DDMuonAngular.h +++ b/Geometry/MuonCommonData/plugins/DDMuonAngular.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDMuonAngular : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDCutTubsFromPoints.h b/Geometry/TrackerCommonData/plugins/DDCutTubsFromPoints.h index b8439065abb4a..8476f1f663b38 100644 --- a/Geometry/TrackerCommonData/plugins/DDCutTubsFromPoints.h +++ b/Geometry/TrackerCommonData/plugins/DDCutTubsFromPoints.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/TrackerCommonData/plugins/DDPixBarLayerAlgo.h b/Geometry/TrackerCommonData/plugins/DDPixBarLayerAlgo.h index 60f5bf9cf003e..a20f8c7b12662 100644 --- a/Geometry/TrackerCommonData/plugins/DDPixBarLayerAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDPixBarLayerAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarLayerAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDPixBarLayerUpgradeAlgo.h b/Geometry/TrackerCommonData/plugins/DDPixBarLayerUpgradeAlgo.h index d4e4aa70eb37d..043140afca457 100644 --- a/Geometry/TrackerCommonData/plugins/DDPixBarLayerUpgradeAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDPixBarLayerUpgradeAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarLayerUpgradeAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.cc b/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.cc index 9af68f83f3434..9c276d73a810c 100644 --- a/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.cc +++ b/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.cc @@ -12,7 +12,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.h b/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.h index 8213d8eda98bd..8176f84f6ac94 100644 --- a/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.h +++ b/Geometry/TrackerCommonData/plugins/DDPixFwdBlades.h @@ -55,7 +55,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" #include "DetectorDescription/Core/interface/DDTransform.h" #include "CLHEP/Vector/ThreeVector.h" diff --git a/Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.h b/Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.h index 825f66fbbb72e..37690f15bd243 100644 --- a/Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixFwdDiskAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.cc b/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.cc index ac935fe4ea6cf..bb4f725cdd76b 100644 --- a/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.cc +++ b/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.cc @@ -7,7 +7,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" #include "DetectorDescription/Core/interface/DDSplit.h" #include "Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.h" diff --git a/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.h b/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.h index 47bfbe62d3a43..212edef0b0c60 100644 --- a/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDPixPhase1FwdDiskAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixPhase1FwdDiskAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTECAxialCableAlgo.h b/Geometry/TrackerCommonData/plugins/DDTECAxialCableAlgo.h index bd420db2eb638..829e796767ed8 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECAxialCableAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTECAxialCableAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTECAxialCableAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.cc b/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.cc index 6ab16684d3c75..7b9e0a7f2c6dd 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.cc +++ b/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.cc @@ -10,7 +10,7 @@ #include #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" #include "DetectorDescription/Core/interface/DDSplit.h" #include "Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.h" diff --git a/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.h b/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.h index 3884b8eda0a3c..84e0c0a20b82e 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTECCoolAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTECCoolAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.h b/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.h index 804569a96f9ec..163eb8a225f89 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTECModuleAlgo.h @@ -5,7 +5,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTECModuleAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTECOptoHybAlgo.h b/Geometry/TrackerCommonData/plugins/DDTECOptoHybAlgo.h index 8e8f16801e3bf..29c785eeb31fb 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECOptoHybAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTECOptoHybAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTECOptoHybAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTECPhiAlgo.h b/Geometry/TrackerCommonData/plugins/DDTECPhiAlgo.h index 763ae48be0d14..ea8cf32e902f2 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECPhiAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTECPhiAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTECPhiAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTECPhiAltAlgo.h b/Geometry/TrackerCommonData/plugins/DDTECPhiAltAlgo.h index 1dd491e1c1acd..039471089547a 100644 --- a/Geometry/TrackerCommonData/plugins/DDTECPhiAltAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTECPhiAltAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTECPhiAltAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTIBLayerAlgo.h b/Geometry/TrackerCommonData/plugins/DDTIBLayerAlgo.h index 31006f628db04..f227e8421e126 100644 --- a/Geometry/TrackerCommonData/plugins/DDTIBLayerAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTIBLayerAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTIBLayerAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTIDAxialCableAlgo.h b/Geometry/TrackerCommonData/plugins/DDTIDAxialCableAlgo.h index ad73c4d060a49..d4643dc5f6a0d 100644 --- a/Geometry/TrackerCommonData/plugins/DDTIDAxialCableAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTIDAxialCableAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTIDAxialCableAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTIDModuleAlgo.h b/Geometry/TrackerCommonData/plugins/DDTIDModuleAlgo.h index 5a46fbee40328..32715816d079c 100644 --- a/Geometry/TrackerCommonData/plugins/DDTIDModuleAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTIDModuleAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTIDModuleAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTIDModulePosAlgo.h b/Geometry/TrackerCommonData/plugins/DDTIDModulePosAlgo.h index f752e0fd00d76..a1f88ed8fa1bc 100644 --- a/Geometry/TrackerCommonData/plugins/DDTIDModulePosAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTIDModulePosAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTIDModulePosAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTIDRingAlgo.h b/Geometry/TrackerCommonData/plugins/DDTIDRingAlgo.h index b46c653dcb135..89c1a291960ae 100644 --- a/Geometry/TrackerCommonData/plugins/DDTIDRingAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTIDRingAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTIDRingAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTOBAxCableAlgo.h b/Geometry/TrackerCommonData/plugins/DDTOBAxCableAlgo.h index 580a3e8acc579..f3c6ad76727e1 100644 --- a/Geometry/TrackerCommonData/plugins/DDTOBAxCableAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTOBAxCableAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTOBAxCableAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTOBRadCableAlgo.h b/Geometry/TrackerCommonData/plugins/DDTOBRadCableAlgo.h index 72a8747b2751b..790a08d7aa53a 100644 --- a/Geometry/TrackerCommonData/plugins/DDTOBRadCableAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTOBRadCableAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTOBRadCableAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTOBRodAlgo.h b/Geometry/TrackerCommonData/plugins/DDTOBRodAlgo.h index 125d20d412a54..3d5d1830623ec 100644 --- a/Geometry/TrackerCommonData/plugins/DDTOBRodAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTOBRodAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTOBRodAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerAngular.h b/Geometry/TrackerCommonData/plugins/DDTrackerAngular.h index 9e7733e12ba82..e124cacd21207 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerAngular.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerAngular.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerAngular : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerAngularV1.h b/Geometry/TrackerCommonData/plugins/DDTrackerAngularV1.h index be810d3687411..c09a4514cd291 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerAngularV1.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerAngularV1.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerAngularV1 : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerLinear.h b/Geometry/TrackerCommonData/plugins/DDTrackerLinear.h index 60eecff656ad6..61a1a62c535e7 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerLinear.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerLinear.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerLinear : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerLinearXY.h b/Geometry/TrackerCommonData/plugins/DDTrackerLinearXY.h index 7452b007a953f..c54cdc723d2b0 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerLinearXY.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerLinearXY.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerLinearXY : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerPhiAlgo.h b/Geometry/TrackerCommonData/plugins/DDTrackerPhiAlgo.h index 85196b70d736b..0bed3f75e041f 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerPhiAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerPhiAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerPhiAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerPhiAltAlgo.h b/Geometry/TrackerCommonData/plugins/DDTrackerPhiAltAlgo.h index e1de49062f6c4..cc4d5f74795a1 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerPhiAltAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerPhiAltAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerPhiAltAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.cc b/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.cc index 01110ce4bd77f..68294e141379b 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.cc +++ b/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.cc @@ -12,7 +12,7 @@ #include "DetectorDescription/Core/interface/DDCurrentNamespace.h" #include "DetectorDescription/Core/interface/DDSplit.h" #include "Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDTransform.h" #include "CLHEP/Units/GlobalPhysicalConstants.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.h b/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.h index cacc9e4edffed..31fe089595d8b 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerRingAlgo.h @@ -35,7 +35,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerRingAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerXYZPosAlgo.h b/Geometry/TrackerCommonData/plugins/DDTrackerXYZPosAlgo.h index 6f75d8740ef82..7972f0f5cbe00 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerXYZPosAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerXYZPosAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerXYZPosAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerCommonData/plugins/DDTrackerZPosAlgo.h b/Geometry/TrackerCommonData/plugins/DDTrackerZPosAlgo.h index 7af71959a0e97..a9f812ea137b4 100644 --- a/Geometry/TrackerCommonData/plugins/DDTrackerZPosAlgo.h +++ b/Geometry/TrackerCommonData/plugins/DDTrackerZPosAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDTrackerZPosAlgo : public DDAlgorithm { diff --git a/Geometry/TrackerGeometryBuilder/src/TrackerParametersFromDD.cc b/Geometry/TrackerGeometryBuilder/src/TrackerParametersFromDD.cc index 2b7fe2ca2bf4c..87cc5d7e4f658 100644 --- a/Geometry/TrackerGeometryBuilder/src/TrackerParametersFromDD.cc +++ b/Geometry/TrackerGeometryBuilder/src/TrackerParametersFromDD.cc @@ -2,7 +2,7 @@ #include "CondFormats/GeometryObjects/interface/PTrackerParameters.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/Core/interface/DDVectorGetter.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" bool TrackerParametersFromDD::build( const DDCompactView* cvp, diff --git a/Geometry/TrackerNumberingBuilder/BuildFile.xml b/Geometry/TrackerNumberingBuilder/BuildFile.xml index 2ae7a176c6b3b..f4e2cbe193f4a 100644 --- a/Geometry/TrackerNumberingBuilder/BuildFile.xml +++ b/Geometry/TrackerNumberingBuilder/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h b/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h index 17472c3daa86e..021a79bfeb691 100644 --- a/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h +++ b/Geometry/TrackerNumberingBuilder/interface/GeometricDet.h @@ -3,8 +3,8 @@ #include "CondFormats/GeometryObjects/interface/PGeometricDet.h" #include "DetectorDescription/Core/interface/DDExpandedView.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/DDSolidShapes.h" #include "DataFormats/GeometrySurface/interface/Surface.h" #include "DataFormats/GeometrySurface/interface/Bounds.h" diff --git a/Geometry/TrackerNumberingBuilder/interface/GeometricDetExtra.h b/Geometry/TrackerNumberingBuilder/interface/GeometricDetExtra.h index b274d9bcf02ef..6b359d6f1c699 100644 --- a/Geometry/TrackerNumberingBuilder/interface/GeometricDetExtra.h +++ b/Geometry/TrackerNumberingBuilder/interface/GeometricDetExtra.h @@ -4,8 +4,8 @@ //#include "CondFormats/GeometryObjects/interface/PGeometricDetExtra.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h" #include "DetectorDescription/Core/interface/DDExpandedView.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/DDSolidShapes.h" */ /* #include "DataFormats/GeometrySurface/interface/Surface.h" */ /* #include "DataFormats/GeometrySurface/interface/Bounds.h" */ diff --git a/Geometry/TrackerNumberingBuilder/plugins/TrackerGeometricDetESModule.cc b/Geometry/TrackerNumberingBuilder/plugins/TrackerGeometricDetESModule.cc index 3546b04e44f7c..672784696dbc9 100644 --- a/Geometry/TrackerNumberingBuilder/plugins/TrackerGeometricDetESModule.cc +++ b/Geometry/TrackerNumberingBuilder/plugins/TrackerGeometricDetESModule.cc @@ -4,7 +4,7 @@ #include "Geometry/Records/interface/IdealGeometryRecord.h" #include "DetectorDescription/Core/interface/DDCompactView.h" #include "DetectorDescription/Core/interface/DDVectorGetter.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/ESTransientHandle.h" diff --git a/Geometry/TrackerNumberingBuilder/src/GeometricDetExtra.cc b/Geometry/TrackerNumberingBuilder/src/GeometricDetExtra.cc index 155ad13d05dd2..b302eb7fc5587 100644 --- a/Geometry/TrackerNumberingBuilder/src/GeometricDetExtra.cc +++ b/Geometry/TrackerNumberingBuilder/src/GeometricDetExtra.cc @@ -1,8 +1,8 @@ //#include "CondFormats/GeometryObjects/interface/PGeometricDetExtra.h" #include "Geometry/TrackerNumberingBuilder/interface/GeometricDetExtra.h" //#include "DetectorDescription/Core/interface/DDExpandedView.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/DDSolidShapes.h" */ /* #include "DataFormats/GeometrySurface/interface/Surface.h" */ /* #include "DataFormats/GeometrySurface/interface/Bounds.h" */ diff --git a/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h b/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h index a79228e82d3ed..14bd8353ea0b8 100644 --- a/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h +++ b/Geometry/VeryForwardGeometryBuilder/interface/DetGeomDesc.h @@ -10,8 +10,8 @@ #define Geometry_VeryForwardGeometryBuilder_DetGeomDesc #include "DetectorDescription/Core/interface/DDExpandedView.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/DDSolidShapes.h" #include "DataFormats/DetId/interface/DetId.h" diff --git a/Geometry/VeryForwardGeometryBuilder/plugins/TotemRPGeometryESModule.cc b/Geometry/VeryForwardGeometryBuilder/plugins/TotemRPGeometryESModule.cc index 2d93e8243daae..b606181388327 100644 --- a/Geometry/VeryForwardGeometryBuilder/plugins/TotemRPGeometryESModule.cc +++ b/Geometry/VeryForwardGeometryBuilder/plugins/TotemRPGeometryESModule.cc @@ -19,7 +19,7 @@ #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDSpecifics.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/src/Material.h" #include "DetectorDescription/Core/src/Solid.h" #include "DetectorDescription/Core/src/LogicalPart.h" diff --git a/GeometryReaders/XMLIdealGeometryESSource/BuildFile.xml b/GeometryReaders/XMLIdealGeometryESSource/BuildFile.xml index 32771a7909ee7..8169e47987698 100644 --- a/GeometryReaders/XMLIdealGeometryESSource/BuildFile.xml +++ b/GeometryReaders/XMLIdealGeometryESSource/BuildFile.xml @@ -1,4 +1,3 @@ - diff --git a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc index 5d68b120cabe0..efe2f807a1189 100644 --- a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc +++ b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESProducer.cc @@ -36,7 +36,7 @@ #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDSpecifics.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/src/Material.h" #include "DetectorDescription/Core/src/Solid.h" diff --git a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESSource.cc b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESSource.cc index b1f0cff5fa274..c8c65a67a48e0 100644 --- a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESSource.cc +++ b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealGeometryESSource.cc @@ -7,7 +7,7 @@ #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDSpecifics.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/src/Material.h" #include "DetectorDescription/Core/src/Solid.h" diff --git a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealMagneticFieldGeometryESProducer.cc b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealMagneticFieldGeometryESProducer.cc index 4d3baa67ae168..770e462317e20 100644 --- a/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealMagneticFieldGeometryESProducer.cc +++ b/GeometryReaders/XMLIdealGeometryESSource/src/XMLIdealMagneticFieldGeometryESProducer.cc @@ -13,7 +13,7 @@ #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDSpecifics.h" -#include "DetectorDescription/Base/interface/DDRotationMatrix.h" +#include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/src/Material.h" #include "DetectorDescription/Core/src/Solid.h" diff --git a/MagneticField/GeomBuilder/BuildFile.xml b/MagneticField/GeomBuilder/BuildFile.xml index dc3d3135b58bb..58d3aaf24d15c 100644 --- a/MagneticField/GeomBuilder/BuildFile.xml +++ b/MagneticField/GeomBuilder/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/MagneticField/GeomBuilder/src/volumeHandle.cc b/MagneticField/GeomBuilder/src/volumeHandle.cc index 27830bc98c93b..137f5acbee1f4 100644 --- a/MagneticField/GeomBuilder/src/volumeHandle.cc +++ b/MagneticField/GeomBuilder/src/volumeHandle.cc @@ -8,7 +8,7 @@ #include "MagneticField/GeomBuilder/src/volumeHandle.h" #include "DetectorDescription/Core/interface/DDExpandedView.h" -#include "DetectorDescription/Base/interface/DDTranslation.h" +#include "DetectorDescription/Core/interface/DDTranslation.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDValue.h" #include "DetectorDescription/Core/interface/DDMaterial.h" diff --git a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarLayerUpgradeAlgoCoverage.h b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarLayerUpgradeAlgoCoverage.h index fe304582cb642..abbfc6c16381a 100644 --- a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarLayerUpgradeAlgoCoverage.h +++ b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarLayerUpgradeAlgoCoverage.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarLayerUpgradeAlgoCoverage : public DDAlgorithm { diff --git a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLayerAlgo.h b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLayerAlgo.h index 7bf1b7ab314da..c681d13e4c279 100644 --- a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLayerAlgo.h +++ b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLayerAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarStackLayerAlgo : public DDAlgorithm { diff --git a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinear.h b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinear.h index 05f943c7aad88..40d381e09eeb9 100644 --- a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinear.h +++ b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinear.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarStackLinear : public DDAlgorithm { diff --git a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinearGap.h b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinearGap.h index 3a7908074ac12..587498e42fd98 100644 --- a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinearGap.h +++ b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackLinearGap.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarStackLinearGap : public DDAlgorithm { diff --git a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackTrigLayerAlgo.h b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackTrigLayerAlgo.h index 6a7bdcf8caf22..d8afa9e80ba71 100644 --- a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackTrigLayerAlgo.h +++ b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarStackTrigLayerAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarStackTrigLayerAlgo : public DDAlgorithm { diff --git a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarTPGStackLayerAlgo.h b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarTPGStackLayerAlgo.h index 570d00b069128..d659808f147e9 100644 --- a/SLHCUpgradeSimulations/Geometry/interface/DDPixBarTPGStackLayerAlgo.h +++ b/SLHCUpgradeSimulations/Geometry/interface/DDPixBarTPGStackLayerAlgo.h @@ -4,7 +4,7 @@ #include #include #include -#include "DetectorDescription/Base/interface/DDTypes.h" +#include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Algorithm/interface/DDAlgorithm.h" class DDPixBarTPGStackLayerAlgo : public DDAlgorithm { diff --git a/SimG4CMS/Forward/src/FastTimerSD.cc b/SimG4CMS/Forward/src/FastTimerSD.cc index 9ff840b867e3a..c163a2b6bae33 100644 --- a/SimG4CMS/Forward/src/FastTimerSD.cc +++ b/SimG4CMS/Forward/src/FastTimerSD.cc @@ -6,7 +6,7 @@ #include "DetectorDescription/Core/interface/DDFilteredView.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDMaterial.h" -#include "DetectorDescription/Base/interface/DDutils.h" +#include "DetectorDescription/Core/interface/DDutils.h" #include "DetectorDescription/Core/interface/DDValue.h" #include "FWCore/Framework/interface/ESHandle.h" From 3ba21e245b87bf2c6ee4431ccddafa35f8c6d7be Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Tue, 6 Jun 2017 14:29:04 +0200 Subject: [PATCH 2/2] Merge DD ExprAlgo to Core --- DetectorDescription/Core/BuildFile.xml | 2 +- .../{ExprAlgo => Core}/interface/ClhepEvaluator.h | 0 .../{ExprAlgo => Core}/src/ClhepEvaluator.cc | 2 +- DetectorDescription/Core/src/DDConstant.cc | 5 ++--- DetectorDescription/Core/src/DDString.cc | 6 ------ DetectorDescription/Core/src/DDVector.cc | 6 ------ DetectorDescription/Core/src/StoresInstantiation.cc | 2 +- DetectorDescription/ExprAlgo/BuildFile.xml | 7 ------- .../ExprAlgo/interface/ExprEvalSingleton.h | 11 ----------- DetectorDescription/ExprAlgo/src/ExprEvalSingleton.cc | 6 ------ DetectorDescription/Parser/BuildFile.xml | 1 - .../Parser/interface/DDLElementRegistry.h | 4 ++-- DetectorDescription/Parser/src/DDLAlgorithm.cc | 2 +- DetectorDescription/Parser/src/DDLBooleanSolid.cc | 2 +- DetectorDescription/Parser/src/DDLBox.cc | 2 +- .../Parser/src/DDLCompositeMaterial.cc | 2 +- DetectorDescription/Parser/src/DDLCone.cc | 2 +- DetectorDescription/Parser/src/DDLDivision.cc | 2 +- .../Parser/src/DDLElementaryMaterial.cc | 2 +- DetectorDescription/Parser/src/DDLEllipsoid.cc | 2 +- DetectorDescription/Parser/src/DDLEllipticalTube.cc | 2 +- DetectorDescription/Parser/src/DDLMap.cc | 2 +- DetectorDescription/Parser/src/DDLMultiUnionSolid.cc | 2 +- DetectorDescription/Parser/src/DDLNumeric.cc | 2 +- DetectorDescription/Parser/src/DDLOrb.cc | 2 +- DetectorDescription/Parser/src/DDLParallelepiped.cc | 2 +- DetectorDescription/Parser/src/DDLPgonGenerator.cc | 2 +- DetectorDescription/Parser/src/DDLPolyGenerator.cc | 2 +- DetectorDescription/Parser/src/DDLPosPart.cc | 2 +- DetectorDescription/Parser/src/DDLPseudoTrap.cc | 2 +- .../Parser/src/DDLRotationAndReflection.cc | 2 +- DetectorDescription/Parser/src/DDLRotationByAxis.cc | 2 +- .../Parser/src/DDLSAX2ExpressionHandler.cc | 2 +- DetectorDescription/Parser/src/DDLSpecPar.cc | 2 +- DetectorDescription/Parser/src/DDLSphere.cc | 2 +- DetectorDescription/Parser/src/DDLTorus.cc | 2 +- DetectorDescription/Parser/src/DDLTrapezoid.cc | 2 +- DetectorDescription/Parser/src/DDLTubs.cc | 2 +- DetectorDescription/Parser/src/DDLVector.cc | 2 +- DetectorDescription/RegressionTest/BuildFile.xml | 1 - DetectorDescription/RegressionTest/bin/BuildFile.xml | 1 - DetectorDescription/RegressionTest/src/build.cc | 7 +++---- DetectorDescription/RegressionTest/test/BuildFile.xml | 1 - DetectorDescription/RegressionTest/test/tutorial.cc | 5 ++--- .../CaloEventSetup/interface/CaloGeometryLoader.icc | 1 - Geometry/EcalTestBeam/plugins/BuildFile.xml | 1 - 46 files changed, 39 insertions(+), 84 deletions(-) rename DetectorDescription/{ExprAlgo => Core}/interface/ClhepEvaluator.h (100%) rename DetectorDescription/{ExprAlgo => Core}/src/ClhepEvaluator.cc (99%) delete mode 100644 DetectorDescription/ExprAlgo/BuildFile.xml delete mode 100644 DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h delete mode 100644 DetectorDescription/ExprAlgo/src/ExprEvalSingleton.cc diff --git a/DetectorDescription/Core/BuildFile.xml b/DetectorDescription/Core/BuildFile.xml index f3f5a6f236813..2153d9a045fc6 100644 --- a/DetectorDescription/Core/BuildFile.xml +++ b/DetectorDescription/Core/BuildFile.xml @@ -1,7 +1,7 @@ - + diff --git a/DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h b/DetectorDescription/Core/interface/ClhepEvaluator.h similarity index 100% rename from DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h rename to DetectorDescription/Core/interface/ClhepEvaluator.h diff --git a/DetectorDescription/ExprAlgo/src/ClhepEvaluator.cc b/DetectorDescription/Core/src/ClhepEvaluator.cc similarity index 99% rename from DetectorDescription/ExprAlgo/src/ClhepEvaluator.cc rename to DetectorDescription/Core/src/ClhepEvaluator.cc index 472594580f0e8..729fb89c85bf2 100644 --- a/DetectorDescription/ExprAlgo/src/ClhepEvaluator.cc +++ b/DetectorDescription/Core/src/ClhepEvaluator.cc @@ -4,7 +4,7 @@ #include #include "CLHEP/Evaluator/Evaluator.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/Exception.h" diff --git a/DetectorDescription/Core/src/DDConstant.cc b/DetectorDescription/Core/src/DDConstant.cc index 549a75094bf1d..e9cb5aa60862a 100644 --- a/DetectorDescription/Core/src/DDConstant.cc +++ b/DetectorDescription/Core/src/DDConstant.cc @@ -5,8 +5,7 @@ #include #include "DetectorDescription/Core/interface/Store.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" -#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "FWCore/Utilities/interface/Exception.h" DDConstant::DDConstant() : DDBase() { } @@ -37,7 +36,7 @@ std::ostream & operator<<(std::ostream & os, const DDConstant & cons) void DDConstant::createConstantsFromEvaluator( void ) { - auto& eval = ExprEvalSingleton::instance(); + auto& eval = DDI::Singleton::instance(); const auto& vars = eval.variables(); const auto& vals = eval.values(); if( vars.size() != vals.size()) { diff --git a/DetectorDescription/Core/src/DDString.cc b/DetectorDescription/Core/src/DDString.cc index eb53b8a8da2c3..7e3cb1d5e1594 100644 --- a/DetectorDescription/Core/src/DDString.cc +++ b/DetectorDescription/Core/src/DDString.cc @@ -3,12 +3,6 @@ #include #include "DetectorDescription/Core/interface/Store.h" -//#include "DetectorDescription/Core/interface/DDException.h" - -// Evaluator -//#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" - - DDString::DDString() : DDBase() { } diff --git a/DetectorDescription/Core/src/DDVector.cc b/DetectorDescription/Core/src/DDVector.cc index 3410646a943db..f51481c708892 100644 --- a/DetectorDescription/Core/src/DDVector.cc +++ b/DetectorDescription/Core/src/DDVector.cc @@ -3,12 +3,6 @@ #include #include "DetectorDescription/Core/interface/Store.h" -//#include "DetectorDescription/Core/interface/DDException.h" - -// Evaluator -//#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" - - DDVector::DDVector() : DDBase*>() { } diff --git a/DetectorDescription/Core/src/StoresInstantiation.cc b/DetectorDescription/Core/src/StoresInstantiation.cc index 309e477731cb6..f15ac7d6202e3 100644 --- a/DetectorDescription/Core/src/StoresInstantiation.cc +++ b/DetectorDescription/Core/src/StoresInstantiation.cc @@ -11,7 +11,7 @@ #include "DetectorDescription/Core/src/Material.h" #include "DetectorDescription/Core/src/Solid.h" #include "DetectorDescription/Core/src/Specific.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include #include #include diff --git a/DetectorDescription/ExprAlgo/BuildFile.xml b/DetectorDescription/ExprAlgo/BuildFile.xml deleted file mode 100644 index fa63d40a8481d..0000000000000 --- a/DetectorDescription/ExprAlgo/BuildFile.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h b/DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h deleted file mode 100644 index c1e7a6460134e..0000000000000 --- a/DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef ExprEvalSingleton_h -#define ExprEvalSingleton_h - -#include "DetectorDescription/Core/interface/Singleton.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" - -class ClhepEvaluator; - -typedef DDI::Singleton ExprEvalSingleton; - -#endif diff --git a/DetectorDescription/ExprAlgo/src/ExprEvalSingleton.cc b/DetectorDescription/ExprAlgo/src/ExprEvalSingleton.cc deleted file mode 100644 index 79462581b491b..0000000000000 --- a/DetectorDescription/ExprAlgo/src/ExprEvalSingleton.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" - -// initialize the singleton - -//ExprEval::pointer_type ExprEval::instance_ = 0; - diff --git a/DetectorDescription/Parser/BuildFile.xml b/DetectorDescription/Parser/BuildFile.xml index e2fe6a15cedff..dcf8116ee7218 100644 --- a/DetectorDescription/Parser/BuildFile.xml +++ b/DetectorDescription/Parser/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/DetectorDescription/Parser/interface/DDLElementRegistry.h b/DetectorDescription/Parser/interface/DDLElementRegistry.h index 471db0c749575..e2e945fb350e3 100644 --- a/DetectorDescription/Parser/interface/DDLElementRegistry.h +++ b/DetectorDescription/Parser/interface/DDLElementRegistry.h @@ -3,7 +3,7 @@ #include "DetectorDescription/Core/interface/Singleton.h" #include "DetectorDescription/Core/interface/Singleton.icc" -#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include #include @@ -43,7 +43,7 @@ class DDLElementRegistry */ std::shared_ptr getElement(const std::string& name); - ClhepEvaluator &evaluator() { return ExprEvalSingleton::instance(); } + ClhepEvaluator &evaluator() { return DDI::Singleton::instance(); } private: RegistryMap registry_; diff --git a/DetectorDescription/Parser/src/DDLAlgorithm.cc b/DetectorDescription/Parser/src/DDLAlgorithm.cc index 70d79974635cf..8e4d98f498385 100644 --- a/DetectorDescription/Parser/src/DDLAlgorithm.cc +++ b/DetectorDescription/Parser/src/DDLAlgorithm.cc @@ -8,7 +8,7 @@ #include "DetectorDescription/Core/interface/DDTypes.h" #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDName.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLMap.h" #include "DetectorDescription/Parser/src/DDLVector.h" diff --git a/DetectorDescription/Parser/src/DDLBooleanSolid.cc b/DetectorDescription/Parser/src/DDLBooleanSolid.cc index 542dadd0b5005..6dac09d406ea2 100644 --- a/DetectorDescription/Parser/src/DDLBooleanSolid.cc +++ b/DetectorDescription/Parser/src/DDLBooleanSolid.cc @@ -3,7 +3,7 @@ #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDTransform.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLBox.cc b/DetectorDescription/Parser/src/DDLBox.cc index 83b5c70e5847b..ef2515a1a955c 100644 --- a/DetectorDescription/Parser/src/DDLBox.cc +++ b/DetectorDescription/Parser/src/DDLBox.cc @@ -5,7 +5,7 @@ #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" diff --git a/DetectorDescription/Parser/src/DDLCompositeMaterial.cc b/DetectorDescription/Parser/src/DDLCompositeMaterial.cc index d1635164692dd..6dde246836c6a 100644 --- a/DetectorDescription/Parser/src/DDLCompositeMaterial.cc +++ b/DetectorDescription/Parser/src/DDLCompositeMaterial.cc @@ -5,7 +5,7 @@ #include #include "DetectorDescription/Core/interface/DDMaterial.h" #include "DetectorDescription/Core/interface/DDName.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLMaterial.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLCone.cc b/DetectorDescription/Parser/src/DDLCone.cc index d9dcceee67e1f..68f8ea4b4f6a0 100644 --- a/DetectorDescription/Parser/src/DDLCone.cc +++ b/DetectorDescription/Parser/src/DDLCone.cc @@ -1,6 +1,6 @@ #include "DetectorDescription/Parser/src/DDLCone.h" #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLDivision.cc b/DetectorDescription/Parser/src/DDLDivision.cc index 5382352070eb4..01cddfa367827 100644 --- a/DetectorDescription/Parser/src/DDLDivision.cc +++ b/DetectorDescription/Parser/src/DDLDivision.cc @@ -10,7 +10,7 @@ #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDSolidShapes.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDDividedBox.h" #include "DetectorDescription/Parser/src/DDDividedCons.h" diff --git a/DetectorDescription/Parser/src/DDLElementaryMaterial.cc b/DetectorDescription/Parser/src/DDLElementaryMaterial.cc index 4863ec375eb09..046d491fa6685 100644 --- a/DetectorDescription/Parser/src/DDLElementaryMaterial.cc +++ b/DetectorDescription/Parser/src/DDLElementaryMaterial.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDMaterial.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLMaterial.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLEllipsoid.cc b/DetectorDescription/Parser/src/DDLEllipsoid.cc index 4febdf3e9b2ce..f1c75e27b74ff 100644 --- a/DetectorDescription/Parser/src/DDLEllipsoid.cc +++ b/DetectorDescription/Parser/src/DDLEllipsoid.cc @@ -1,6 +1,6 @@ #include "DetectorDescription/Parser/src/DDLEllipsoid.h" #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLEllipticalTube.cc b/DetectorDescription/Parser/src/DDLEllipticalTube.cc index 1f4292125ad1f..89b9f7fd28b97 100644 --- a/DetectorDescription/Parser/src/DDLEllipticalTube.cc +++ b/DetectorDescription/Parser/src/DDLEllipticalTube.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLMap.cc b/DetectorDescription/Parser/src/DDLMap.cc index 8d2ef8f92d8fe..eff356da3a16d 100644 --- a/DetectorDescription/Parser/src/DDLMap.cc +++ b/DetectorDescription/Parser/src/DDLMap.cc @@ -3,7 +3,7 @@ #include #include -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" class DDCompactView; diff --git a/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc b/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc index cbb6d1cb91004..d12bd796b3ff6 100644 --- a/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc +++ b/DetectorDescription/Parser/src/DDLMultiUnionSolid.cc @@ -3,7 +3,7 @@ #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDTransform.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLNumeric.cc b/DetectorDescription/Parser/src/DDLNumeric.cc index dc2c27d94d60c..225cf1f5db503 100644 --- a/DetectorDescription/Parser/src/DDLNumeric.cc +++ b/DetectorDescription/Parser/src/DDLNumeric.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDConstant.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLOrb.cc b/DetectorDescription/Parser/src/DDLOrb.cc index 116e47071068c..3831765d7e640 100644 --- a/DetectorDescription/Parser/src/DDLOrb.cc +++ b/DetectorDescription/Parser/src/DDLOrb.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLParallelepiped.cc b/DetectorDescription/Parser/src/DDLParallelepiped.cc index d8d47958992af..8d8b22adb3c3e 100644 --- a/DetectorDescription/Parser/src/DDLParallelepiped.cc +++ b/DetectorDescription/Parser/src/DDLParallelepiped.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLPgonGenerator.cc b/DetectorDescription/Parser/src/DDLPgonGenerator.cc index 2b53bf40dcb54..1843d476e23cd 100644 --- a/DetectorDescription/Parser/src/DDLPgonGenerator.cc +++ b/DetectorDescription/Parser/src/DDLPgonGenerator.cc @@ -6,7 +6,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLPolyGenerator.cc b/DetectorDescription/Parser/src/DDLPolyGenerator.cc index 6bd4f61b9a38f..842d14f50edd1 100644 --- a/DetectorDescription/Parser/src/DDLPolyGenerator.cc +++ b/DetectorDescription/Parser/src/DDLPolyGenerator.cc @@ -6,7 +6,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLPosPart.cc b/DetectorDescription/Parser/src/DDLPosPart.cc index a8c4e74ec6aee..d132382db1b90 100644 --- a/DetectorDescription/Parser/src/DDLPosPart.cc +++ b/DetectorDescription/Parser/src/DDLPosPart.cc @@ -9,7 +9,7 @@ #include "DetectorDescription/Core/interface/DDLogicalPart.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDTransform.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/DetectorDescription/Parser/src/DDLPseudoTrap.cc b/DetectorDescription/Parser/src/DDLPseudoTrap.cc index d62d9c3f7c3eb..2afbeb70a5fa8 100644 --- a/DetectorDescription/Parser/src/DDLPseudoTrap.cc +++ b/DetectorDescription/Parser/src/DDLPseudoTrap.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLRotationAndReflection.cc b/DetectorDescription/Parser/src/DDLRotationAndReflection.cc index 4b653500b644e..138bd1baf482d 100644 --- a/DetectorDescription/Parser/src/DDLRotationAndReflection.cc +++ b/DetectorDescription/Parser/src/DDLRotationAndReflection.cc @@ -10,7 +10,7 @@ #include "DetectorDescription/Core/interface/DDRotationMatrix.h" #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDTransform.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/DetectorDescription/Parser/src/DDLRotationByAxis.cc b/DetectorDescription/Parser/src/DDLRotationByAxis.cc index 2528166575ae6..05df471d8baa7 100644 --- a/DetectorDescription/Parser/src/DDLRotationByAxis.cc +++ b/DetectorDescription/Parser/src/DDLRotationByAxis.cc @@ -6,7 +6,7 @@ #include "DetectorDescription/Core/interface/DDName.h" #include "DetectorDescription/Core/interface/DDTransform.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/DetectorDescription/Parser/src/DDLSAX2ExpressionHandler.cc b/DetectorDescription/Parser/src/DDLSAX2ExpressionHandler.cc index e40d293e2d2d7..e30152b6fd153 100644 --- a/DetectorDescription/Parser/src/DDLSAX2ExpressionHandler.cc +++ b/DetectorDescription/Parser/src/DDLSAX2ExpressionHandler.cc @@ -1,5 +1,5 @@ #include "DetectorDescription/Parser/interface/DDLSAX2ExpressionHandler.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "Utilities/Xerces/interface/XercesStrUtils.h" #include diff --git a/DetectorDescription/Parser/src/DDLSpecPar.cc b/DetectorDescription/Parser/src/DDLSpecPar.cc index 2851d67502d93..88225fc80cb18 100644 --- a/DetectorDescription/Parser/src/DDLSpecPar.cc +++ b/DetectorDescription/Parser/src/DDLSpecPar.cc @@ -11,7 +11,7 @@ #include "DetectorDescription/Core/interface/DDValue.h" #include "DetectorDescription/Core/interface/DDValuePair.h" #include "DetectorDescription/Core/interface/DDsvalues.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" diff --git a/DetectorDescription/Parser/src/DDLSphere.cc b/DetectorDescription/Parser/src/DDLSphere.cc index 5923b7e6a870a..6a9e39821c772 100644 --- a/DetectorDescription/Parser/src/DDLSphere.cc +++ b/DetectorDescription/Parser/src/DDLSphere.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLTorus.cc b/DetectorDescription/Parser/src/DDLTorus.cc index 3d7787e2f2f4e..e1ceb8b852e46 100644 --- a/DetectorDescription/Parser/src/DDLTorus.cc +++ b/DetectorDescription/Parser/src/DDLTorus.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLTrapezoid.cc b/DetectorDescription/Parser/src/DDLTrapezoid.cc index 81d38507ae5da..89a9da3dca1ca 100644 --- a/DetectorDescription/Parser/src/DDLTrapezoid.cc +++ b/DetectorDescription/Parser/src/DDLTrapezoid.cc @@ -4,7 +4,7 @@ #include #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLTubs.cc b/DetectorDescription/Parser/src/DDLTubs.cc index 64325e8b70053..92bb39ae7cf05 100644 --- a/DetectorDescription/Parser/src/DDLTubs.cc +++ b/DetectorDescription/Parser/src/DDLTubs.cc @@ -6,7 +6,7 @@ #include "CLHEP/Units/GlobalSystemOfUnits.h" #include "CLHEP/Units/SystemOfUnits.h" #include "DetectorDescription/Core/interface/DDSolid.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDLSolid.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" diff --git a/DetectorDescription/Parser/src/DDLVector.cc b/DetectorDescription/Parser/src/DDLVector.cc index b913c91285b23..2e01092487772 100644 --- a/DetectorDescription/Parser/src/DDLVector.cc +++ b/DetectorDescription/Parser/src/DDLVector.cc @@ -7,7 +7,7 @@ #include "DetectorDescription/Core/interface/DDStrVector.h" #include "DetectorDescription/Core/interface/DDVector.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLElementRegistry.h" #include "DetectorDescription/Parser/src/DDXMLElement.h" #include "boost/spirit/include/classic.hpp" diff --git a/DetectorDescription/RegressionTest/BuildFile.xml b/DetectorDescription/RegressionTest/BuildFile.xml index be2f5fd16ff3b..28de8d2a0c9e0 100644 --- a/DetectorDescription/RegressionTest/BuildFile.xml +++ b/DetectorDescription/RegressionTest/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/DetectorDescription/RegressionTest/bin/BuildFile.xml b/DetectorDescription/RegressionTest/bin/BuildFile.xml index fac3bf0179621..f9171cfc62a9d 100644 --- a/DetectorDescription/RegressionTest/bin/BuildFile.xml +++ b/DetectorDescription/RegressionTest/bin/BuildFile.xml @@ -1,6 +1,5 @@ - diff --git a/DetectorDescription/RegressionTest/src/build.cc b/DetectorDescription/RegressionTest/src/build.cc index 5193e99706ccc..052c9090ca934 100644 --- a/DetectorDescription/RegressionTest/src/build.cc +++ b/DetectorDescription/RegressionTest/src/build.cc @@ -16,8 +16,7 @@ #include "DetectorDescription/Core/interface/DDRoot.h" #include "DetectorDescription/Core/interface/DDSolid.h" #include "DetectorDescription/Core/interface/DDTransform.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" -#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "DetectorDescription/Parser/interface/DDLParser.h" #include "DetectorDescription/Parser/interface/FIPConfiguration.h" #include "FWCore/Utilities/interface/Exception.h" @@ -41,7 +40,7 @@ File elements.xml: Material(elem) Oxygen */ void regressionTest_setup() { - ClhepEvaluator & eval = ExprEvalSingleton::instance(); + ClhepEvaluator & eval = DDI::Singleton::instance(); string ns = "setup"; // current namespace faking the filename 'setup.xml' @@ -122,7 +121,7 @@ void regressionTest_first( ) { cout << "main::about to set configuration" << endl; - ClhepEvaluator & eval = ExprEvalSingleton::instance(); + ClhepEvaluator & eval = DDI::Singleton::instance(); string ns("first"); DDSolid support = DDSolidFactory::box(DDName("support",ns), eval.eval(ns,"[setup:corner]/4."), diff --git a/DetectorDescription/RegressionTest/test/BuildFile.xml b/DetectorDescription/RegressionTest/test/BuildFile.xml index 1970762f112b2..51dd2df5030f5 100644 --- a/DetectorDescription/RegressionTest/test/BuildFile.xml +++ b/DetectorDescription/RegressionTest/test/BuildFile.xml @@ -73,7 +73,6 @@ - diff --git a/DetectorDescription/RegressionTest/test/tutorial.cc b/DetectorDescription/RegressionTest/test/tutorial.cc index a99917694ba7d..bfe4abfeb1ad1 100644 --- a/DetectorDescription/RegressionTest/test/tutorial.cc +++ b/DetectorDescription/RegressionTest/test/tutorial.cc @@ -36,8 +36,7 @@ #include "DetectorDescription/Core/interface/DDValue.h" #include "DetectorDescription/Core/interface/DDsvalues.h" #include "DetectorDescription/Core/interface/adjgraph.h" -#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h" -#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" +#include "DetectorDescription/Core/interface/ClhepEvaluator.h" #include "FWCore/Utilities/interface/Exception.h" #include "Math/GenVector/Cartesian3D.h" #include "Math/GenVector/DisplacementVector3D.h" @@ -371,7 +370,7 @@ void tutorial() double dv = 0.; try { - dv = ExprEvalSingleton::instance().eval("",v); + dv = DDI::Singleton::instance().eval("",v); } catch (const cms::Exception & e) { dv = 0; diff --git a/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc b/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc index 1b4c752fa2420..59d07aaca8070 100644 --- a/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc +++ b/Geometry/CaloEventSetup/interface/CaloGeometryLoader.icc @@ -23,7 +23,6 @@ #include "DetectorDescription/Core/interface/DDScope.h" #include "DetectorDescription/Core/interface/DDFilter.h" #include "DetectorDescription/Core/interface/DDFilteredView.h" -#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h" #include "CLHEP/Units/GlobalSystemOfUnits.h" diff --git a/Geometry/EcalTestBeam/plugins/BuildFile.xml b/Geometry/EcalTestBeam/plugins/BuildFile.xml index a8e44d1a3c69c..91ffde7dbd117 100644 --- a/Geometry/EcalTestBeam/plugins/BuildFile.xml +++ b/Geometry/EcalTestBeam/plugins/BuildFile.xml @@ -1,6 +1,5 @@ -