Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DD ExprAlgo Merge with Core #19106

Merged
merged 2 commits into from Jun 7, 2017
Merged

DD ExprAlgo Merge with Core #19106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf08d0
Merge Base to Core
ianna Jun 5, 2017
3ba21e2
Merge DD ExprAlgo to Core
ianna Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions Alignment/CocoaFit/src/CocoaDBMgr.cc
View file
Open in desktop
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion DetectorDescription/Algorithm/BuildFile.xml
View file
Open in desktop
@@ -1,4 +1,3 @@
<use name="DetectorDescription/Base"/>
<use name="DetectorDescription/Core"/>
<use name="FWCore/PluginManager"/>
<use name="clhep"/>
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Algorithm/interface/DDAlgorithm.h
View file
Open in desktop
@@ -1,7 +1,7 @@
#ifndef DD_ALGO_PLUGIN_DD_ALGORITHM_H
#define DD_ALGO_PLUGIN_DD_ALGORITHM_H

#include "DetectorDescription/Base/interface/DDTypes.h"
#include "DetectorDescription/Core/interface/DDTypes.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Algorithm/interface/DDAlgorithmHandler.h
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
#include <string>

#include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
#include "DetectorDescription/Base/interface/DDTypes.h"
#include "DetectorDescription/Core/interface/DDTypes.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"

class DDAlgorithm;
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Algorithm/plugins/DDAngular.cc
View file
Open in desktop
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions DetectorDescription/Algorithm/plugins/DDAngular.h
View file
Open in desktop
Expand Up @@ -6,9 +6,9 @@
#include <vector>

# include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
# include "DetectorDescription/Base/interface/DDRotationMatrix.h"
#include "DetectorDescription/Base/interface/DDTranslation.h"
# include "DetectorDescription/Base/interface/DDTypes.h"
# include "DetectorDescription/Core/interface/DDRotationMatrix.h"
#include "DetectorDescription/Core/interface/DDTranslation.h"
# include "DetectorDescription/Core/interface/DDTypes.h"

class DDCompactView;

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/Algorithm/plugins/DDLinear.cc
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Algorithm/plugins/DDLinear.h
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
#include <vector>

# include "DetectorDescription/Algorithm/interface/DDAlgorithm.h"
# include "DetectorDescription/Base/interface/DDTypes.h"
# include "DetectorDescription/Core/interface/DDTypes.h"

class DDCompactView;

Expand Down
4 changes: 0 additions & 4 deletions DetectorDescription/Base/BuildFile.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions DetectorDescription/Base/test/BuildFile.xml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions DetectorDescription/Core/BuildFile.xml
View file
Open in desktop
@@ -1,8 +1,7 @@
<use name="DetectorDescription/Base"/>
<use name="DetectorDescription/ExprAlgo"/>
<use name="FWCore/Utilities"/>
<use name="FWCore/MessageLogger"/>
<use name="boost"/>
<use name="clhep"/>
<use name="rootmath"/>
<export>
<lib name="1"/>
Expand Down
0 ...ption/ExprAlgo/interface/ClhepEvaluator.h → ...scription/Core/interface/ClhepEvaluator.h
View file
Open in desktop
File renamed without changes.
0 ...torDescription/Base/interface/DDAlgoPar.h → ...torDescription/Core/interface/DDAlgoPar.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDAxes.h
View file
Open in desktop
@@ -1,7 +1,7 @@
#ifndef DDAxes_h
#define DDAxes_h

#include "DetectorDescription/Base/interface/Singleton.h"
#include "DetectorDescription/Core/interface/Singleton.h"

#include <string>
#include <map>
Expand Down
6 changes: 3 additions & 3 deletions DetectorDescription/Core/interface/DDBase.h
View file
Open in desktop
Expand Up @@ -2,9 +2,9 @@
#define DDCore_DDBase_h

#include <utility>
#include "DetectorDescription/Base/interface/Singleton.h"
#include "DetectorDescription/Base/interface/Store.h"
#include "DetectorDescription/Base/interface/rep_type.h"
#include "DetectorDescription/Core/interface/Singleton.h"
#include "DetectorDescription/Core/interface/Store.h"
#include "DetectorDescription/Core/interface/rep_type.h"

template <class N, class C>
class DDBase
Expand Down
6 changes: 3 additions & 3 deletions DetectorDescription/Core/interface/DDCompactView.h
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@
#include <utility>
# include <vector>

