Apply enable to stave element directly

eic · Aug 22, 2024 · ce49196 · ce49196
1 parent 2c390c7
commit ce49196
Show file tree

Hide file tree

Showing 4 changed files with 163 additions and 165 deletions.
diff --git a/compact/ecal/bic/bic.xml b/compact/ecal/bic/bic.xml
@@ -18,8 +18,8 @@
       change EcalBarrelImagingLayers_nMax variable. Note that this does NOT change the
       number of silicon frames, as each silicon frame and layer is placed manually.
 
-      This file assumes the EcalBarrel_enable_tray_N variables have been defined to allow
-      changing the configuration
+      This file assumes the EcalBarrel_enable_staves_N variables have been defined to allow
+      changing the configuration by enabling/disabling staves
     </comment>
     <!-- Number of imaging layer slots -->
     <constant name="EcalBarrelImagingLayers_num"     value="6"/>
@@ -156,16 +156,16 @@
 
       <layer repeat="1" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
-             space_before="EcalBarrel_FrontSupportThickness"
-             enable_tray="EcalBarrel_enable_tray_1">
+             space_before="EcalBarrel_FrontSupportThickness">
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonFrameThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
         <stave repeat="6"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
                thickness="EcalBarrel_Stave_thickness"
                angle="EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module"
-               vis="EcalBarrelStaveVis">
+               vis="EcalBarrelStaveVis"
+               enable="EcalBarrel_enable_staves_1">
           <xy_layout
             dx="EcalBarrel_AstroPix_width + EcalBarrel_AstroPix_margin"
             dy="EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin"
@@ -175,16 +175,16 @@
 
       <layer repeat="1" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
-             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             enable_tray="EcalBarrel_enable_tray_2">
+             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween">
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonFrameThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
         <stave repeat="6"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
                thickness="EcalBarrel_Stave_thickness"
                angle="EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module"
-               vis="EcalBarrelStaveVis">
+               vis="EcalBarrelStaveVis"
+               enable="EcalBarrel_enable_staves_2">
           <xy_layout
             dx="EcalBarrel_AstroPix_width + EcalBarrel_AstroPix_margin"
             dy="EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin"
@@ -194,17 +194,16 @@
 
       <layer repeat="1" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
-             space_between="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             enable_tray="EcalBarrel_enable_tray_3">
+             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"> 
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonFrameThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
         <stave repeat="6"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
                thickness="EcalBarrel_Stave_thickness"
                angle="-EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module"
-               vis="EcalBarrelStaveVis">
+               vis="EcalBarrelStaveVis"
+               enable="EcalBarrel_enable_staves_3">
           <xy_layout
             dx="EcalBarrel_AstroPix_width + EcalBarrel_AstroPix_margin"
             dy="EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin"
@@ -214,17 +213,16 @@
 
       <layer repeat="1" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
-             space_between="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             enable_tray="EcalBarrel_enable_tray_4">
+             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween">
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonFrameThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
         <stave repeat="6"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
                thickness="EcalBarrel_Stave_thickness"
                angle="-EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module"
-               vis="EcalBarrelStaveVis">
+               vis="EcalBarrelStaveVis"
+               enable="EcalBarrel_enable_staves_4">
           <xy_layout
             dx="EcalBarrel_AstroPix_width + EcalBarrel_AstroPix_margin"
             dy="EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin"
@@ -234,16 +232,16 @@
 
       <layer repeat="1" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
-             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             enable_tray="EcalBarrel_enable_tray_5">
+             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween">
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonFrameThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
         <stave repeat="7"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
                thickness="EcalBarrel_Stave_thickness"
                angle="-EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module"
-               vis="EcalBarrelStaveVis">
+               vis="EcalBarrelStaveVis"
+               enable="EcalBarrel_enable_staves_5">
           <xy_layout
             dx="EcalBarrel_AstroPix_width + EcalBarrel_AstroPix_margin"
             dy="EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin"
@@ -254,16 +252,16 @@
       <layer repeat="EcalBarrelImagingLayers_num-5" vis="EcalBarrelLayerVis"
              thickness="EcalBarrel_ImagingLayerThickness"
              space_between="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween"
-             enable_tray="EcalBarrel_enable_tray_6">
+             space_before="EcalBarrel_ScFiLayerThickness_Imaging + EcalBarrel_SpaceBetween">
         <frame material="CarbonFiber" fill="Air" thickness="EcalBarrel_CarbonFrameThickness" height="EcalBarrel_ImagingLayerThickness" vis="EcalBarrelSliceVis"/>
         <stave repeat="7"
                width="EcalBarrel_Stave_width"
                length="EcalBarrel_Stave_length"
                thickness="EcalBarrel_Stave_thickness"
                angle="EcalBarrel_StaveTilt_angle"
                module="AstroPix_Module"
-               vis="EcalBarrelStaveVis">
+               vis="EcalBarrelStaveVis"
+               enable="EcalBarrel_enable_staves_6">
           <xy_layout
             dx="EcalBarrel_AstroPix_width + EcalBarrel_AstroPix_margin"
             dy="EcalBarrel_AstroPix_length + EcalBarrel_AstroPix_margin"

diff --git a/compact/ecal/bic_6layers.xml b/compact/ecal/bic_6layers.xml
@@ -11,12 +11,12 @@
   ><comment/></info>
 
   <define>
-    <constant name="EcalBarrel_enable_tray_1" value="1"/>
-    <constant name="EcalBarrel_enable_tray_2" value="1"/>
-    <constant name="EcalBarrel_enable_tray_3" value="1"/>
-    <constant name="EcalBarrel_enable_tray_4" value="1"/>
-    <constant name="EcalBarrel_enable_tray_5" value="1"/>
-    <constant name="EcalBarrel_enable_tray_6" value="1"/>
+    <constant name="EcalBarrel_enable_staves_1" value="1"/>
+    <constant name="EcalBarrel_enable_staves_2" value="1"/>
+    <constant name="EcalBarrel_enable_staves_3" value="1"/>
+    <constant name="EcalBarrel_enable_staves_4" value="1"/>
+    <constant name="EcalBarrel_enable_staves_5" value="1"/>
+    <constant name="EcalBarrel_enable_staves_6" value="1"/>
   </define>
   <include ref="bic/bic.xml"/>
 </lccdd>
diff --git a/compact/ecal/bic_default.xml b/compact/ecal/bic_default.xml
@@ -11,12 +11,12 @@
   ><comment/></info>
 
   <define>
-    <constant name="EcalBarrel_enable_tray_1" value="1"/>
-    <constant name="EcalBarrel_enable_tray_2" value="0"/>
-    <constant name="EcalBarrel_enable_tray_3" value="1"/>
-    <constant name="EcalBarrel_enable_tray_4" value="1"/>
-    <constant name="EcalBarrel_enable_tray_5" value="0"/>
-    <constant name="EcalBarrel_enable_tray_6" value="1"/>
+    <constant name="EcalBarrel_enable_staves_1" value="1"/>
+    <constant name="EcalBarrel_enable_staves_2" value="0"/>
+    <constant name="EcalBarrel_enable_staves_3" value="1"/>
+    <constant name="EcalBarrel_enable_staves_4" value="1"/>
+    <constant name="EcalBarrel_enable_staves_5" value="0"/>
+    <constant name="EcalBarrel_enable_staves_6" value="1"/>
   </define>
   <include ref="bic/bic.xml"/>
 </lccdd>