From ae22a0d472e4fa02aa68f3c27382e2a182a504f7 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 9 Feb 2024 18:06:04 -0500
Subject: [PATCH 1/2] definitions.xml: ECal -> Ecal, HCal -> Hcal for ID fields

---
 compact/definitions.xml                     | 35 ++++++++++++---------
 compact/ecal/backward_PbWO4.xml             |  2 +-
 compact/ecal/backward_hybrid.xml            |  2 +-
 compact/ecal/barrel_interlayers.xml         |  4 +--
 compact/ecal/barrel_sciglass.xml            |  2 +-
 compact/ecal/forward_homogeneous.xml        |  2 +-
 compact/ecal/forward_insert_homogeneous.xml |  2 +-
 compact/ecal/forward_scfi.xml               |  2 +-
 compact/hcal/backward.xml                   |  2 +-
 compact/hcal/barrel_gdml.xml                |  2 +-
 compact/hcal/forward_insert.xml             |  2 +-
 11 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/compact/definitions.xml b/compact/definitions.xml
index 9cca86c2f..95e23d345 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -166,7 +166,7 @@ The unused IDs below are saved for future use.
     <documentation>
       #### (100-109) Electromagnetic Calorimeter
 
-      ECal     subsystem  ID:  100
+      Ecal     subsystem  ID:  100
       Barrel   subassembly ID: 101
       EndcapP  subassembly ID: 102
       EndcapN  subassembly ID: 103
@@ -176,30 +176,37 @@ The unused IDs below are saved for future use.
       Unused IDs: 107-109
 
     </documentation>
-    <constant name="ECalSubAssembly_ID"   value="100"/>
-    <constant name="ECalBarrel_ID"        value="101"/>
-    <constant name="ECalEndcapP_ID"       value="102"/>
-    <constant name="ECalEndcapN_ID"       value="103"/>
-    <constant name="CrystalEndcap_ID"     value="104"/>
-    <constant name="ECalBarrel2_ID"       value="105"/>
-    <constant name="ECalEndcapPInsert_ID" value="106"/>
+    <constant name="ECalSubAssembly_ID"   value="100"/><!-- UNUSED -->
+    <constant name="ECalBarrel_ID"        value="101"/><!-- DEPRECATED -->
+    <constant name="EcalBarrel_ID"        value="101"/>
+    <constant name="ECalEndcapP_ID"       value="102"/><!-- DEPRECATED -->
+    <constant name="EcalEndcapP_ID"       value="102"/>
+    <constant name="ECalEndcapN_ID"       value="103"/><!-- DEPRECATED -->
+    <constant name="EcalEndcapN_ID"       value="103"/>
+    <constant name="CrystalEndcap_ID"     value="104"/><!-- UNUSED -->
+    <constant name="ECalBarrel2_ID"       value="105"/><!-- DEPRECATED -->
+    <constant name="EcalBarrel2_ID"       value="105"/>
+    <constant name="ECalEndcapPInsert_ID" value="106"/><!-- DEPRECATED -->
+    <constant name="EcalEndcapPInsert_ID" value="106"/>
 
     <documentation>
       #### (110-119) Hadronic Calorimeter
 
-      - HCal     subsystem  ID:  110
+      - Hcal     subsystem  ID:  110
       - Barrel   subassembly ID: 111
       - EndcapP  subassembly ID: 112
       - EndcapN  subassembly ID: 113
 
       - Unused IDs: 117-119
     </documentation>
-    <constant name="HCalSubAssembly_ID" value="110"/>
-    <constant name="HCalBarrel_ID"      value="111"/>
-    <constant name="HCalEndcapP_ID"     value="112"/>
-    <constant name="HCalEndcapN_ID"     value="113"/>
+    <constant name="HCalSubAssembly_ID" value="110"/><!-- UNUSED -->
+    <constant name="HCalBarrel_ID"      value="111"/><!-- DEPRECATED -->
+    <constant name="HcalBarrel_ID"      value="111"/>
+    <constant name="HCalEndcapN_ID"     value="113"/><!-- UNUSED -->
+    <constant name="HcalEndcapN_ID"     value="113"/><!-- DEPRECATED -->
     <constant name="PassiveSteelRingEndcapP_ID" value="114"/>