#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
#include "DetectorDescription/Base/interface/DDTranslation.h"
#include "DetectorDescription/Base/interface/Store.h"
#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
#include "DetectorDescription/Core/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/Store.h"
# include "DetectorDescription/Core/interface/DDLogicalPart.h"
# include "DetectorDescription/Core/interface/DDPosData.h"
#include "DetectorDescription/Core/interface/DDTransform.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDCompactViewImpl.h
View file
Open in desktop
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDDivision.h
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@
#include <string>
#include <vector>

#include "DetectorDescription/Base/interface/Singleton.h"
#include "DetectorDescription/Core/interface/Singleton.h"
#include "DetectorDescription/Core/interface/DDAxes.h"
#include "DetectorDescription/Core/interface/DDBase.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/Core/interface/DDExpandedNode.h
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
#include <iosfwd>
#include <vector>

#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
#include "DetectorDescription/Base/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
#include "DetectorDescription/Core/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
#include "DetectorDescription/Core/interface/DDTransform.h"

Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/Core/interface/DDExpandedView.h
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@
#include <utility>
#include <vector>

#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
#include "DetectorDescription/Base/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
#include "DetectorDescription/Core/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/Core/interface/DDExpandedNode.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/Core/interface/DDFilteredView.h
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
#include <utility>
#include <vector>

#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
#include "DetectorDescription/Base/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
#include "DetectorDescription/Core/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDExpandedNode.h"
#include "DetectorDescription/Core/interface/DDExpandedView.h"
#include "DetectorDescription/Core/interface/DDFilter.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDLogicalPart.h
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
#include <utility>
#include <vector>

#include "DetectorDescription/Base/interface/Singleton.h"
#include "DetectorDescription/Core/interface/Singleton.h"
#include "DetectorDescription/Core/interface/DDBase.h"
#include "DetectorDescription/Core/interface/DDEnums.h"
#include "DetectorDescription/Core/interface/DDName.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDMap.h
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
#include <map>
#include <string>

#include "DetectorDescription/Base/interface/DDReadMapType.h"
#include "DetectorDescription/Core/interface/DDReadMapType.h"
#include "DetectorDescription/Core/interface/DDBase.h"
#include "DetectorDescription/Core/interface/DDName.h"

Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDPosData.h
View file
Open in desktop
Expand Up @@ -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
Expand Down
0 ...escription/Base/interface/DDReadMapType.h → ...escription/Core/interface/DDReadMapType.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDRegistry.h
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
#define DDD_DDRegistry_h

#include <map>
//#include "DetectorDescription/Base/interface/Singleton.h"
//#include "DetectorDescription/Core/interface/Singleton.h"
#include "DetectorDescription/Core/interface/DDName.h"

