From 24f2ba2f0968608706033509c5e6336a01b72a35 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Wed, 10 Feb 2016 18:12:38 +0000
Subject: [PATCH] Remove detector constructor ambiguity for BoxSegment
---
examples/AlignDet/compact/compact.xml | 4 ++--
examples/AlignDet/src/BoxDetector_geo.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/AlignDet/compact/compact.xml b/examples/AlignDet/compact/compact.xml
index baf4250f8..60009b3a3 100644
--- a/examples/AlignDet/compact/compact.xml
+++ b/examples/AlignDet/compact/compact.xml
@@ -45,14 +45,14 @@
<detectors>
<comment>Boxes</comment>
- <detector id="1" name="B1" type="BoxSegment" vis="B1_vis">
+ <detector id="1" name="B1" type="AlignmentBoxSegment" vis="B1_vis">
<comment>Horizontal box</comment>
<material name="Steel235"/>
<box x="20" y="0.1" z="5"/>
<position x="20" y="10" z="10"/>
<rotation x="1" y="0" z="0"/>
</detector>
- <detector id="2" name="B2" type="BoxSegment" vis="B2_vis">
+ <detector id="2" name="B2" type="AlignmentBoxSegment" vis="B2_vis">
<comment>Vertical box</comment>
<material name="Steel235"/>
<box x="0.1" y="20" z="5"/>
diff --git a/examples/AlignDet/src/BoxDetector_geo.cpp b/examples/AlignDet/src/BoxDetector_geo.cpp
index 0afc8cbb4..de1471001 100644
--- a/examples/AlignDet/src/BoxDetector_geo.cpp
+++ b/examples/AlignDet/src/BoxDetector_geo.cpp
@@ -31,4 +31,4 @@ static Ref_t create_element(LCDD& lcdd, xml_h e, Ref_t) {
}
// first argument is the type from the xml file
-DECLARE_DETELEMENT(BoxSegment,create_element)
+DECLARE_DETELEMENT(AlignmentBoxSegment,create_element)
--
GitLab