-    <constant name="HCalEndcapPInsert_ID" value="115"/>
+    <constant name="HCalEndcapPInsert_ID" value="115"/><!-- DEPRECATED -->
+    <constant name="HcalEndcapPInsert_ID" value="115"/>
     <constant name="LFHCAL_ID"     value="116"/>
     <documentation>
       #### (120-129) (near) Forward reserved
diff --git a/compact/ecal/backward_PbWO4.xml b/compact/ecal/backward_PbWO4.xml
index fd17c2622..5db0b266b 100644
--- a/compact/ecal/backward_PbWO4.xml
+++ b/compact/ecal/backward_PbWO4.xml
@@ -64,7 +64,7 @@
       #### Backwards Endcap EM Calorimeter
     </documentation>
     <detector
-        id="ECalEndcapN_ID"
+        id="EcalEndcapN_ID"
         name="EcalEndcapN"
         type="epic_HomogeneousCalorimeter"
         readout="EcalEndcapNHits">
diff --git a/compact/ecal/backward_hybrid.xml b/compact/ecal/backward_hybrid.xml
index 8fe821296..bee40e905 100644
--- a/compact/ecal/backward_hybrid.xml
+++ b/compact/ecal/backward_hybrid.xml
@@ -58,7 +58,7 @@
 
       Backwards Endcap EM Calorimeter, placements generated by script
     </documentation>
-    <detector id="ECalEndcapN_ID" name="EcalEndcapN" type="epic_HybridCalorimeter" readout="EcalEndcapNHits">
+    <detector id="EcalEndcapN_ID" name="EcalEndcapN" type="epic_HybridCalorimeter" readout="EcalEndcapNHits">
       <position x="0" y="0" z="EcalEndcapN_z0"/>
       <rotation x="0" y="0" z="0"/>
     </detector>
diff --git a/compact/ecal/barrel_interlayers.xml b/compact/ecal/barrel_interlayers.xml
index 037f24248..2c15693ef 100644
--- a/compact/ecal/barrel_interlayers.xml
+++ b/compact/ecal/barrel_interlayers.xml
@@ -118,7 +118,7 @@
       Silicon (Astropix) readout layers for imaging 3d showers
     </comment>
     <detector
-      id="ECalBarrel_ID"
+      id="EcalBarrel_ID"
       name="EcalBarrelImaging"
       type="epic_EcalBarrelImaging"
       readout="EcalBarrelImagingHits"
@@ -227,7 +227,7 @@
       ---------------------------------------
     </comment>
     <detector
-      id="ECalBarrel2_ID"
+      id="EcalBarrel2_ID"
       name="EcalBarrelScFi"
       type="epic_EcalBarrelScFi"
       readout="EcalBarrelScFiHits"
diff --git a/compact/ecal/barrel_sciglass.xml b/compact/ecal/barrel_sciglass.xml
index d2adfb758..0e241f0e6 100644
--- a/compact/ecal/barrel_sciglass.xml
+++ b/compact/ecal/barrel_sciglass.xml
@@ -38,7 +38,7 @@
       An EM calorimeter with SciGlass blocks
     </comment>
 
-    <detector id="ECalBarrel_ID" name="EcalBarrelSciGlass" type="epic_EcalBarrelSciGlass" readout="EcalBarrelSciGlassHits" vis="det_vis" calorimeterType="EM_BARREL">
+    <detector id="EcalBarrel_ID" name="EcalBarrelSciGlass" type="epic_EcalBarrelSciGlass" readout="EcalBarrelSciGlassHits" vis="det_vis" calorimeterType="EM_BARREL">
       <comment>
         Global detector dimensions from https://eic.jlab.org/Geometry/Detector/Detector-20220624102507.html
       </comment>
diff --git a/compact/ecal/forward_homogeneous.xml b/compact/ecal/forward_homogeneous.xml
index f5f47e0db..e19b8faa6 100644
--- a/compact/ecal/forward_homogeneous.xml
+++ b/compact/ecal/forward_homogeneous.xml
@@ -53,7 +53,7 @@
 
       Insert shape is cut out from middle of detector
     </documentation>
-    <detector id="ECalEndcapP_ID"
+    <detector id="EcalEndcapP_ID"
       name="EcalEndcapP"
       type="epic_EndcapCalorimeterWithInsertCutout"
       readout="EcalEndcapPHits">
