From e0c4d842c4b063854fcfc0864d875acc03a5d66a Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Tue, 3 Aug 2021 22:59:24 -0500
Subject: [PATCH] Removed "refdet" from detector types
- using "athena"
- this avoids any clashing with the reference detector libraries.
---
compact/ce_ecal.xml | 2 +-
compact/central_tracker.xml | 8 ++++----
compact/ci_ecal.xml | 2 +-
compact/gem_tracker_endcap.xml | 4 ++--
compact/hcal.xml | 4 ++--
compact/helmholtz.xml | 2 +-
compact/mm_tracker_barrel.xml | 2 +-
compact/rwell_tracker_barrel.xml | 2 +-
compact/solenoid.xml | 2 +-
compact/tof_endcap.xml | 4 ++--
compact/vertex_tracker.xml | 4 ++--
src/BarrelTrackerWithFrame_geo.cpp | 1 -
src/CylinderTrackerBarrel_geo.cpp | 6 +++---
src/PolyhedraEndcapCalorimeter2_geo.cpp | 2 +-
src/TrapEndcapTracker_geo.cpp | 4 ++--
src/ref_SolenoidCoil_geo.cpp | 2 +-
16 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/compact/ce_ecal.xml b/compact/ce_ecal.xml
index 35b7ba0e..02807118 100644
--- a/compact/ce_ecal.xml
+++ b/compact/ce_ecal.xml
@@ -33,7 +33,7 @@
</comment>
<detector id="ECalEndcapN_ID"
name="EcalEndcapN"
- type="refdet_PolyhedraEndcapCalorimeter2"
+ type="athena_PolyhedraEndcapCalorimeter2"
reflect="true"
readout="EcalEndcapHits"
vis="EcalEndcapVis"
diff --git a/compact/central_tracker.xml b/compact/central_tracker.xml
index 2ad03ac9..aa1e1822 100644
--- a/compact/central_tracker.xml
+++ b/compact/central_tracker.xml
@@ -185,7 +185,7 @@
<detector
id="TrackerEndcapP_Inner_ID"
name="TrackerEndcapP_Inner"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits"
vis="AnlRed"
reflect="false">
@@ -210,7 +210,7 @@
<detector
id="TrackerEndcapN_Inner_ID"
name="TrackerEndcapN_Inner"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits"
vis="AnlRed"
reflect="true">
@@ -306,7 +306,7 @@
<detector
id="TrackerEndcapP_Outer_ID"
name="TrackerEndcapP_Outer"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits"
vis="AnlRed"
reflect="false">
@@ -363,7 +363,7 @@
<detector
id="TrackerEndcapN_Outer_ID"
name="TrackerEndcapN_Outer"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="TrackerEndcapHits"
vis="AnlRed"
reflect="true">
diff --git a/compact/ci_ecal.xml b/compact/ci_ecal.xml
index 5ea301e7..443207b2 100644
--- a/compact/ci_ecal.xml
+++ b/compact/ci_ecal.xml
@@ -26,7 +26,7 @@
<detector id="ECalEndcapP_ID"
name="EcalEndcapP"
reflect="false"
- type="refdet_PolyhedraEndcapCalorimeter2"
+ type="athena_PolyhedraEndcapCalorimeter2"
readout="EcalEndcapPHits"
vis="EcalEndcapVis"
calorimeterType="EM_ENDCAP" >
diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml
index be111c0f..029e11bd 100644
--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -73,7 +73,7 @@
<detector
id="GEMTrackerEndcap_ID"
name="GEMTrackerEndcap"
- type="refdet_GEMTrackerEndcap"
+ type="athena_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
vis="AnlRed"
reflect="false">
@@ -148,7 +148,7 @@
<detector
id="GEMTrackerEndcapN_ID"
name="GEMTrackerEndcapN"
- type="refdet_GEMTrackerEndcap"
+ type="athena_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
vis="AnlRed"
reflect="true">
diff --git a/compact/hcal.xml b/compact/hcal.xml
index 3ad63262..45fde3cf 100644
--- a/compact/hcal.xml
+++ b/compact/hcal.xml
@@ -44,7 +44,7 @@
<detector
id="HCalEndcapP_ID"
name="HcalEndcapP"
- type="refdet_PolyhedraEndcapCalorimeter2"
+ type="athena_PolyhedraEndcapCalorimeter2"
readout="HcalHadronEndcapHits"
vis="HcalEndcapVis"
calorimeterType="HAD_ENDCAP"
@@ -64,7 +64,7 @@
<detector
id="HCalEndcapN_ID"
name="HcalEndcapN"
- type="refdet_PolyhedraEndcapCalorimeter2"
+ type="athena_PolyhedraEndcapCalorimeter2"
readout="HcalElectronEndcapHits"
vis="HcalEndcapVis"
calorimeterType="HAD_ENDCAP" reflect="true">
diff --git a/compact/helmholtz.xml b/compact/helmholtz.xml
index d09f469e..c04f0142 100644
--- a/compact/helmholtz.xml
+++ b/compact/helmholtz.xml
@@ -122,7 +122,7 @@
<detector
id="Solenoid_ID"
name="SolenoidCoilBarrel"
- type="refdet_SolenoidCoil"
+ type="athena_SolenoidCoil"
insideTrackingVolume="false">
<position x="0" y="0" z="Solenoid_offset"/>
<layer id="1"
diff --git a/compact/mm_tracker_barrel.xml b/compact/mm_tracker_barrel.xml
index 6d562902..5430055e 100644
--- a/compact/mm_tracker_barrel.xml
+++ b/compact/mm_tracker_barrel.xml
@@ -26,7 +26,7 @@
</display>
<detectors>
- <detector id="MMTrackerBarrel_ID" name="MMTrackerBarrel" type="refdet_MMTrackerBarrel" readout="MMTrackerBarrelHits">
+ <detector id="MMTrackerBarrel_ID" name="MMTrackerBarrel" type="athena_MMTrackerBarrel" readout="MMTrackerBarrelHits">
<module name="Module1" vis="AnlGold">
<module_envelope
rmin="TrackerBarrel_rmax"
diff --git a/compact/rwell_tracker_barrel.xml b/compact/rwell_tracker_barrel.xml
index 3239fd2f..63fd624b 100644
--- a/compact/rwell_tracker_barrel.xml
+++ b/compact/rwell_tracker_barrel.xml
@@ -63,7 +63,7 @@
</display>
<detectors>
- <detector id="RWellTrackerBarrel_ID" name="RWellTrackerBarrel" type="refdet_RWellTrackerBarrel" readout="RWellTrackerBarrelHits">
+ <detector id="RWellTrackerBarrel_ID" name="RWellTrackerBarrel" type="athena_RWellTrackerBarrel" readout="RWellTrackerBarrelHits">
<module name="Module1" vis="GreenVis">
<module_envelope
diff --git a/compact/solenoid.xml b/compact/solenoid.xml
index bd0ca903..ff4fdf9c 100644
--- a/compact/solenoid.xml
+++ b/compact/solenoid.xml
@@ -118,7 +118,7 @@
<detector
id="Solenoid_ID"
name="SolenoidCoilBarrel"
- type="refdet_SolenoidCoil"
+ type="athena_SolenoidCoil"
insideTrackingVolume="false">
<position x="0" y="0" z="Solenoid_offset"/>
<layer id="1"
diff --git a/compact/tof_endcap.xml b/compact/tof_endcap.xml
index af4ea84c..540b04f4 100644
--- a/compact/tof_endcap.xml
+++ b/compact/tof_endcap.xml
@@ -48,7 +48,7 @@
<detector
id="ForwardTOF_ID"
name="ForwardTOF"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="TOFEndcapHits"
vis="TOFVis"
reflect="false">
@@ -89,7 +89,7 @@
<detector
id="BackwardTOF_ID"
name="BackwardTOF"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="TOFEndcapHits"
vis="TOFVis"
reflect="true">
diff --git a/compact/vertex_tracker.xml b/compact/vertex_tracker.xml
index e83a0535..d9485adb 100644
--- a/compact/vertex_tracker.xml
+++ b/compact/vertex_tracker.xml
@@ -126,7 +126,7 @@
<detector
id="VertexEndcapP_ID"
name="VertexEndcapP"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="VertexEndcapHits"
vis="AnlRed"
reflect="false">
@@ -152,7 +152,7 @@
<detector
id="VertexEndcapN_ID"
name="VertexEndcapN"
- type="refdet_TrapEndcapTracker"
+ type="athena_TrapEndcapTracker"
readout="VertexEndcapHits"
vis="AnlRed"
reflect="true">
diff --git a/src/BarrelTrackerWithFrame_geo.cpp b/src/BarrelTrackerWithFrame_geo.cpp
index 71d5d9eb..ac673ebc 100644
--- a/src/BarrelTrackerWithFrame_geo.cpp
+++ b/src/BarrelTrackerWithFrame_geo.cpp
@@ -301,4 +301,3 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
DECLARE_DETELEMENT(BarrelTrackerWithFrame, create_detector)
DECLARE_DETELEMENT(athena_VertexBarrel, create_detector)
DECLARE_DETELEMENT(athena_TrackerBarrel, create_detector)
-DECLARE_DETELEMENT(refdet_SiVertexBarrel, create_detector)
diff --git a/src/CylinderTrackerBarrel_geo.cpp b/src/CylinderTrackerBarrel_geo.cpp
index be2f1199..8c643ada 100644
--- a/src/CylinderTrackerBarrel_geo.cpp
+++ b/src/CylinderTrackerBarrel_geo.cpp
@@ -194,6 +194,6 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
}
// clang-format off
-DECLARE_DETELEMENT(refdet_CylinderTrackerBarrel, create_detector)
-DECLARE_DETELEMENT(refdet_MMTrackerBarrel, create_detector)
-DECLARE_DETELEMENT(refdet_RWellTrackerBarrel, create_detector)
+DECLARE_DETELEMENT(athena_CylinderTrackerBarrel, create_detector)
+DECLARE_DETELEMENT(athena_MMTrackerBarrel, create_detector)
+DECLARE_DETELEMENT(athena_RWellTrackerBarrel, create_detector)
diff --git a/src/PolyhedraEndcapCalorimeter2_geo.cpp b/src/PolyhedraEndcapCalorimeter2_geo.cpp
index e7e26887..bce953c3 100644
--- a/src/PolyhedraEndcapCalorimeter2_geo.cpp
+++ b/src/PolyhedraEndcapCalorimeter2_geo.cpp
@@ -128,4 +128,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
}
// clang-format off
-DECLARE_DETELEMENT(refdet_PolyhedraEndcapCalorimeter2, create_detector)
+DECLARE_DETELEMENT(athena_PolyhedraEndcapCalorimeter2, create_detector)
diff --git a/src/TrapEndcapTracker_geo.cpp b/src/TrapEndcapTracker_geo.cpp
index d3cbe1af..a71bac11 100644
--- a/src/TrapEndcapTracker_geo.cpp
+++ b/src/TrapEndcapTracker_geo.cpp
@@ -219,5 +219,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(athena_TrapEndcapTracker, create_detector)
+DECLARE_DETELEMENT(athena_GEMTrackerEndcap, create_detector)
diff --git a/src/ref_SolenoidCoil_geo.cpp b/src/ref_SolenoidCoil_geo.cpp
index 91b94a2b..e43c9522 100644
--- a/src/ref_SolenoidCoil_geo.cpp
+++ b/src/ref_SolenoidCoil_geo.cpp
@@ -89,4 +89,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
return sdet;
}
-DECLARE_DETELEMENT(refdet_SolenoidCoil,create_detector)
+DECLARE_DETELEMENT(athena_SolenoidCoil,create_detector)
--
GitLab