fix: revert some renames, external interface as HcalEndcapP only

eic · Mar 27, 2024 · b1981bf · b1981bf
1 parent 246189a
commit b1981bf
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 125 deletions.
diff --git a/compact/display.xml b/compact/display.xml
@@ -105,8 +105,8 @@
     <vis name="HcalSensorVis"         ref="AnlBlue"   showDaughters="false" visible="false"/>
     <vis name="HcalAbsorberVis"       ref="AnlGray"   showDaughters="false" visible="false"/>
     <vis name="HcalEndcapInsertVis"   ref="AnlGray"   showDaughters="false" visible="true"/>
-    <vis name="HcalEndcapPVis"             ref="AnlBlue"   showDaughters="true" visible="true"/>
-    <vis name="FluxEndcapNVis"        ref="AnlGray"   showDaughters="true" visible="false"/>
+    <vis name="HcalEndcapPVis"        ref="AnlBlue"   showDaughters="true"  visible="true"/>
+    <vis name="FluxEndcapNVis"        ref="AnlGray"   showDaughters="true"  visible="false"/>
     <vis name="FluxEndcapNLayerVis"   ref="AnlViolet" showDaughters="false" visible="true"/>
     <comment>
       Passive steel for flux return

diff --git a/compact/display_detailed.xml b/compact/display_detailed.xml
@@ -87,7 +87,7 @@
     <vis name="HcalSensorVis"         ref="AnlBlue"   showDaughters="true"  visible="true"/>
     <vis name="HcalAbsorberVis"       ref="AnlGray"   showDaughters="true"  visible="true"/>
     <vis name="HcalEndcapInsertVis"   ref="AnlGray"   showDaughters="true"  visible="true"/>
-    <vis name="HcalEndcapPVis"             ref="AnlBlue"   showDaughters="true" visible="true"/>
+    <vis name="HcalEndcapPVis"        ref="AnlBlue"   showDaughters="true"  visible="true"/>
 
     <comment>
       Passive steel for flux return

diff --git a/compact/display_geoviewer.xml b/compact/display_geoviewer.xml
@@ -82,7 +82,7 @@
     <vis name="HcalBarrelStaveVis"    ref="AnlBlue"   showDaughters="false" visible="true"/>
     <vis name="HcalBarrelLayerVis"    ref="AnlBlue"   showDaughters="true"  visible="true"/>
     <vis name="HcalEndcapVis"         ref="AnlBlue"   showDaughters="false" visible="true"/>
-    <vis name="HcalEndcapPVis"             ref="AnlRed"   showDaughters="true" visible="true"/>
+    <vis name="HcalEndcapPVis"        ref="AnlRed"    showDaughters="true"  visible="true"/>
     <vis name="HcalEndcapLayerVis"    ref="AnlBlue"   showDaughters="true"  visible="true"/>
     <vis name="HcalSensorVis"         ref="AnlBlue"   showDaughters="true"  visible="true"/>
     <vis name="HcalAbsorberVis"       ref="AnlGray"   showDaughters="true"  visible="true"/>

diff --git a/compact/hcal/backward.xml b/compact/hcal/backward.xml
@@ -7,12 +7,12 @@
       #### Material Thickness
     </documentation>
     <constant name="HcalEndcapNSteelThickness"          value="4.0 * cm"/>
-    <constant name="HcalEndcapNPolystyreneThickness" value="0.4 * cm"/>
-        <constant name="HcalEndcapNLayerGap"                    value="0.1 * cm"/> <!-- 2*thicker than HcalEndcapP -->
+    <constant name="HcalEndcapNPolystyreneThickness"    value="0.4 * cm"/>
+    <constant name="HcalEndcapNLayerGap"                value="0.1 * cm"/> <!-- 2*thicker than HcalEndcapP -->
 
-        <constant name="HcalEndcapN_polyhedron_rmax"    value="251.444*cm"/>
-        <constant name="HcalEndcapN_segments_rmin"              value="19.9431*cm"/>
-        <constant name="HcalEndcapN_segments_rmax"              value="HcalEndcapN_rmax/(cos(180*deg/HcalEndcapN_CaloSides))"/>
+    <constant name="HcalEndcapN_polyhedron_rmax"        value="251.444*cm"/>
+    <constant name="HcalEndcapN_segments_rmin"          value="19.9431*cm"/>
+    <constant name="HcalEndcapN_segments_rmax"          value="HcalEndcapN_rmax/(cos(180*deg/HcalEndcapN_CaloSides))"/>
 
 
     <documentation>

diff --git a/compact/hcal/forward_insert.xml b/compact/hcal/forward_insert.xml
@@ -22,14 +22,14 @@
     <constant name="HcalEndcapPInsertPCBThickness"               value="0.08*cm"/>
     <constant name="HcalEndcapPInsertESRFoilThickness"           value="0.015*cm"/>
 
-    <constant name="HcalEndcapP_FrontWallThickness"                   value="1.50*cm"/>
+    <constant name="LFHCAL_FrontWallThickness"                   value="1.50*cm"/>
 
     <documentation>
       - Insert N Layers and computed Thickness
     </documentation>
 
     <constant name="HcalEndcapPInsertFrontLayerThickness"
-      value="HcalEndcapP_FrontWallThickness +
+      value="LFHCAL_FrontWallThickness +
              HcalEndcapPInsertAirThickness +
              HcalEndcapPInsertScintillatorCoverThickness +
              HcalEndcapPInsertESRFoilThickness +
@@ -82,10 +82,10 @@
         z="HcalEndcapPInsert_length"
       />
       <backplate thickness="HcalEndcapPInsertBackplateThickness"/>
-      <comment> Front layer to match front walls of HcalEndcapP modules </comment>
+      <comment> Front layer to match front walls of LFHCAL modules </comment>
       <comment> Slices will be ordered according to the slice order listed here </comment>
       <layer repeat="1" thickness="HcalEndcapPInsertFrontLayerThickness" vis="InvisibleWithDaughters">
-        <slice material="Steel235" thickness="HcalEndcapP_FrontWallThickness" vis="HcalEndcapP8MModVis" />
+        <slice material="Steel235" thickness="LFHCAL_FrontWallThickness" vis="LFHCAL8MModVis" />
         <slice material="Air" thickness="HcalEndcapPInsertAirThickness"/>
         <slice material="Aluminum" thickness="HcalEndcapPInsertScintillatorCoverThickness" vis="AnlProcess_Blue"/>
         <slice material="Polystyrene" thickness="HcalEndcapPInsertESRFoilThickness" vis="AnlGray"/>