diff --git a/compact/ecal/forward_insert_homogeneous.xml b/compact/ecal/forward_insert_homogeneous.xml
index 5faeba7a7..301030816 100644
--- a/compact/ecal/forward_insert_homogeneous.xml
+++ b/compact/ecal/forward_insert_homogeneous.xml
@@ -52,7 +52,7 @@
 
     </documentation>
     <detector
-      id="ECalEndcapPInsert_ID"
+      id="EcalEndcapPInsert_ID"
       name="EcalEndcapPInsert"
       type="epic_InsertCalorimeter"
       vis="HcalEndcapInsertVis"
diff --git a/compact/ecal/forward_scfi.xml b/compact/ecal/forward_scfi.xml
index 7ba2a6db7..1a26aa97c 100644
--- a/compact/ecal/forward_scfi.xml
+++ b/compact/ecal/forward_scfi.xml
@@ -29,7 +29,7 @@
       ------------------------------------------
       An EM calorimeter with ScFi modules
     </comment>
-    <detector id="ECalEndcapP_ID"
+    <detector id="EcalEndcapP_ID"
       name="EcalEndcapP"
       type="epic_ScFiCalorimeter"
       vis="EcalEndcapVis"
diff --git a/compact/hcal/backward.xml b/compact/hcal/backward.xml
index 96d62d09c..2df2373cd 100644
--- a/compact/hcal/backward.xml
+++ b/compact/hcal/backward.xml
@@ -32,7 +32,7 @@
       ### Backwards (Negative Z) Endcap Hadronic Calorimeter
     </documentation>
     <detector
-      id="HCalEndcapN_ID"
+      id="HcalEndcapN_ID"
       name="HcalEndcapN"
       type="epic_PolyhedraEndcapCalorimeter2"
       readout="HcalEndcapNHits"
diff --git a/compact/hcal/barrel_gdml.xml b/compact/hcal/barrel_gdml.xml
index be67327a6..26cb6b0a8 100644
--- a/compact/hcal/barrel_gdml.xml
+++ b/compact/hcal/barrel_gdml.xml
@@ -9,7 +9,7 @@
       ### Barrel Hadronic Calorimeter
       </documentation>
       <detector
-          id="HCalBarrel_ID"
+          id="HcalBarrel_ID"
           name="HcalBarrel"
           type="epic_HcalBarrelGDML"
           readout="HcalBarrelHits"
diff --git a/compact/hcal/forward_insert.xml b/compact/hcal/forward_insert.xml
index ba6712ca8..1c8037d44 100644
--- a/compact/hcal/forward_insert.xml
+++ b/compact/hcal/forward_insert.xml
@@ -68,7 +68,7 @@
 
     </documentation>
     <detector
-      id="HCalEndcapPInsert_ID"
+      id="HcalEndcapPInsert_ID"
       name="HcalEndcapPInsert"
       type="epic_InsertCalorimeter"
       vis="HcalEndcapInsertVis"

From c6f3a50cc728184b14cd627d0eaa8bc224a51a59 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 12 Feb 2024 11:49:30 -0500
Subject: [PATCH 2/2] Update compact/definitions.xml

---
 compact/definitions.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compact/definitions.xml b/compact/definitions.xml
index 95e23d345..290a7793b 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -202,8 +202,8 @@ The unused IDs below are saved for future use.
     <constant name="HCalSubAssembly_ID" value="110"/><!-- UNUSED -->
     <constant name="HCalBarrel_ID"      value="111"/><!-- DEPRECATED -->
     <constant name="HcalBarrel_ID"      value="111"/>
-    <constant name="HCalEndcapN_ID"     value="113"/><!-- UNUSED -->
-    <constant name="HcalEndcapN_ID"     value="113"/><!-- DEPRECATED -->
+    <constant name="HCalEndcapN_ID"     value="113"/><!-- DEPRECATED -->
+    <constant name="HcalEndcapN_ID"     value="113"/>
     <constant name="PassiveSteelRingEndcapP_ID" value="114"/>
     <constant name="HCalEndcapPInsert_ID" value="115"/><!-- DEPRECATED -->
     <constant name="HcalEndcapPInsert_ID" value="115"/>