From 9231b5c38465d2b64411a9675f02d30f63d0f4e1 Mon Sep 17 00:00:00 2001
From: ruse-traveler <derek.murphy.anderson@protonmail.com>
Date: Fri, 14 Nov 2025 16:03:28 -0500
Subject: [PATCH 1/6] Set ecal flags

---
 compact/ecal/backward_PbWO4.xml             | 1 +
 compact/ecal/forward_homogeneous.xml        | 1 +
 compact/ecal/forward_insert_homogeneous.xml | 1 +
 compact/ecal/forward_scfi.xml               | 1 +
 4 files changed, 4 insertions(+)

diff --git a/compact/ecal/backward_PbWO4.xml b/compact/ecal/backward_PbWO4.xml
index 7a0508f784..4aefdb478f 100644
--- a/compact/ecal/backward_PbWO4.xml
+++ b/compact/ecal/backward_PbWO4.xml
@@ -73,6 +73,7 @@
         name="EcalEndcapN"
         type="epic_HomogeneousCalorimeter"
         readout="EcalEndcapNHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="0" y="0" z="-(EcalEndcapN_zmin + EcalEndcapN_envelope_length / 2.)"/>
       <rotation x="0" y="0." z="0"/>
       <placements>
diff --git a/compact/ecal/forward_homogeneous.xml b/compact/ecal/forward_homogeneous.xml
index e19b8faa69..9e4ff37f09 100644
--- a/compact/ecal/forward_homogeneous.xml
+++ b/compact/ecal/forward_homogeneous.xml
@@ -57,6 +57,7 @@
       name="EcalEndcapP"
       type="epic_EndcapCalorimeterWithInsertCutout"
       readout="EcalEndcapPHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="0" y="0" z="EcalEndcapP_zmin"/>
       <dimensions
         rmin="EcalEndcapP_rmin"
diff --git a/compact/ecal/forward_insert_homogeneous.xml b/compact/ecal/forward_insert_homogeneous.xml
index 3b950b6235..a88fb30ef3 100644
--- a/compact/ecal/forward_insert_homogeneous.xml
+++ b/compact/ecal/forward_insert_homogeneous.xml
@@ -58,6 +58,7 @@
       vis="HcalEndcapInsertVis"
       readout="EcalEndcapPInsertHits"
     >
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="EcalEndcapPInsert_xposition" y="EcalEndcapPInsert_yposition" z="EcalEndcapPInsert_zmin"/>
       <dimensions
         x="EcalEndcapPInsert_width"
diff --git a/compact/ecal/forward_scfi.xml b/compact/ecal/forward_scfi.xml
index 1a26aa97c5..6fd8c15ac9 100644
--- a/compact/ecal/forward_scfi.xml
+++ b/compact/ecal/forward_scfi.xml
@@ -34,6 +34,7 @@
       type="epic_ScFiCalorimeter"
       vis="EcalEndcapVis"
       readout="EcalEndcapPHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="0" y="0" z="EcalEndcapP_zmin + EcalEndcapP_length/2."/>
       <dimensions rmin="EcalEndcapP_rmin" rmax="EcalEndcapP_rmax" length="EcalEndcapP_length"/>
       <module sizex="25*mm" sizey="25*mm" sizez="170*mm" material="TungstenDens24" vis="EcalEndcapBlockVis">

From 98e4338336daf34a01df2e414b6335be2bfa10bc Mon Sep 17 00:00:00 2001
From: ruse-traveler <derek.murphy.anderson@protonmail.com>
Date: Fri, 14 Nov 2025 16:13:49 -0500
Subject: [PATCH 2/6] Set hcal flags

---
 compact/hcal/backward_template.xml | 1 +
 compact/hcal/barrel_gdml.xml       | 1 +
 compact/hcal/lfhcal.xml            | 1 +
 3 files changed, 3 insertions(+)

diff --git a/compact/hcal/backward_template.xml b/compact/hcal/backward_template.xml
index 090eb32cdc..3eb39e646d 100644
--- a/compact/hcal/backward_template.xml
+++ b/compact/hcal/backward_template.xml
@@ -40,6 +40,7 @@
       calorimeterType="HAD_ENDCAP"
       allSensitive="HcalEndcapN_allSensitive"
       >
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
       <position x="0" y="0" z="0"/>
       <dimensions
         numsides="HcalEndcapN_CaloSides"
