diff --git a/compact/ce_ecal.xml b/compact/ce_ecal.xml
index 35b7ba0e6f4db72a7e2540a139f49790859ea59b..02807118021201c13761feab670cddef1595f778 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 2ad03ac9ab8e4c880097ccc9890b7f070a3dba05..aa1e18222067cc57bd787bbf2dd83ec16a19e79d 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 5ea301e796b724b85e1d242ecbf03e9df063b799..443207b2b69a4141ae69a5577d3dc56ad447cacb 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 be111c0f29e9f0b3875b42a2051506f11f26a828..029e11bd843761d8aaadbb2d62463dfd46c851b8 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 3ad63262997be0747713d283e4076e8d91139894..45fde3cf578862004fadc35da2ea4d58887c1cdd 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 d09f469eb45e9e2ff16e358cd4247097d5d604de..c04f0142759d6806b583bd827e27dc0b3dac908f 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 6d56290213b293ff8e77798486c45ff327a83c15..5430055e4795f06e35ce28336db2e7773a94675a 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 3239fd2fffc9cdb9ea45e143925227290b72ca82..63fd624ba7091cac880b77987eec193a6b331458 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 bd0ca90313f0de279480d29a16e87befd32735c9..ff4fdf9c128b43e3b3f6fa27b7d66f01e7ad88d0 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 af4ea84c4ab6aec29bd9d80a866224e0d97861a8..540b04f483d38f586b849977d3f58fc615de9495 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 e83a053525485654d0d2e3830eaecb82d7ff9f0a..d9485adbb36a7dece29fab833167690a8aa47764 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 71d5d9eb134f8333417232172a9b1e55b77ac67d..ac673ebcb55037d81a18d9e50f23d2030b5f3af7 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 be2f1199e098a99e197d8e35f812bef0bc94064b..8c643ada6204f3da2206214567077b7298a1b6b2 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 e7e268875a9210d58142e32120781bf41c675f0f..bce953c34c7f90780bbd8565eed566314fb754c6 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 d3cbe1af2b525d4bcb23f66e514b33da1fdbed7d..a71bac117d1796e258c527d38f6506abb3d69462 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 91b94a2b9b6968390ad837b96de5fbca32bd5586..e43c952224e868d435508d1d1e5c353cb8512c38 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)