template <class T>
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDRoot.h
View file
Open in desktop
Expand Up @@ -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
/**
Expand Down
0 ...ription/Base/interface/DDRotationMatrix.h → ...ription/Core/interface/DDRotationMatrix.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDSolid.h
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
#include <iosfwd>
#include <vector>

#include "DetectorDescription/Base/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDTranslation.h"
#include "DetectorDescription/Core/interface/DDBase.h"
#include "DetectorDescription/Core/interface/DDName.h"
#include "DetectorDescription/Core/interface/DDSolidShapes.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/interface/DDTransform.h
View file
Open in desktop
Expand Up @@ -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;

Expand Down
0 ...escription/Base/interface/DDTranslation.h → ...escription/Core/interface/DDTranslation.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DetectorDescription/Base/interface/DDTypes.h → DetectorDescription/Core/interface/DDTypes.h
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
#include <string>
#include <vector>
#include <map>
#include "DetectorDescription/Base/interface/DDReadMapType.h"
#include "DetectorDescription/Core/interface/DDReadMapType.h"
#include <iosfwd>

//! corresponds to a collection of named doubles
Expand Down
0 DetectorDescription/Base/interface/DDutils.h → DetectorDescription/Core/interface/DDutils.h
View file
Open in desktop
File renamed without changes.
0 ...torDescription/Base/interface/Singleton.h → ...torDescription/Core/interface/Singleton.h
View file
Open in desktop
File renamed without changes.
0 ...rDescription/Base/interface/Singleton.icc → ...rDescription/Core/interface/Singleton.icc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DetectorDescription/Base/interface/Store.h → DetectorDescription/Core/interface/Store.h
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
#define DDI_Store_h

#include <map>
#include "DetectorDescription/Base/interface/rep_type.h"
#include "DetectorDescription/Core/interface/rep_type.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

//;
Expand Down
0 ...ctorDescription/Base/interface/rep_type.h → ...ctorDescription/Core/interface/rep_type.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/Boolean.h
View file
Open in desktop
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...escription/ExprAlgo/src/ClhepEvaluator.cc → ...torDescription/Core/src/ClhepEvaluator.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
#include <vector>

#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"

Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/DDCheckMaterials.cc
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
#include <utility>
#include <vector>

#include "DetectorDescription/Base/interface/Store.h"
#include "DetectorDescription/Core/interface/Store.h"
#include "DetectorDescription/Core/interface/DDBase.h"
#include "DetectorDescription/Core/interface/DDMaterial.h"
#include "DetectorDescription/Core/interface/DDName.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/DDCompactView.cc
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

#include <stdlib.h>

#include "DetectorDescription/Base/interface/DDRotationMatrix.h"
#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
#include "DetectorDescription/Core/interface/DDBase.h"
#include "DetectorDescription/Core/interface/DDCompactViewImpl.h"
#include "DetectorDescription/Core/interface/DDLogicalPart.h"
Expand Down
7 changes: 3 additions & 4 deletions DetectorDescription/Core/src/DDConstant.cc
View file
Open in desktop
Expand Up @@ -4,9 +4,8 @@
#include <utility>
#include <vector>

#include "DetectorDescription/Base/interface/Store.h"
#include "DetectorDescription/ExprAlgo/interface/ClhepEvaluator.h"
#include "DetectorDescription/ExprAlgo/interface/ExprEvalSingleton.h"
#include "DetectorDescription/Core/interface/Store.h"
#include "DetectorDescription/Core/interface/ClhepEvaluator.h"
#include "FWCore/Utilities/interface/Exception.h"

DDConstant::DDConstant() : DDBase<DDName,double*>() { }
Expand Down Expand Up @@ -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<ClhepEvaluator>::instance();
const auto& vars = eval.variables();
const auto& vals = eval.values();
if( vars.size() != vals.size()) {
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/DDDivision.cc
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

#include <ostream>

#include "DetectorDescription/Base/interface/Store.h"
#include "DetectorDescription/Core/interface/Store.h"
#include "Division.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/DDLogicalPart.cc
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

#include <ostream>

#include "DetectorDescription/Base/interface/Store.h"
#include "DetectorDescription/Core/interface/Store.h"
#include "DetectorDescription/Core/interface/DDMaterial.h"
#include "DetectorDescription/Core/interface/DDSolid.h"
#include "DetectorDescription/Core/src/LogicalPart.h"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/DDMap.cc
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

#include <utility>

#include "DetectorDescription/Base/interface/Store.h"
#include "DetectorDescription/Core/interface/Store.h"

DDMap::DDMap() : DDBase<DDName,dd_map_type*>() { }

Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/DDMaterial.cc
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion DetectorDescription/Core/src/DDName.cc
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
#include <stdlib.h>
#include <sstream>

#include "DetectorDescription/Base/interface/Singleton.h"
#include "DetectorDescription/Core/interface/Singleton.h"
#include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
#include "DetectorDescription/Core/interface/DDSplit.h"
#include "FWCore/Utilities/interface/Exception.h"
Expand Down
4 changes: 2 additions & 2 deletions DetectorDescription/Core/src/DDPartSelection.cc
View file
Open in desktop
@@ -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"
Expand Down Expand Up @@ -272,4 +272,4 @@ std::ostream & operator<<(std::ostream & os, const std::vector<DDPartSelection>
template class DDI::Singleton<DDSelLevelFtor>;
//template class DDI::Singleton<DDI::Store<DDName, DDSelLevelCollector> >;
template class DDI::Singleton<DDSelLevelCollector>;
#include <DetectorDescription/Base/interface/Singleton.icc>
#include <DetectorDescription/Core/interface/Singleton.icc>
2 changes: 1 addition & 1 deletion ...ctorDescription/Base/src/DDReadMapType.cc → ...ctorDescription/Core/src/DDReadMapType.cc
View file
Open in desktop
@@ -1,4 +1,4 @@
#include "DetectorDescription/Base/interface/DDReadMapType.h"
#include "DetectorDescription/Core/interface/DDReadMapType.h"
#include "FWCore/Utilities/interface/Exception.h"

namespace dddDetails {
Expand Down
6 changes: 3 additions & 3 deletions DetectorDescription/Core/src/DDRotation.cc
View file
Open in desktop
Expand Up @@ -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"
Expand Down