diff --git a/compact/hcal/barrel_gdml.xml b/compact/hcal/barrel_gdml.xml
index fbb694f7e9..9e308edb7d 100644
--- a/compact/hcal/barrel_gdml.xml
+++ b/compact/hcal/barrel_gdml.xml
@@ -22,6 +22,7 @@
           z1="HcalBarrel_length1"
           z2="HcalBarrel_length2"
           calorimeterType="HAD_BARREL">
+        <type_flags type="DetType_CALORIMETER + DetType_BARREL + DetType_HADRONIC"/>
         <sec_gdmlfile file="gdml/barrel_hcal_steel_sector_nocombs.gdml" url="https://github.com/eic/epic-data/raw/c1ef9dca1781047fe9485eec6c0f986ec7d27f41/barrel_HCAL_gdml/barrel_hcal_steel_sector_nocombs.gdml" cache="$DETECTOR_PATH:/opt/detector" material="Steel1020"/>
         <csec_gdmlfile file="gdml/barrel_hcal_steel_chimneysector_nocombs.gdml" url="https://github.com/eic/epic-data/raw/c1ef9dca1781047fe9485eec6c0f986ec7d27f41/barrel_HCAL_gdml/barrel_hcal_steel_chimneysector_nocombs.gdml" cache="$DETECTOR_PATH:/opt/detector" material="Steel1020"/>
         <er_gdmlfile file="gdml/barrel_hcal_steel_endring.gdml" url="https://github.com/eic/epic-data/raw/c1ef9dca1781047fe9485eec6c0f986ec7d27f41/barrel_HCAL_gdml/barrel_hcal_steel_endring.gdml" cache="$DETECTOR_PATH:/opt/detector" material="Steel1020"/>
diff --git a/compact/hcal/lfhcal.xml b/compact/hcal/lfhcal.xml
index cbf4e83be5..6ca051b5d1 100644
--- a/compact/hcal/lfhcal.xml
+++ b/compact/hcal/lfhcal.xml
@@ -91,6 +91,7 @@
       renderComponents="0"
       allSensitive="0"
       >
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
 
       <position x="0" y="0" z="LFHCAL_zmin"/>
       <dimensions

From 56e50e2d2fefee974921f74d7cad221447dc76b7 Mon Sep 17 00:00:00 2001
From: ruse-traveler <derek.murphy.anderson@protonmail.com>
Date: Fri, 14 Nov 2025 16:25:48 -0500
Subject: [PATCH 3/6] Set pid flags

---
 compact/pid/dirc.xml   | 1 +
 compact/pid/drich.xml  | 2 +-
 compact/pid/pfrich.xml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/compact/pid/dirc.xml b/compact/pid/dirc.xml
index 5217be6d15..5581a1bc42 100644
--- a/compact/pid/dirc.xml
+++ b/compact/pid/dirc.xml
@@ -96,6 +96,7 @@
 
   <detectors>
     <detector id="BarrelDIRC_ID" name="cb_DIRC" type="epic_DIRC" readout="DIRCBarHits" vis="DIRCTube">
+      <type_flag type="DetType_CHERENKOV + DetType_Barrel"/>
       <dimensions rmin="DIRCBar_center - DIRCBar_height/2" rmax="DIRCBar_center + DIRCBar_height/2" length="DIRC_length"/>
       <position x="0" y="0" z="DIRC_offset"/>
       <module name="DIRCBox" repeat="DIRCBox_count" width="DIRCPrism_width + 1*mm" height="DIRCPrism_height*2" length="DIRCBarAssm_length + 550*mm" vis="DIRCBox">
diff --git a/compact/pid/drich.xml b/compact/pid/drich.xml
index cde823bfac..12aebbb42a 100644
--- a/compact/pid/drich.xml
+++ b/compact/pid/drich.xml
@@ -76,7 +76,7 @@
   vis_vessel="DRICH_vessel_vis"
   vis_gas="DRICH_gas_vis"
   >
-
+  <type_flags type="DetType_CHERENKOV + DetType_ENDCAP"/>
 
 <!-- /detectors/detector/dimensions -->
 <documentation level="10">
