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

Tracker/MTD geometry: clean Geometric(Timing)Det dependence on DDD #30276

Merged
merged 4 commits into from Jun 22, 2020
Merged

Tracker/MTD geometry: clean Geometric(Timing)Det dependence on DDD #30276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
744994f
Remove DDD from expanded view from Geometric(Timing)Det
fabiocos Jun 16, 2020
9625039
Remove not functional code cut-and-pasted from tracker
fabiocos Jun 17, 2020
3660c0b
scram b code-format
fabiocos Jun 17, 2020
edfa24c
Remove residual GeometricTimingDetExtra use
fabiocos Jun 17, 2020
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: 2 additions & 0 deletions Alignment/OfflineValidation/plugins/TrackerGeometryCompare.cc
View file
Open in desktop
Expand Up @@ -53,6 +53,8 @@
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
#include "Geometry/Records/interface/TrackerTopologyRcd.h"

#include "DetectorDescription/Core/interface/DDCompactView.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please explain this file? It is not migrated. Is it part of GeometricTimingDetExtras?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cvuosalo in the case of this file, as well as the RecoTracker/TkDetLayers/src/Phase2EndcapRingBuilder.cc it is a matter of nested include dependencies, that now are exposed by the removal of the DDExpandedView from GeometricDet. The compilation fails as soon as you update that class.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My confusion results from two different versions of this file being included in #29905 and this PR. #29905 has the migrated version. If #29905 is merged first, this PR will probably need to be rebased.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cvuosalo up to the release manager decide which PR is mature for integration first. In case I will rebase mine on that one, not a big issue. BTW, I see that @ianna has already made this addition in #29905


#include <iostream>
#include <fstream>
#include <sstream>
Expand Down
11 changes: 11 additions & 0 deletions DetectorDescription/DDCMS/interface/DDRotationMatrix.h
View file
Open in desktop
@@ -0,0 +1,11 @@
#ifndef DetectorDescription_DDCMS_DDRotationMatrix_h
#define DetectorDescription_DDCMS_DDRotationMatrix_h

#include <Math/Rotation3D.h>
#include <Math/AxisAngle.h>

//! A DDRotationMatrix is currently implemented with a ROOT Rotation3D
using DDRotationMatrix = ROOT::Math::Rotation3D;
using DDAxisAngle = ROOT::Math::AxisAngle;

#endif
9 changes: 9 additions & 0 deletions DetectorDescription/DDCMS/interface/DDTranslation.h
View file
Open in desktop
@@ -0,0 +1,9 @@
#ifndef DetectorDescription_DDCMS_DDTranslation_h
#define DetectorDescription_DDCMS_DDTranslation_h
#include <Math/Vector3D.h>

//! A DD Translation is currently implemented with Root Vector3D
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > DD3Vector;
typedef ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> > DDTranslation;

#endif
11 changes: 0 additions & 11 deletions Geometry/MTDNumberingBuilder/bin/BuildFile.xml
View file
Open in desktop

This file was deleted.

214 changes: 0 additions & 214 deletions Geometry/MTDNumberingBuilder/bin/stubs/GeometricTimingDetLoader.cc
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions Geometry/MTDNumberingBuilder/bin/stubs/GeometricTimingDetLoader.h
View file
Open in desktop

This file was deleted.

Binary file removed Geometry/MTDNumberingBuilder/doc/GeometricDetBuilder.png
View file
Open in desktop
Binary file not shown.
25 changes: 0 additions & 25 deletions Geometry/MTDNumberingBuilder/interface/CmsMTDDebugNavigator.h
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions Geometry/MTDNumberingBuilder/interface/GeometricTimingDet.h
View file
Open in desktop
Expand Up @@ -2,11 +2,12 @@
#define Geometry_MTDNumberingBuilder_GeometricTimingDet_H

#include "CondFormats/GeometryObjects/interface/PGeometricTimingDet.h"
#include "DetectorDescription/Core/interface/DDExpandedView.h"
#include "DetectorDescription/Core/interface/DDSolidShapes.h"
#include "DataFormats/GeometrySurface/interface/Surface.h"
#include "DataFormats/GeometrySurface/interface/Bounds.h"
#include "DataFormats/DetId/interface/DetId.h"
#include <Math/Rotation3D.h>
#include <Math/Vector3D.h>

#include <vector>
#include <memory>
Expand All @@ -27,18 +28,16 @@ namespace cms {

class GeometricTimingDet {
public:
using NavRange = DDExpandedView::NavRange;
using NavRange = std::pair<int const*, size_t>;
using ConstGeometricTimingDetContainer = std::vector<GeometricTimingDet const*>;
using GeometricTimingDetContainer = std::vector<GeometricTimingDet*>;
using RotationMatrix = ROOT::Math::Rotation3D;
using Translation = ROOT::Math::DisplacementVector3D<ROOT::Math::Cartesian3D<double> >;

#ifdef PoolAlloc
using GeoHistory = std::vector<DDExpandedNode, PoolAlloc<DDExpandedNode> >;
using nav_type = std::vector<int, PoolAlloc<int> >;
#else
using GeoHistory = std::vector<DDExpandedNode>;
using nav_type = DDExpandedView::nav_type;
using nav_type = std::vector<int>;
#endif

using Position = Surface::PositionType;
Expand Down