From 0c8754491e0ba05d2acb6e35fa2ba54e6b64192a Mon Sep 17 00:00:00 2001
From: Andrea Ciarma <andrea.ciarma@cern.ch>
Date: Wed, 3 Aug 2022 18:03:15 +0200
Subject: [PATCH] restoring Shapes.h and Shapes.cpp to original
---
DDCore/include/DD4hep/Shapes.h | 2 --
DDCore/src/Shapes.cpp | 6 ------
2 files changed, 8 deletions(-)
diff --git a/DDCore/include/DD4hep/Shapes.h b/DDCore/include/DD4hep/Shapes.h
index fa80fde1f..2faa1a276 100644
--- a/DDCore/include/DD4hep/Shapes.h
+++ b/DDCore/include/DD4hep/Shapes.h
@@ -1947,8 +1947,6 @@ namespace dd4hep {
UnionSolid(const Solid& shape1, const Solid& shape2, const Rotation3D& rot);
/// Constructor to create a new object. Placement by a generic transformation within the mother
UnionSolid(const Solid& shape1, const Solid& shape2, const Transform3D& pos);
- /// Constructor to create a new object. Placement by 2 generic transformations
- UnionSolid(const Solid& shape1, const Solid& shape2, const Transform3D& pos1, const Transform3D& pos2);
/// Constructor to create a new identified object. Position is identity, Rotation is identity-rotation!
UnionSolid(const std::string& name, const Solid& shape1, const Solid& shape2);
diff --git a/DDCore/src/Shapes.cpp b/DDCore/src/Shapes.cpp
index 00afc4c9e..ec2c84b58 100644
--- a/DDCore/src/Shapes.cpp
+++ b/DDCore/src/Shapes.cpp
@@ -942,12 +942,6 @@ UnionSolid::UnionSolid(const Solid& shape1, const Solid& shape2, const Transform
_assign(new TGeoCompositeShape("", uni), "", UNION_TAG, true);
}
-/// Constructor to be used when creating a new object. Placement by a generic transformation within the mother
-UnionSolid::UnionSolid(const Solid& shape1, const Solid& shape2, const Transform3D& trans1, const Transform3D& trans2) {
- TGeoUnion* uni = new TGeoUnion(shape1, shape2, detail::matrix::_transform(trans1), detail::matrix::_transform(trans2));
- _assign(new TGeoCompositeShape("", uni), "", UNION_TAG, true);
-}
-
/// Constructor to be used when creating a new object. Rotation is identity rotation
UnionSolid::UnionSolid(const Solid& shape1, const Solid& shape2, const Position& pos) {
TGeoUnion* uni = new TGeoUnion(shape1, shape2, detail::matrix::_identity(), detail::matrix::_translation(pos));
--
GitLab