diff --git a/compact/pid/pfrich.xml b/compact/pid/pfrich.xml
index 3652d0c469..4f9909cb60 100644
--- a/compact/pid/pfrich.xml
+++ b/compact/pid/pfrich.xml
@@ -103,6 +103,7 @@
   vis_vessel="PFRICH_vessel_vis"
   vis_gas="DRICH_gas_vis"
   >
+  <type_flags type="DetType_CHERENKOV + DetType_ENDCAP"/>
 
     <parent name="/world_volume"/>
 

From 308ab4e4f221c0c46b0db8ee8b50da364a7e25c6 Mon Sep 17 00:00:00 2001
From: ruse-traveler <derek.murphy.anderson@protonmail.com>
Date: Fri, 14 Nov 2025 17:11:23 -0500
Subject: [PATCH 4/6] Set fb flags

---
 compact/far_backward/beamline_electron.xml           | 1 +
 compact/far_backward/beamline_extension_electron.xml | 1 +
 compact/far_backward/beamline_extension_hadron.xml   | 1 +
 compact/far_backward/beamline_tracking.xml           | 2 ++
 compact/far_backward/taggers.xml                     | 1 +
 5 files changed, 6 insertions(+)

diff --git a/compact/far_backward/beamline_electron.xml b/compact/far_backward/beamline_electron.xml
index df98e767c8..3270f17388 100644
--- a/compact/far_backward/beamline_electron.xml
+++ b/compact/far_backward/beamline_electron.xml
@@ -13,6 +13,7 @@
     type="BeamPipeChain"
     wall_thickness="1 * mm"
     vis="BeamPipeVis">
+      <type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
       <pipe id="0" name="Pipe_to_Q1eR"
         xcenter="0" zcenter="(Center_Beampipe_End + Q1eR_CenterPosition+Q1eR_Length/2)/2"
         length="Center_Beampipe_End - (Q1eR_CenterPosition+Q1eR_Length/2)" theta="0"
diff --git a/compact/far_backward/beamline_extension_electron.xml b/compact/far_backward/beamline_extension_electron.xml
index d3542c26da..3fd1ffd157 100644
--- a/compact/far_backward/beamline_extension_electron.xml
+++ b/compact/far_backward/beamline_extension_electron.xml
@@ -15,6 +15,7 @@
     name="Pipe_Q3eR_to_B7eR"
     type="BeamPipeChain"
     wall_thickness="2*mm">
+      <type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
       <pipe id="0" name="Pipe_in_Q3eR"
         xcenter="Q3eR_XPosition" zcenter="Q3eR_CenterPosition"
         length="Q3eR_Length" theta="Q3eR_Theta"
diff --git a/compact/far_backward/beamline_extension_hadron.xml b/compact/far_backward/beamline_extension_hadron.xml
index adea244ea8..32b8fad6e0 100644
--- a/compact/far_backward/beamline_extension_hadron.xml
+++ b/compact/far_backward/beamline_extension_hadron.xml
@@ -48,6 +48,7 @@
     name="Pipe_Q1APR_to_B1PR"
     type="BeamPipeChain"
     wall_thickness="2*mm">
+      <type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
       <pipe id="0" name="Pipe_to_Q1APR"
         xcenter="(Hadron_Beampipe_End*sin(CrossingAngle)+Q1APR_StartX)/2." zcenter="(Hadron_Beampipe_End*cos(CrossingAngle)+Q1APR_StartZ)/2."
         length="sqrt((Hadron_Beampipe_End*sin(CrossingAngle)-Q1APR_StartX)^2+(Hadron_Beampipe_End*cos(CrossingAngle)-Q1APR_StartZ)^2)" theta="CrossingAngle"
diff --git a/compact/far_backward/beamline_tracking.xml b/compact/far_backward/beamline_tracking.xml
index 650c3a949c..4bd0477b3d 100644
--- a/compact/far_backward/beamline_tracking.xml
+++ b/compact/far_backward/beamline_tracking.xml
@@ -8,6 +8,8 @@
     name="Pipe_tracker"
     readout="BackwardsBeamlineHits">
 
