Fixing parameterization for putting the HCAL on the outside.

Fixed ce_GEM overlap

CMakeLists.txt

@@ -5,6 +5,7 @@ PROJECT(reference_detector
   DESCRIPTION "A template dd4hep+acts detector"
   )
 
+set(CMAKE_CXX_STANDARD 17)
 find_package( DD4hep REQUIRED COMPONENTS DDCore DDG4 )
 
 #find_package(Acts REQUIRED COMPONENTS Core IdentificationPlugin TGeoPlugin DD4hepPlugin PATHS /home/whit/lib/cmake NO_DEFAULT_PATH)

compact/cb_CTD_Si.xml

@@ -3,6 +3,10 @@
   <comment> Central Barrel Tracker Silicon </comment>        
 
   <define>
+    <constant name="cb_CTD_rmin"   value="SiliconTrackerInnerRadius + 70.0 * mm"/>
+    <constant name="cb_CTD_rmax"   value="SiliconTrackerOuterRadius"/>
+    <constant name="cb_CTD_zmax"   value="SiliconTrackerOuterBarrel_zmax"/>
+    <constant name="cb_CTD_length" value="SiliconTrackerOuterBarrelLength"/>
     <comment> Si layer opiton </comment>
     <constant name="cb_CTD_Si_gap"    value="5.0 * cm"/>
     <constant name="cb_CTD_Si_layer"  value="15"/>

compact/ce_GEM.xml

@@ -3,6 +3,21 @@
   <comment> Electron endcap GEM tracking </comment>        
 
   <define>
+    <comment>
+      ------------------
+      ce_GEM Parameters
+      ------------------
+    </comment>
+    <constant name="ce_GEM_rmin"            value="10.0 * cm"/> <comment> temporary number. Need beampipe radius  </comment>
+    <!--<constant name="ce_GEM_rmin"        value="0.0 * cm"/>-->
+    <constant name="ce_GEM_rmax"            value="HcalEndcapN_rmin + 0.0 * cm"/> <comment> temporary number to avoid overlaps  </comment>
+    <!--<constant name="ce_GEM_rmax"        value="45.0 * cm + 50.0 * cm"/>-->
+    <constant name="ce_GEM_length"          value="30.0 * cm"/>
+    <constant name="ce_GEM_x_pos"           value="0.0 * cm"/>
+    <constant name="ce_GEM_y_pos"           value="0.0 * cm"/>
+    <constant name="ce_GEM_z_pos"           value="-Solenoid_length/2.0 + ce_GEM_length/2.0"/>
+    <constant name="ce_GEM_layer"           value="8"/>
+    <constant name="ce_GEM_layer_thickness" value="1.0 * cm"/>
   </define>
 
   <limits>

compact/ce_mrich.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <lccdd>
   <define>
+    <constant name="ce_MRICHRMin"   value="15*cm"/>
+    <constant name="ce_MRICHRMax"   value="BarrelTrackingAndPID_rmax"/>
+    <constant name="ce_MRICHLength" value="BackwardCherenkovLength"/>
+    <constant name="ce_MRICHZMin"   value="-EcalEndcapN_zmin+ce_MRICHLength"/>
+
   </define>
 
   <detectors>

compact/definitions.xml

@@ -304,7 +304,7 @@
     <constant name="Solenoid_length"           value="3600.0*mm"/>
     <constant name="Solenoid_rmin"             value="1600.0*mm"/>
     <constant name="Solenoid_thickness"        value="400*mm"/>
-    <constant name="Solenoid_offset"           value="600.0*mm"/>
+    <constant name="Solenoid_offset"           value="0.0*mm"/>
 
     <constant name="Solenoid_rmax"             value="Solenoid_rmin + Solenoid_thickness"/>
     <constant name="SolenoidBarrel_rmin"       value="Solenoid_rmin"/>
@@ -321,8 +321,8 @@
     </comment>
 
     <constant name="ForwardRICH_length"       value="1.1*m"/>
-    <constant name="ForwardTRD_length"        value="20.0*cm"/>
-    <constant name="ForwardTOF_length" value="10.0*cm"/>
+    <constant name="ForwardTRD_length"        value="10.0*cm"/>
+    <constant name="ForwardTOF_length" value="1.0*mm"/>
     
     <constant name="BackwardCherenkovLength"   value="15.0*cm"/>
     <constant name="BackwardTOFLength"         value="10.0*cm"/>
