From 50772ee250c13595bf23391d5c72e15fea85f9e1 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sun, 23 May 2021 21:43:25 -0500
Subject: [PATCH] modified: compact/far_forward_detectors.xml
renamed: src/SiVertexBarrel_geo.cpp -> src/BarrelTrackerWithFrame_geo.cpp
modified: src/CylinderTrackerBarrel_geo.cpp
---
compact/far_forward_detectors.xml | 2 +-
...SiVertexBarrel_geo.cpp => BarrelTrackerWithFrame_geo.cpp} | 5 ++++-
src/CylinderTrackerBarrel_geo.cpp | 4 ++++
3 files changed, 9 insertions(+), 2 deletions(-)
rename src/{SiVertexBarrel_geo.cpp => BarrelTrackerWithFrame_geo.cpp} (98%)
diff --git a/compact/far_forward_detectors.xml b/compact/far_forward_detectors.xml
index c21c0b55..6ceac44c 100644
--- a/compact/far_forward_detectors.xml
+++ b/compact/far_forward_detectors.xml
@@ -15,7 +15,7 @@
</display>
- <include ref="compact/ffi_ZDC.xml" />
+ <include ref="ffi_ZDC.xml" />
<detectors>
</detectors>
diff --git a/src/SiVertexBarrel_geo.cpp b/src/BarrelTrackerWithFrame_geo.cpp
similarity index 98%
rename from src/SiVertexBarrel_geo.cpp
rename to src/BarrelTrackerWithFrame_geo.cpp
index 3a0927d2..b28c1f88 100644
--- a/src/SiVertexBarrel_geo.cpp
+++ b/src/BarrelTrackerWithFrame_geo.cpp
@@ -142,7 +142,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
Volume module_env = volumes[m_nam];
DetElement lay_elt(sdet, _toString(x_layer.id(), "layer%d"), lay_id);
Placements& sensVols = sensitives[m_nam];
-
+
// the local coordinate systems of modules in dd4hep and acts differ
// see http://acts.web.cern.ch/ACTS/latest/doc/group__DD4hepPlugins.html
Acts::ActsExtension* layerExtension = new Acts::ActsExtension();
@@ -220,4 +220,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
//@}
// clang-format off
+DECLARE_DETELEMENT(BarrelTrackerWithFrame, create_detector)
+DECLARE_DETELEMENT(athena_SiVertexTracker, create_detector)
+DECLARE_DETELEMENT(athena_SiBarrelTracker, create_detector)
DECLARE_DETELEMENT(refdet_SiVertexBarrel, create_detector)
diff --git a/src/CylinderTrackerBarrel_geo.cpp b/src/CylinderTrackerBarrel_geo.cpp
index fb5d0799..e2bfdf5c 100644
--- a/src/CylinderTrackerBarrel_geo.cpp
+++ b/src/CylinderTrackerBarrel_geo.cpp
@@ -11,6 +11,10 @@ using namespace std;
using namespace dd4hep;
using namespace dd4hep::detail;
+/** A barrel tracker with a module that is curved (not flat).
+ *
+ *
+ */
static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector sens)
{
typedef vector<PlacedVolume> Placements;
--
GitLab