+        <type_flags type="DetType_TRACKER + DetType_ENDCAP + DetType_BEAMPIPE"/>
+
         <slice
         pipe_id="0"
         grandmother="Pipe_Q1eR_to_B2BeR"
diff --git a/compact/far_backward/taggers.xml b/compact/far_backward/taggers.xml
index 370f1fb617..d2003b700c 100644
--- a/compact/far_backward/taggers.xml
+++ b/compact/far_backward/taggers.xml
@@ -12,6 +12,7 @@
   <detectors>
 
     <detector id="TaggerTracker_ID" name="BackwardsTaggerStation" type="BackwardsTagger" readout="TaggerTrackerHits">
+      <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
 
       <comment> Tagger stations </comment>
       <module id="1" name="Tagger1">

From f4771a9ce3bdd346d6216ea6e837c495df663351 Mon Sep 17 00:00:00 2001
From: ruse-traveler <derek.murphy.anderson@protonmail.com>
Date: Fri, 14 Nov 2025 17:14:42 -0500
Subject: [PATCH 5/6] Set lumi flags

---
 compact/far_backward/lumi/spec_ScFi_cal.xml | 1 +
 compact/far_backward/lumi/spec_homo_cal.xml | 1 +
 compact/far_backward/lumi/spec_tracker.xml  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/compact/far_backward/lumi/spec_ScFi_cal.xml b/compact/far_backward/lumi/spec_ScFi_cal.xml
index 7636499852..949200f4c4 100644
--- a/compact/far_backward/lumi/spec_ScFi_cal.xml
+++ b/compact/far_backward/lumi/spec_ScFi_cal.xml
@@ -5,6 +5,7 @@
 
         <detectors>
                 <detector id="LumiSpecCAL_ID" name="LumiSpecCAL" type="EcalLumiSpecWScFi" vis="LumiSpecCAL_LayerVis" readout="EcalLumiSpecHits" sizeXY="LumiSpecCAL_DXY" sizeZ="LumiSpecCAL_DZ" nmod_perlayer="LumiSpecCAL_XYLayers" nlayer="LumiSpecCAL_ZLayers" >
+                        <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
                         <position x="0.0*cm"  y="0.0*cm"  z="0.0*cm"/>
                         <rotation x="0.0*rad" y="0.0*rad" z="0.0*rad"/>
 
diff --git a/compact/far_backward/lumi/spec_homo_cal.xml b/compact/far_backward/lumi/spec_homo_cal.xml
index 218916cb18..e42f95b2c6 100644
--- a/compact/far_backward/lumi/spec_homo_cal.xml
+++ b/compact/far_backward/lumi/spec_homo_cal.xml
@@ -5,6 +5,7 @@
 
   <detectors>
     <detector id="LumiSpecCAL_ID" name="LumiSpecCAL" type="LumiSpecHomoCAL" vis="FFPreVis" readout="LumiSpecCALHits" sizeXY="LumiSpecCAL_DXY">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <module sizex="LumiSpecCALTower_DXY" sizey="LumiSpecCALTower_DXY" sizez="LumiSpecCALTower_DZ" frameSize="0.0*mm" material="PbWO4" vis="FFPreModuleVis"/>
       <sector id="0">
         <position x="0.0*cm" y="LumiSpecCAL_Y" z="LumiSpecCAL_Z"/>
diff --git a/compact/far_backward/lumi/spec_tracker.xml b/compact/far_backward/lumi/spec_tracker.xml
index ae74759b37..c6dbaa7048 100644
--- a/compact/far_backward/lumi/spec_tracker.xml
+++ b/compact/far_backward/lumi/spec_tracker.xml
@@ -28,6 +28,7 @@
     materialCu="Copper"
     thicknessSi="LumiSpecTracker_Si_DZ/2.0"
     thicknessCu="LumiSpecTracker_Cu_DZ/2.0">
+    <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
     <module id="0">
         <sector id="0" name="Top1">
           <position   x="0" y="Pos_Y1" z="Pos_Z1"/>

From 82f1ed8e3407cce9df0f555989389bfcd633df70 Mon Sep 17 00:00:00 2001
From: ruse-traveler <derek.murphy.anderson@protonmail.com>
Date: Fri, 14 Nov 2025 17:41:30 -0500
Subject: [PATCH 6/6] Set ff flags