@@ -333,7 +333,7 @@
 
     <comment> Barrel PID thicknesses</comment>
     <constant name="BarrelExtraPIDThickness"  value="25.0 * cm"/>
-    <constant name="BarrelTRDThickness"  value="25.0 * cm"/>
+    <constant name="BarrelTRDThickness"  value="1.0 * cm"/>
     <constant name="BarrelTOFThickness"  value="1.0 * cm"/>
 
     <comment>
@@ -342,12 +342,16 @@
       ============================
     </comment>
 
+    <constant name="ForwardTrackingLength" value="30.0*cm"/>
+    <constant name="BackwardTrackingLength" value="30.0*cm"/>
+
     <comment>
       -------------------------
       GEM Tracker Parameters
       -------------------------
     </comment>
-    <constant name="ForwardTrackingGEMLength" value="30.0*cm"/>
+    <constant name="ForwardTrackingGEMLength" value="ForwardTrackingLength"/>
+    <constant name="ForwardTrackingGEMLength" value="BackwardTrackingLength"/>
 
     <comment>
       -------------------------
@@ -362,11 +366,12 @@
       --------------------------
       Silicon Tracker Parameters
       --------------------------
+      Note current values should be updated
     </comment>
     <constant name="SiliconTrackerInnerRadius"       value="95.0*mm"/>
     <constant name="SiliconTrackerInnerBarrelLength" value="300.0*mm"/>
-    <constant name="SiliconTrackerOuterRadius"       value="Solenoid_rmin-70*cm"/>
-    <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5"/>
+    <constant name="SiliconTrackerOuterRadius"       value="Solenoid_rmax/3.0"/>
+    <constant name="SiliconTrackerOuterBarrelLength" value="1600.0*mm"/>
     <constant name="SiliconTrackerOuterBarrel_zmax"  value="SiliconTrackerOuterBarrelLength/2.0"/>
 
     <comment>
@@ -377,8 +382,11 @@
     </comment>
     <constant name="BarrelTracking_length"       value="SiliconTrackerOuterBarrelLength"/>
     <constant name="BarrelTracking_rmax"         value="SiliconTrackerOuterRadius"/>
+    <constant name="BarrelTrackingAndPID_rmax"   value="BarrelTracking_rmax+BarrelExtraPIDThickness"/>
+
+    <constant name="CentralTracking_length"      value="BarrelTracking_length + ForwardTrackingLength + BackwardTrackingLength"/>
     <constant name="CentralTracking_rmax"        value="SiliconTrackerOuterRadius"/>
-    <constant name="CentralTracking_length"      value="BarrelTracking_length + ForwardTrackingGEMLength"/>
+
     <constant name="VertexTrackingRegion_length" value="SiliconTrackerOuterBarrelLength"/>
 
     <comment> These are used by ddsim </comment>
@@ -386,40 +394,44 @@
     <constant name="tracker_region_zmax"   value="Solenoid_length/2.0"/>
 
 
-    <comment>
-      -------------------------------
-      Central Barrel Tracker - Global
-      -------------------------------
-
-      The cb_CTD_* parameters can probably be moved to the detector specific xml file.
-    </comment>
-    <constant name="cb_CTD_rmin"   value="SiliconTrackerInnerRadius + 70.0 * mm"/>
-    <constant name="cb_CTD_rmax"   value="SiliconTrackerOuterRadius"/>
-    <constant name="cb_CTD_zmax"   value="SiliconTrackerOuterBarrel_zmax"/>
-    <constant name="cb_CTD_length" value="SiliconTrackerOuterBarrelLength"/>
 
     <comment>
-      ------------
-      Calorimeters
-      ------------
-      ======================
+      ----------------------
       Calorimeter Parameters
-      ======================
+      ----------------------
+
+       Note on paramaeterization 
+
+      The HCal Barrel is outside of the solenoid magnet.  However,
+      there is an option to add some HCal barrel inside the magnet but this
+      is turned off below.
+
+      The space for the calorimeters inside the solenoid is assumed to be fixed by 
+      the solenoid inner diameter/length and by the central tracking and PID outer diameter/length.
+
+       Endcaps
+
+      The extra HCal endcap lengths are for offsetting the outside endcap surface (zmax) from the
+      end of the solenoid coils.
 
     </comment>
