Merge branch 'master' of eicweb.phy.anl.gov:EIC/detectors/topside

topside.xml

@@ -105,8 +105,8 @@
   </display>
 
   <!--
-  <include ref="topside/vertex_tracker.xml"/>
   -->
+  <include ref="topside/vertex_tracker.xml"/>
   <include ref="topside/silicon_tracker.xml"/>
   <include ref="topside/ecal.xml"/>
   <include ref="topside/hcal.xml"/>

topside/solenoid.xml

@@ -53,7 +53,7 @@
         inner_z="SolenoidCoil_zmax" 
         inner_r="SolenoidCoilConductor_rmin" 
         outer_r="SolenoidCoilConductor_rmax">
-        <slice material="Vacuum" thickness="SolenoidEndPlateGapThickness"/>
+        <slice material="Vacuum" thickness="SolenoidEndPlateGapThickness/2.0"/>
       </layer>
       <!--
       <layer id="2" 

topside/vertex_tracker.xml

@@ -19,7 +19,7 @@
     <constant name="VertexTrackerNModules7" value="36"/>
     <constant name="VertexTrackerNModules8" value="40"/>
 
-    <constant name="VertexTrackerBarrelLength" value="750.0*mm"/>
+    <constant name="VertexTrackerBarrelLength" value="300.0*mm"/>
 
   </define>
 
@@ -61,11 +61,13 @@
         </module_component>
         -->
       </module>
+      <!--
       <layer module="SOIPIXD" id="1" vis="VertexBarrelLayerVis">
         <barrel_envelope inner_r="VertexTrackerRadius1-5.0*mm" outer_r="(VertexTrackerRadius1+VertexTrackerRadius2)/2" z_length="VertexTrackerBarrelLength"/>
         <rphi_layout phi_tilt="10.0*degree" nphi="VertexTrackerNModules1" phi0="0.2618" rc="VertexTrackerRadius1" dr="0.0 * mm"/>
         <z_layout dr="0.0 * mm" z0="0.0 * mm" nz="1"/>
       </layer>
+      -->
       <layer module="SOIPIXD" id="2" vis="VertexBarrelLayerVis">
         <barrel_envelope inner_r="(VertexTrackerRadius1+VertexTrackerRadius2)/2" 
                          outer_r="(VertexTrackerRadius2+VertexTrackerRadius3)/2" z_length="VertexTrackerBarrelLength"/>