---
 compact/far_forward/B0_ECal.xml                 | 1 +
 compact/far_forward/B0_preshower.xml            | 1 +
 compact/far_forward/ZDC_1stSilicon.xml          | 1 +
 compact/far_forward/ZDC_Crystal.xml             | 1 +
 compact/far_forward/ZDC_Crystal_LYSO.xml        | 1 +
 compact/far_forward/ZDC_Ecal.xml                | 1 +
 compact/far_forward/ZDC_Ecal_WSciFi.xml         | 1 +
 compact/far_forward/ZDC_Hcal.xml                | 1 +
 compact/far_forward/ZDC_PbScinti.xml            | 1 +
 compact/far_forward/ZDC_PbSi.xml                | 1 +
 compact/far_forward/ZDC_SiPMonTile.xml          | 1 +
 compact/far_forward/ZDC_WSi.xml                 | 1 +
 compact/far_forward/beam_orbit_tracker.xml      | 2 ++
 compact/far_forward/beampipe_hadron_B0.xml      | 1 +
 compact/far_forward/electron_beamline.xml       | 1 +
 compact/far_forward/offM_tracker.xml            | 1 +
 compact/far_forward/roman_pots_eRD24_design.xml | 2 ++
 17 files changed, 19 insertions(+)

diff --git a/compact/far_forward/B0_ECal.xml b/compact/far_forward/B0_ECal.xml
index 57e7cf1358..c2db1f9468 100644
--- a/compact/far_forward/B0_ECal.xml
+++ b/compact/far_forward/B0_ECal.xml
@@ -28,6 +28,7 @@
         name="B0ECal"
         type="B0_ECAL"
         readout="B0ECalHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="B0ECal_xcenter" y="0" z="B0ECal_zcenter"/>
       <rotation x="0" y="180*deg+B0ECal_rotation" z="0"/>
       <placements>
diff --git a/compact/far_forward/B0_preshower.xml b/compact/far_forward/B0_preshower.xml
index 7930124287..fa26df8572 100644
--- a/compact/far_forward/B0_preshower.xml
+++ b/compact/far_forward/B0_preshower.xml
@@ -47,6 +47,7 @@
       readout="B0PreshowerHits"
       vis="FFPreVis"
       reflect="false">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="B0PreshowerCenter_xpos" y="0" z="B0PreshowerCenter_zpos"/>
       <rotation x="0*rad" y="B0Preshower_rotation" z="0*rad"/>
       <module name="Module1" vis="FFPreModuleVis">
diff --git a/compact/far_forward/ZDC_1stSilicon.xml b/compact/far_forward/ZDC_1stSilicon.xml
index ca993551c3..2342ae4332 100644
--- a/compact/far_forward/ZDC_1stSilicon.xml
+++ b/compact/far_forward/ZDC_1stSilicon.xml
@@ -22,6 +22,7 @@
         type="ZDC_ImagingCal"
         vis="ZDC_SiliconPix_Vis"
         readout="ZDC_SiliconPix_Hits">
+      <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
       <position x="ZDC_1stSilicon_x_pos"         y="ZDC_1stSilicon_y_pos"         z="ZDC_1stSilicon_z_pos"/>
       <rotation x="ZDC_1stSilicon_rotateX_angle" y="ZDC_1stSilicon_rotateY_angle" z="ZDC_1stSilicon_rotateZ_angle"/>
       <dimensions x="ZDC_1stSilicon_x" y="ZDC_1stSilicon_y" z="ZDC_1stSilicon_z"/>
diff --git a/compact/far_forward/ZDC_Crystal.xml b/compact/far_forward/ZDC_Crystal.xml
index 6e7f55abb8..0d6d87d555 100644
--- a/compact/far_forward/ZDC_Crystal.xml
+++ b/compact/far_forward/ZDC_Crystal.xml
@@ -29,6 +29,7 @@
         type="ZDC_Crystal"
         vis="ZDC_Crystal_Vis"
         readout="ZDCEcalHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="ZDC_Crystal_x_pos"         y="ZDC_Crystal_y_pos"         z="ZDC_Crystal_z_pos"/>
       <rotation x="ZDC_Crystal_rotateX_angle" y="ZDC_Crystal_rotateY_angle" z="ZDC_Crystal_rotateZ_angle"/>
       <dimensions x="ZDC_Crystal_nx * (ZDC_Crystal_cell_width + ZDC_Crystal_frame_thickness) + ZDC_Crystal_frame_thickness"