-    <comment>
-      Ecal and Hcal Barrel/Endcap 
-    </comment>
+
+    <comment> these offesets could be implemented differently for clarity. </comment>
+    <constant name="EcalEndcapPSolenoid_offset" value="800.0*mm" />
+    <constant name="EcalEndcapNSolenoid_offset" value="0.0*mm" />
 
     <constant name="ExtraHcalEndcapP_length"    value="0.0*cm"/>
     <constant name="ExtraHcalEndcapN_length"    value="0.0*cm"/>
+
     <constant name="SolenoidYokeEndcapP_zmin"  value="Solenoid_length/2.0 + Solenoid_offset + ExtraHcalEndcapP_length"/>
     <constant name="SolenoidYokeEndcapN_zmin"  value="Solenoid_length/2.0 - Solenoid_offset + ExtraHcalEndcapN_length"/>
 
     <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/>
     <constant name="HcalBarrel_rmax"            value="Solenoid_rmin - 10.0 *cm "/>
     <constant name="Barrel_TotalCalThickness"   value="HcalBarrel_rmax - EcalBarrel_rmin"/>
-    <constant name="CalBarrelDivider"           value="1.0"/> <comment> 100% Ecal, no HCAL inside of the solenoid for now </comment>
+
+    <constant name="CalBarrelDivider"           value="0.8"/>
+    <comment> Leave room for TRD </comment>
 
     <constant name="EcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * CalBarrelDivider"/>
     <constant name="HcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/>
@@ -433,11 +445,15 @@
     <constant name="BarrelLength"               value="SiliconTrackerOuterBarrelLength + ForwardPIDLength + BackwardPIDLength" />
     <constant name="Barrel_offset"              value="(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0" />
 
-    <constant name="EndcapPTotalCal_length"  value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 20.0 * mm)"/>
-    <constant name="EndcapNTotalCal_length"  value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 20.0 * mm)"/>
+    <comment>
+      Endcaps
+    </comment>
 
-    <constant name="EndcapP_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
-    <constant name="EndcapN_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
+    <constant name="EndcapPTotalCal_length"  value="(SolenoidYokeEndcapP_zmin + EcalEndcapPSolenoid_offset) - (EcalEndcapP_zmin)"/>
+    <constant name="EndcapNTotalCal_length"  value="(SolenoidYokeEndcapN_zmin + EcalEndcapNSolenoid_offset) - (EcalEndcapN_zmin)"/>
+
+    <constant name="EndcapP_CalDivide"          value="1.0"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
+    <constant name="EndcapN_CalDivide"          value="1.0"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
 
     <constant name="EcalEndcapP_length" value="EndcapPTotalCal_length * EndcapP_CalDivide"/>
     <constant name="EcalEndcapN_length" value="EndcapNTotalCal_length * EndcapN_CalDivide"/>
@@ -594,7 +610,7 @@
       Gaseous RICH Parameters
       -----------------------
     </comment>
-    <constant name="ForwardRICH_zmin"  value="SiliconTrackerOuterBarrel_zmax + 1 * cm"/>
+    <constant name="ForwardRICH_zmin"  value="BarrelTracking_length/2.0 + ForwardTrackingLength + 1 * mm"/>
     <constant name="ForwardRICH_rmin"  value="15 * cm"/>
     <constant name="ForwardRICH_rmax0"  value="SiliconTrackerOuterRadius"/>
     <constant name="ForwardRICH_rmax1"  value="EcalBarrel_rmin"/>
@@ -621,32 +637,7 @@
     </comment>
 
 
-    <comment>
-      --------------------------
-      ce_MRICH Parameters
-      --------------------------
-    </comment>
-    <constant name="ce_MRICHRMin"   value="15*cm"/>
-    <constant name="ce_MRICHRMax"   value="100*cm"/>
-    <constant name="ce_MRICHLength" value="BackwardCherenkovLength"/>
-    <constant name="ce_MRICHZMin"   value="-EcalEndcapN_zmin+ce_MRICHLength"/>
-
 
-    <comment>
-      ------------------
-      ce_GEM Parameters
-      ------------------
-    </comment>
-    <constant name="ce_GEM_rmin"            value="10.0 * cm"/> <comment> temporary number. Need beampipe radius  </comment>
-    <!--<constant name="ce_GEM_rmin"        value="0.0 * cm"/>-->
-    <constant name="ce_GEM_rmax"            value="HcalEndcapN_rmin + 8.0 * cm"/> <comment> temporary number to avoid overlaps  </comment>
-    <!--<constant name="ce_GEM_rmax"        value="45.0 * cm + 50.0 * cm"/>-->
-    <constant name="ce_GEM_length"          value="30.0 * cm"/>
-    <constant name="ce_GEM_x_pos"           value="0.0 * cm"/>
-    <constant name="ce_GEM_y_pos"           value="0.0 * cm"/>
-    <constant name="ce_GEM_z_pos"           value="-Solenoid_length/2.0 + ce_GEM_length/2.0"/>
-    <constant name="ce_GEM_layer"           value="8"/>
-    <constant name="ce_GEM_layer_thickness" value="1.0 * cm"/>
 
     <comment>
       --------------------------

