From a434aebeb23966bdc4c5f033f8d860f089ef493e Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Fri, 21 May 2021 02:24:40 -0500
Subject: [PATCH] modified: compact/gem_tracker_endcap.xml
modified: src/TrapEndcapTracker_geo.cpp
---
compact/gem_tracker_endcap.xml | 4 ++--
src/TrapEndcapTracker_geo.cpp | 12 +++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml
index bff14a0..289e8ca 100644
--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -74,7 +74,7 @@
<detector
id="GEMTrackerEndcap_ID"
name="GEMTrackerEndcap"
- type="refdet_GEMTrackerEndcap"
+ type="MyGEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
vis="BlueVis"
reflect="false">
@@ -124,7 +124,7 @@
<detector
id="GEMTrackerEndcapN_ID"
name="GEMTrackerEndcapN"
- type="refdet_GEMTrackerEndcap"
+ type="MyGEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
vis="RedVis"
reflect="true">
diff --git a/src/TrapEndcapTracker_geo.cpp b/src/TrapEndcapTracker_geo.cpp
index e7071df..a37cb4a 100644
--- a/src/TrapEndcapTracker_geo.cpp
+++ b/src/TrapEndcapTracker_geo.cpp
@@ -68,7 +68,13 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
string c_name = _toString(c_id, "component%d");
Volume c_vol(c_name, Trapezoid(comp_x1, comp_x2, c_thick / 2e0, c_thick / 2e0, comp_height), c_mat);
- c_vol.setVisAttributes(description.visAttributes(c.visStr()));
+ // use the module vis attributes if not set for component.
+ auto comp_vis = x_mod.visStr();
+ if(( c.visStr().size() >0 ) ) {
+ comp_vis = c.visStr();
+ }
+
+ c_vol.setVisAttributes(description.visAttributes(comp_vis));
pv = m_volume.placeVolume(c_vol, Position(0, posY + c_thick / 2, 0));
if (c.isSensitive()) {
sdet.check(n_sensor > 2, "SiTrackerEndcap2::fromCompact: " + c_name + " Max of 2 modules allowed!");
@@ -141,5 +147,5 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
}
// clang-format off
-DECLARE_DETELEMENT(refdet_TrapEndcapTracker, create_detector)
-DECLARE_DETELEMENT(refdet_GEMTrackerEndcap, create_detector)
+DECLARE_DETELEMENT(TrapEndcapTracker, create_detector)
+DECLARE_DETELEMENT(MyGEMTrackerEndcap, create_detector)
--
GitLab