SiEIC Concept: compact: added single alpha spec, and temporarily ditched forward

src/ConceptDetectors/SiEIC/compact/sieic.xml

@@ -18,6 +18,7 @@
         </comment>
   </info>
   <define>
+    <constant name="visAlpha" value="0.075"/>
     <constant name="Pi" value="3.14159265359"/>
     <constant name="world_side" value="30000 * mm"/>
     <constant name="world_x" value="world_side"/>
@@ -28,7 +29,7 @@
     <constant name="trackerZScale" value="1"/>
     <constant name="tracking_region_zmax" value="tracking_region_zmax_orig * trackerZScale"/>
     <constant name="CaloSides" value="12"/>
-    <constant name="CaloInnerRadius" value="0.36397 * tracking_region_radius"/>
+    <constant name="CaloInnerRadius" value="0.1 * tracking_region_zmax"/>
     <constant name="EcalBarrel_rmin" value="tracking_region_radius + 1 * mm"/>
     <constant name="EcalEndcap_zmin" value="tracking_region_zmax + 1 * mm"/>
     <constant name="EcalThinLayers" value="20"/>
@@ -68,7 +69,7 @@
     <constant name="SolenoidThickness" value="260 * mm"/>
     <constant name="SolenoidYokeInnerRadius" value="SolenoidBarrelOuterRadius + 10 * mm"/>
     <constant name="SolenoidYokeThickness" value="0.5 * m"/>
-    <constant name="SolenoidYokeChamferAngle" value="0.2"/>
+    <constant name="SolenoidYokeChamferAngle" value="0"/>
     <constant name="SolenoidYokeInnerZ" value="SolenoidBarrelOuterZ + SolenoidEndcapCryostatThickness + 10 * mm"/>
     <constant name="VXD_CF_sensor" value="0.026 * cm"/>
     <constant name="RICHZMin" value="SolenoidYokeInnerZ + 1 * mm"/>
@@ -94,13 +95,13 @@
     </limitset>
   </limits>
   <display>
-    <vis name="SiVertexVis" alpha="0.05" r="1" g="0" b="1"/>
-    <vis name="SiTrackerVis" alpha="0.05" r="0" g="0" b="0.5"/>
-    <vis name="EcalVis" alpha="0.05" r="0.25" g="0.75" b="0.1"/>
-    <vis name="HcalVis" alpha="0.05" r="0.75" g="0.25" b="0.1"/>
-    <vis name="SolenoidCoilVis" alpha="0.05" r="0.55" g="0.55" b="0.7"/>
-    <vis name="SolenoidYokeVis" alpha="0.05" r="0.6" g="0.4" b="0.4"/>
-    <vis name="RICHVis" alpha="0.05" r="1" g="0" b="1"/>
+    <vis name="SiVertexVis" alpha="visAlpha" r="1" g="0" b="1"/>
+    <vis name="SiTrackerVis" alpha="visAlpha" r="0" g="0" b="0.5"/>
+    <vis name="EcalVis" alpha="visAlpha" r="0.25" g="0.75" b="0.1"/>
+    <vis name="HcalVis" alpha="visAlpha" r="0.75" g="0.25" b="0.1"/>
+    <vis name="SolenoidCoilVis" alpha="visAlpha" r="0.55" g="0.55" b="0.7"/>
+    <vis name="SolenoidYokeVis" alpha="visAlpha" r="0.6" g="0.4" b="0.4"/>
+    <vis name="RICHVis" alpha="visAlpha" r="1" g="0" b="1"/>
   </display>
   <detectors>
     <detector id="1" name="SiVertexBarrel" type="SiEIC_SiTrackerBarrel" readout="SiVertexBarrelHits" insideTrackingVolume="true">
@@ -541,39 +542,6 @@
         <slice material="Air" thickness="HcalAirThickness"/>
       </layer>
     </detector>
-    <detector id="12" name="ForwardRICH" type="SiEIC_RICH" vis="RICHVis">
-      <dimensions rmin="RICHRMin" rmax1="CaloInnerRadius" rmax2="CaloInnerRadius + tan(SolenoidYokeChamferAngle) * RICHDepth" zmin="RICHZMin" zmax="RICHZMin + RICHDepth"/>
-    </detector>
-    <detector id="13" name="ForwardEcal" type="SiEIC_PlanarCalo" vis="EcalVis">
-      <material name="Air"/>
-      <dimensions inner_radius="ForwardEcalRInner" outer_radius="ForwardEcalROuter" angle="ForwardCaloAngle" zmin="ForwardEcalZMin" thickness="EcalThickness"/>
-    </detector>
-    <detector id="14" name="ForwardHcal" type="SiEIC_PlanarCalo" vis="HcalVis">
-      <material name="Air"/>
-      <dimensions inner_radius="ForwardHcalRInner" outer_radius="ForwardHcalROuter" angle="ForwardCaloAngle" zmin="ForwardHcalZMin" thickness="HcalThickness"/>
-    </detector>
-    <detector name="TempDiskTracker1" type="DD4hep_DiskTracker" insideTrackingVolume="false" reflect="false">
-      <layer id="1" inner_r="10 * cm" inner_z="190 * cm" outer_r="CaloInnerRadius - 1 * cm" vis="SiTrackerVis">
-        <slice material="Rohacell31_50D" thickness="3 * mm"/>
-      </layer>
-      <layer id="2" inner_r="10 * cm" inner_z="215 * cm" outer_r="CaloInnerRadius - 1 * cm" vis="SiTrackerVis">
-        <slice material="Rohacell31_50D" thickness="3 * mm"/>
-      </layer>
-      <layer id="2" inner_r="10 * cm" inner_z="240 * cm" outer_r="CaloInnerRadius - 1 * cm" vis="SiTrackerVis">
-        <slice material="Rohacell31_50D" thickness="3 * mm"/>
-      </layer>
-    </detector>
-    <detector name="TempDiskTracker2" type="DD4hep_DiskTracker" insideTrackingVolume="false" reflect="false">
-      <layer id="1" inner_r="10 * cm" inner_z="380 * cm" outer_r="CaloInnerRadius + tan(SolenoidYokeChamferAngle) * RICHDepth + tan(ForwardCaloAngle) * (380 * cm - RICHZMin - RICHDepth)" vis="SiTrackerVis">
-        <slice material="Rohacell31_50D" thickness="3 * mm"/>
-      </layer>
-      <layer id="2" inner_r="10 * cm" inner_z="440 * cm" outer_r="CaloInnerRadius + tan(SolenoidYokeChamferAngle) * RICHDepth + tan(ForwardCaloAngle) * (440 * cm - RICHZMin - RICHDepth)" vis="SiTrackerVis">
-        <slice material="Rohacell31_50D" thickness="3 * mm"/>
-      </layer>
-      <layer id="2" inner_r="10 * cm" inner_z="500 * cm" outer_r="CaloInnerRadius + tan(SolenoidYokeChamferAngle) * RICHDepth + tan(ForwardCaloAngle) * (500 * cm - RICHZMin - RICHDepth)" vis="SiTrackerVis">
-        <slice material="Rohacell31_50D" thickness="3 * mm"/>
-      </layer>
-    </detector>
     <comment>Dead material</comment>
     <detector name="SolenoidCoilBarrel" type="DD4hep_MultiLayerTracker" insideTrackingVolume="false">
       <layer id="1" inner_r="SolenoidBarrelInnerRadius" outer_z="SolenoidBarrelOuterZ" vis="SolenoidCoilVis">