compact/ecal.xml

@@ -83,7 +83,7 @@
       readout="EcalEndcapHits" 
       vis="EcalEndcapVis" 
       calorimeterType="EM_ENDCAP" >
-      <position x="0" y="0" z="0"/>
+      <position x="0" y="0" z="-0"/>
       <dimensions 
         numsides="CaloSides" 
         zmin="EcalEndcapP_zmin" 
@@ -132,13 +132,13 @@
         zmin="EcalEndcapN_zmin" 
         rmin="EcalEndcapN_rmin" 
         rmax="EcalBarrel_rmax " />
-      <layer repeat="EcalEndcapPLayer1_NRepeat">
+      <layer repeat="EcalEndcapNLayer1_NRepeat">
         <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
         <slice material="Copper" thickness="EcalCopperThickness"/>
         <slice material="Kapton" thickness="EcalKaptonThickness"/>
         <slice material="Air" thickness="EcalAir1Thickness"/>
       </layer>
-      <layer repeat="EcalEndcapPLayer2_NRepeat">
+      <layer repeat="EcalEndcapNLayer2_NRepeat">
         <slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
         <slice material="Air" thickness="EcalAir2Thickness"/>
         <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
@@ -146,7 +146,7 @@
         <slice material="Kapton" thickness="EcalKaptonThickness"/>
         <slice material="Air" thickness="EcalAir1Thickness"/>
       </layer>
-      <layer repeat="EcalEndcapPLayer3_NRepeat">
+      <layer repeat="EcalEndcapNLayer3_NRepeat">
         <slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
         <slice material="Air" thickness="EcalAir2Thickness"/>
         <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>

compact/gem_tracker_endcap.xml

@@ -5,13 +5,13 @@
   <define>
     <constant name="GEMTrackerEndcap_zmin"            value="BarrelTracking_length/2.0"/>
     <constant name="GEMTrackerEndcap_NLayers"         value="5"/>
-    <constant name="GEMTrackerEndcapLayer_thickness"  value="ForwardTrackingGEMLength/GEMTrackerEndcap_NLayers"/>
-
-    <constant name="GEMTrackerEndcapFoilX1"           value="43.0 * mm"/>
-    <constant name="GEMTrackerEndcapFoilY"            value="1020.0 * mm"/>
     <constant name="GEMTrackerEndcapFoilOpeningAngle" value="30.1*degree"/>
-    <constant name="GEMTrackerEndcapFoilX2"           value="2*GEMTrackerEndcapFoilY*tan(GEMTrackerEndcapFoilOpeningAngle/2.0) +  GEMTrackerEndcapFoilX1"/>
+    <constant name="GEMTrackerEndcapFoilX1"           value="43.0 * mm"/>
+
+    <constant name="GEMTrackerEndcapLayer_thickness"  value="ForwardTrackingGEMLength/GEMTrackerEndcap_NLayers"/>
     <constant name="GEMTrackerEndcapFoil_rmin"        value="GEMTrackerEndcapFoilX1/(tan(GEMTrackerEndcapFoilOpeningAngle/2.0)*2.0)"/>
+    <constant name="GEMTrackerEndcapFoilY"            value="BarrelTrackingAndPID_rmax- GEMTrackerEndcapFoil_rmin- 1.0*cm"/>
+    <constant name="GEMTrackerEndcapFoilX2"           value="2*GEMTrackerEndcapFoilY*tan(GEMTrackerEndcapFoilOpeningAngle/2.0) +  GEMTrackerEndcapFoilX1"/>
     <constant name="GEMTrackerEndcapFoil_rmax"        value="(GEMTrackerEndcapFoilY+GEMTrackerEndcapFoil_rmin)/(cos(GEMTrackerEndcapFoilOpeningAngle/2.0))"/>
 
 