diff --git a/compact/far_forward/ZDC_Crystal_LYSO.xml b/compact/far_forward/ZDC_Crystal_LYSO.xml
index 7e9b7d35f9..9a423bcba6 100644
--- a/compact/far_forward/ZDC_Crystal_LYSO.xml
+++ b/compact/far_forward/ZDC_Crystal_LYSO.xml
@@ -42,6 +42,7 @@
         type="ZDC_Crystal"
         vis="ZDC_Crystal_Vis"
         readout="EcalFarForwardZDCHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="ZDC_Crystal_x_pos"         y="ZDC_Crystal_y_pos"         z="ZDC_Crystal_z_pos"/>
       <rotation x="ZDC_Crystal_rotateX_angle" y="ZDC_Crystal_rotateY_angle" z="ZDC_Crystal_rotateZ_angle"/>
       <dimensions x="ZDC_Crystal_nx * (ZDC_Crystal_cell_width + ZDC_Crystal_frame_thickness) + ZDC_Crystal_frame_thickness"
diff --git a/compact/far_forward/ZDC_Ecal.xml b/compact/far_forward/ZDC_Ecal.xml
index 37e54c0762..123ac08de2 100644
--- a/compact/far_forward/ZDC_Ecal.xml
+++ b/compact/far_forward/ZDC_Ecal.xml
@@ -10,6 +10,7 @@
   </comment>
 
   <detectors>
+    <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
     <detector id="ZDCEcal_ID" name="ZDCEcal" type="ZDC_Sampling" readout="ZDCEcal_Hits" vis="ZDCEcal_Vis">
       <position x="ZDCEcal_x_pos" y="ZDCEcal_y_pos" z="ZDCEcal_z_pos"/>
       <rotation x="ZDCEcal_rotateX_angle" y="ZDCEcal_rotateY_angle" z="ZDCEcal_rotateZ_angle"/>
diff --git a/compact/far_forward/ZDC_Ecal_WSciFi.xml b/compact/far_forward/ZDC_Ecal_WSciFi.xml
index ad78e02951..fb53277f0f 100644
--- a/compact/far_forward/ZDC_Ecal_WSciFi.xml
+++ b/compact/far_forward/ZDC_Ecal_WSciFi.xml
@@ -22,6 +22,7 @@
       type="ZDCEcalScFiCalorimeter"
       vis="ZDC_Ecal_Vis"
       readout="ZDCEcalHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="ZDCEcal_x_pos" y="ZDCEcal_y_pos" z="ZDCEcal_z_pos"/>
       <rotation x="ZDCEcal_rotateX_angle" y="ZDCEcal_rotateY_angle" z="ZDCEcal_rotateZ_angle"/>
       <dimensions x="ZDCEcal_width" z="ZDCEcal_length"/>
diff --git a/compact/far_forward/ZDC_Hcal.xml b/compact/far_forward/ZDC_Hcal.xml
index 9eae28fe7c..1386e0247a 100644
--- a/compact/far_forward/ZDC_Hcal.xml
+++ b/compact/far_forward/ZDC_Hcal.xml
@@ -10,6 +10,7 @@
   </comment>
 
   <detectors>
+    <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
     <detector id="ZDCHcal_ID" name="ZDCHcal" type="ZDC_Sampling" readout="ZDCHcalHits" vis="ZDC_Hcal_Vis">
       <position x="ZDCHcal_x_pos" y="ZDCHcal_y_pos" z="ZDCHcal_z_pos"/>
       <rotation x="ZDCHcal_rotateX_angle" y="ZDCHcal_rotateY_angle" z="ZDCHcal_rotateZ_angle"/>
