Removed the bits of code that were altered to not obverlap with the ci_HCAL...

Removed the bits of code that were altered to not obverlap with the ci_HCAL since they were redundant after moving the ci_GEM

compact/ci_GEM.xml

@@ -16,16 +16,6 @@
   </includes>
 
   <define>
-  	<!--
-    <constant name="ci_GEM_id"      value="1">
-    <constant name="ci_GEM_rin"     value="10 * cm">
-    <constant name="ci_GEM_rout"    value="95 * cm">
-    <constant name="ci_GEM_sizez"   value="30 * cm">
-    <constant name="ci_GEM_shiftz"  value="0 * cm">
-    <constant name="ci_GEM_posz"    value="0 * cm">
-    <constant name="ci_GEM_posx"    value="0 * cm">
-    <constant name="ci_GEM_nlayers" value="8">
-    -->
   </define>
 
    <limits>
@@ -46,7 +36,7 @@
       <material name="Ar10CO2"/>  
       <comment> position of the front face of the detector </comment>
       <position x="0" y="0" z="SiliconTrackerOuterBarrel_zmax"/>
-      <dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz"	z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1. * cm"/>
+      <dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz"	z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers"/>
       <layer id="0" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 0) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 0) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 0) * cm" dz="1 * cm" />
       <layer id="1" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 1) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 1) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 1) * cm" dz="1 * cm" />
       <layer id="2" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 2) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 2) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 2) * cm" dz="1 * cm" />

src/ci_GEM.cpp

@@ -20,7 +20,6 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
   double          X         = dims.x();
   double          Z         = dims.z();
   int             Nlayers   = dims.number();
-  double          HCAL_rmin = dims.rmax1(); // Maximum radius that the layer can be
   Material        mat       = desc.material(detElem.materialStr());
   Material        vac       = desc.material("Vacuum");
 
@@ -32,12 +31,7 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
   for (xml_coll_t li(detElem, _U(layer)); li; ++li) {
     xml_comp_t  x_layer    = li;
     std::string layer_name = detName + _toString(x_layer.id(), "_layer%d");
-    double      outer_r    = x_layer.outer_r();
-    if (outer_r > HCAL_rmin) {
-      outer_r = HCAL_rmin;
-    }
-
-    Volume layer_vol(layer_name, Tube(x_layer.inner_r(), outer_r, x_layer.dz()), mat);
+    Volume layer_vol(layer_name, Tube(x_layer.inner_r(), x_layer.outer_r(), x_layer.dz()), mat);
     layer_vol.setVisAttributes(desc.visAttributes(detElem.visStr()));
     sens.setType("tracker");
     layer_vol.setSensitiveDetector(sens);