@@ -106,51 +106,51 @@
       <layer id="1" >
         <ring vis="Argonne_Red"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+0*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="10 * mm" module="GEMModule1" />
         <ring vis="Argonne_Blue" phi0="15.0*degree"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+0*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
       </layer>
       <layer id="2" >
         <ring vis="Argonne_Red"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+1*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+1.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="10 * mm" module="GEMModule1" />
         <ring vis="Argonne_Blue" phi0="15.0*degree"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+1*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+1.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
       </layer>
       <layer id="3" >
         <ring vis="Argonne_Red"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+2*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+2.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="10 * mm" module="GEMModule1" />
         <ring vis="Argonne_Blue" phi0="15.0*degree"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+2*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+2.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
       </layer>
       <layer id="4" >
         <ring vis="Argonne_Red"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+3*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+3.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="10 * mm" module="GEMModule1" />
         <ring vis="Argonne_Blue" phi0="15.0*degree"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+3*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+3.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
       </layer>
       <layer id="5" >
         <ring vis="Argonne_Red"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+4*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+4.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="10 * mm" module="GEMModule1" />
         <ring vis="Argonne_Blue" phi0="15.0*degree"
           r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
-          zstart="GEMTrackerEndcap_zmin+4*GEMTrackerEndcapLayer_thickness"
+          zstart="GEMTrackerEndcap_zmin+4.5*GEMTrackerEndcapLayer_thickness"
           nmodules="12" dz="0 * mm" module="GEMSupportModule2" />
       </layer>
     </detector>

compact/mm_tracker_barrel.xml

@@ -4,10 +4,9 @@
 
   <define>
     <constant name="MMTrackerBarrelLayer1_rmin"          value="800.0 * mm"/>
-    <constant name="MMTrackerBarrelLayer1_length"    value="500.0 * mm"/>
+    <constant name="MMTrackerBarrelLayer1_length"        value="100.0 * mm"/>
     <constant name="MMTrackerBarrelLayer1_thickness"     value="10.0 * mm"/>
     <constant name="MMTrackerBarrel_NZModules"           value="floor(BarrelTracking_length/MMTrackerBarrelLayer1_length)"/>
-
     <constant name="MMTrackerBarrelModulesTotal_length"  value="MMTrackerBarrel_NZModules*MMTrackerBarrelLayer1_length"/>
 
 

reference_detector.xml

@@ -117,26 +117,28 @@
   <include ref="ip6/beampipe.xml"/>
   <include ref="compact/solenoid.xml"/>
   <include ref="compact/ecal.xml"/>
-  <include ref="compact/far_forward_detectors.xml"/>
   <include ref="compact/ce_mrich.xml"/>
   <include ref="compact/ce_GEM.xml"/>
-  <!--include ref="compact/hcal.xml"/-->
   <include ref="compact/forward_trd.xml"/>
-  <include ref="compact/B0_tracker.xml"/>
-  <include ref="compact/forward_romanpot.xml"/>
-  <include ref="compact/forward_offM_tracker.xml"/>
   <include ref="compact/vertex_tracker.xml"/>
   <include ref="compact/gem_tracker_endcap.xml"/>
   <include ref="compact/mm_tracker_barrel.xml"/>
+
+  <include ref="compact/B0_tracker.xml"/>
+  <include ref="compact/forward_offM_tracker.xml"/>
+  <include ref="compact/forward_romanpot.xml"/>
+  <include ref="compact/far_forward_detectors.xml"/>
+  <include ref="eic/forward_ion_beamline.xml"/>
+  
   <!--
   <include ref="compact/ci_GEM.xml"/>
+  <include ref="compact/hcal.xml"/>
   <include ref="compact/cb_CTD_Si.xml"/>
   <include ref="compact/cb_VTX_Barrel.xml"/>
   <include ref="compact/ci_HCAL.xml"/>
   <include ref="compact/forward_rich.xml"/>
   <include ref="compact/roman_pots.xml"/>
   -->
-  <include ref="eic/forward_ion_beamline.xml"/>
 
 
   <detectors>

src/ce_GEM.cpp

@@ -44,7 +44,7 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
   // Loop over layers
   for(int i = 0; i < repeat; i++) {
     layerRIn  = RIn + 1.0 * cm + ((double)i * 0.5) * cm;
-    layerROut = ROut - 25.0 * cm + ((double)i * 2.0) * cm;
+    layerROut = ROut;//RIn + ((double)i * 0.5) * cm;
     layerPosZ = SizeZ / 2.0 - 5.0 * cm - ((double)i * 3.0) * cm;
     layerSizeZ = 1.0 * cm;