diff --git a/compact/far_forward/ZDC_PbScinti.xml b/compact/far_forward/ZDC_PbScinti.xml
index 65c20be9c8..e7a6b0eda0 100644
--- a/compact/far_forward/ZDC_PbScinti.xml
+++ b/compact/far_forward/ZDC_PbScinti.xml
@@ -24,6 +24,7 @@
         type="ZDC_SamplingCal"
         vis="ZDC_PbSci_Vis"
         readout="ZDCHcalHits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
       <position x="ZDC_PbSci_x_pos"         y="ZDC_PbSci_y_pos"         z="ZDC_PbSci_z_pos"/>
       <rotation x="ZDC_PbSci_rotateX_angle" y="ZDC_PbSci_rotateY_angle" z="ZDC_PbSci_rotateZ_angle"/>
       <dimensions x="ZDC_PbSci_x" y="ZDC_PbSci_y" z="ZDC_PbSci_z"/>
diff --git a/compact/far_forward/ZDC_PbSi.xml b/compact/far_forward/ZDC_PbSi.xml
index fa2bec6466..10eca6ca16 100644
--- a/compact/far_forward/ZDC_PbSi.xml
+++ b/compact/far_forward/ZDC_PbSi.xml
@@ -24,6 +24,7 @@
         type="ZDC_ImagingCal"
         vis="ZDC_PbSi_Vis"
         readout="ZDC_PbSi_Hits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
       <position x="ZDC_PbSi_x_pos"         y="ZDC_PbSi_y_pos"         z="ZDC_PbSi_z_pos"/>
       <rotation x="ZDC_PbSi_rotateX_angle" y="ZDC_PbSi_rotateY_angle" z="ZDC_PbSi_rotateZ_angle"/>
       <dimensions x="ZDC_PbSi_x" y="ZDC_PbSi_y" z="ZDC_PbSi_z"/>
diff --git a/compact/far_forward/ZDC_SiPMonTile.xml b/compact/far_forward/ZDC_SiPMonTile.xml
index 974fb35360..ca8fa1dc3e 100644
--- a/compact/far_forward/ZDC_SiPMonTile.xml
+++ b/compact/far_forward/ZDC_SiPMonTile.xml
@@ -77,6 +77,7 @@
       readout="HcalFarForwardZDCHits"
       vis="InvisibleWithDaughters"
     >
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_HADRONIC"/>
       <position x="HcalFarForwardZDC_SiPMonTile_x_pos"         y="HcalFarForwardZDC_SiPMonTile_y_pos"         z="HcalFarForwardZDC_SiPMonTile_z_pos"/>
       <rotation x="HcalFarForwardZDC_SiPMonTile_rotateX_angle" y="HcalFarForwardZDC_SiPMonTile_rotateY_angle" z="HcalFarForwardZDC_SiPMonTile_rotateZ_angle"/>
       <dimensions
diff --git a/compact/far_forward/ZDC_WSi.xml b/compact/far_forward/ZDC_WSi.xml
index 928f0de8d6..5bcb976760 100644
--- a/compact/far_forward/ZDC_WSi.xml
+++ b/compact/far_forward/ZDC_WSi.xml
@@ -29,6 +29,7 @@
         type="ZDC_ImagingCal"
         vis="ZDC_WSi_Vis"
         readout="ZDC_WSi_Hits">
+      <type_flags type="DetType_CALORIMETER + DetType_ENDCAP + DetType_ELECTROMAGNETIC"/>
       <position x="ZDC_WSi_x_pos"         y="ZDC_WSi_y_pos"         z="ZDC_WSi_z_pos"/>
       <rotation x="ZDC_WSi_rotateX_angle" y="ZDC_WSi_rotateY_angle" z="ZDC_WSi_rotateZ_angle"/>
       <dimensions x="ZDC_WSi_x" y="ZDC_WSi_y" z="ZDC_WSi_z"/>
diff --git a/compact/far_forward/beam_orbit_tracker.xml b/compact/far_forward/beam_orbit_tracker.xml
index 2231cbeacb..3aa3119710 100644
--- a/compact/far_forward/beam_orbit_tracker.xml
+++ b/compact/far_forward/beam_orbit_tracker.xml
@@ -20,6 +20,7 @@
       insideTrackingVolume="true"
       reflect="false"
       vis="RedVis">
+      <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
       <position x="-217.98*mm" y="0" z="8498.952*mm"/> <!-- end of B0apf + 1mm -->
       <rotation x="0*rad" y="-25.0*0.001*rad" z="0*rad"/>
       <module name="Module1" vis="AnlProcess_Blue">
@@ -41,6 +42,7 @@
       insideTrackingVolume="true"
       reflect="false"
       vis="RedVis">
+      <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
       <position x="-631.65*mm" y="0" z="22062.85*mm"/> <!-- end of B1apf + 1mm -->
       <rotation x="0*rad" y="-25.0*0.001*rad" z="0*rad"/>
       <module name="Module1" vis="AnlProcess_Blue">
diff --git a/compact/far_forward/beampipe_hadron_B0.xml b/compact/far_forward/beampipe_hadron_B0.xml
index 21501127d7..1f67a18d3b 100644
--- a/compact/far_forward/beampipe_hadron_B0.xml
+++ b/compact/far_forward/beampipe_hadron_B0.xml
@@ -11,6 +11,7 @@
   <detectors>
 
     <detector id="BeamPipeB0_ID" name="BeamPipeB0" type="forwardBeamPipeBrazil" vis="BeamPipeVis">
+      <type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
       <position x="-0.165*m" y="0*m" z="B0PF_CenterPosition" />
       <rotation x="0*rad" y="0*rad" z="0*rad" />
     </detector>
diff --git a/compact/far_forward/electron_beamline.xml b/compact/far_forward/electron_beamline.xml
index e4af388608..f4c33b209d 100644
--- a/compact/far_forward/electron_beamline.xml
+++ b/compact/far_forward/electron_beamline.xml
@@ -51,6 +51,7 @@
       type="BeamPipeChain"
       wall_thickness="Beampipe_cen_pos_Thickness">
 
+      <type_flags type="DetType_ENDCAP + DetType_BEAMPIPE"/>
       <pipe id="0" name="Pipe_FWD_electron"
         xcenter="0" zcenter="(Beampipe_fwd_pos_EndZ+Beampipe_cen_pos_EndZ)/2."
         length="Beampipe_fwd_pos_EndZ-Beampipe_cen_pos_EndZ" theta="0"
diff --git a/compact/far_forward/offM_tracker.xml b/compact/far_forward/offM_tracker.xml
index d2fe86676e..47b4681330 100644
--- a/compact/far_forward/offM_tracker.xml
+++ b/compact/far_forward/offM_tracker.xml
@@ -105,6 +105,7 @@
       readout="ForwardOffMTrackerHits"
       vis="FFTrackerVis"
       reflect="false">
+      <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
       <position x="-1032.0*mm" y="0" z="27020*mm"/>
       <rotation x="0*rad" y="-0.047*rad" z="0*rad"/>
       <module name="OMD4Mod1" vis="FFTrackerShieldedModuleVis">
diff --git a/compact/far_forward/roman_pots_eRD24_design.xml b/compact/far_forward/roman_pots_eRD24_design.xml
index fe51dae13f..73313288f7 100644
--- a/compact/far_forward/roman_pots_eRD24_design.xml
+++ b/compact/far_forward/roman_pots_eRD24_design.xml
@@ -74,6 +74,7 @@
                 type="ip6_ForwardRomanPot"
                 insideTrackingVolume="true"
                 reflect="false" vis="FFTrackerVis">
+            <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
             <position x="ForwardRomanPotStation1_xpos" y="0" z="ForwardRomanPotStation1_zpos" />
             <rotation x="0" y="ForwardRomanPotStation1_rotation" z="0" />
             <module name="ModuleRP1" vis="FFTrackerShieldedModuleVis" nx="1" ny="1" width="ForwardRomanPot_ModuleWidth" height="ForwardRomanPot_ModuleHeight">
@@ -161,6 +162,7 @@
                 insideTrackingVolume="true"
                 reflect="false"
                 vis="FFTrackerVis">
+            <type_flags type="DetType_TRACKER + DetType_ENDCAP"/>
             <position x="ForwardRomanPotStation2_xpos" y="0" z="ForwardRomanPotStation2_zpos" />
             <rotation x="0" y="ForwardRomanPotStation1_rotation" z="0" />
             <module name="ModuleRP2" vis="FFTrackerShieldedModuleVis" nx="1" ny="1" width="ForwardRomanPot_ModuleWidth" height="ForwardRomanPot_ModuleHeight">