diff --git a/.gitignore b/.gitignore
index 96a61480e4e3cbb4d1cda1cc90743187155d5772..b364cf88d73433cb8f67468e10b6e3299934733c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ fieldmaps
manifest.txt
acts.txt
acts2.txt
+
+materials-map.cbor
diff --git a/compact/central_tracker_hybrid_v2.xml b/compact/central_tracker_hybrid_v2.xml
index 2530df0a74f2d5ec178d5bb7579e75006c62f5bc..73ff7a49fa65c68b5edcfb6e7fc9fe1756d3329e 100644
--- a/compact/central_tracker_hybrid_v2.xml
+++ b/compact/central_tracker_hybrid_v2.xml
@@ -1096,40 +1096,6 @@ total X0 0.24% per disk layer （4 sectors per disk):
<trd x1="GEMSpoke_width/2" x2="GEMSpoke_width/2" z="GEMEndcapRingModSpoke_length/2"/>
<module_component thickness="GEMSpoke_thickness" material="Mylar" vis="TrackerSupportVis"/>
</module>
- <module name="LargeModule" vis="TrackerGEMModuleVis">
- <trd x1="GEMEndcapLargeMod_x1/2" x2="GEMEndcapLargeMod_x2/2" z="GEMEndcapLargeMod_y/2" />
- <comment> going from back to front </comment>
- <module_component name="exit_window" thickness="GEMMylar_thickness" material="Mylar" vis="TrackerServiceVis" />
- <module_component name="exit_region" thickness="GEMGas_thickness" material="Ar10CO2"/>
- <module_component name="readout_cu" thickness="GEMCuElectrode_thickness" material="Copper"/>
- <module_component name="readout_foil" thickness="GEMKapton_thickness" material="Kapton"/>
- <module_component name="induction_region" thickness="GEMGas_thickness" material="Ar10CO2"/>
- <module_component name="gem_foil_3_cu" thickness="GEMCuElectrode_thickness * GEMAreaFactor" material="Copper"/>
- <module_component name="gem_foil_3" thickness="GEMKapton_thickness * GEMAreaFactor" material="Kapton"/>
- <module_component name="transfer_region2" thickness="GEMGas_thickness" material="Ar10CO2"/>
- <module_component name="gem_foil_2_cu" thickness="GEMCuElectrode_thickness * GEMAreaFactor" material="Copper"/>
- <module_component name="gem_foil_2" thickness="GEMKapton_thickness * GEMAreaFactor" material="Kapton"/>
- <module_component name="transfer_region1" thickness="GEMGas_thickness" material="Ar10CO2"/>
- <module_component name="gem_foil_1_cu" thickness="GEMCuElectrode_thickness * GEMAreaFactor" material="Copper"/>
- <module_component name="gem_foil_1" thickness="GEMKapton_thickness * GEMAreaFactor" material="Kapton"/>
- <module_component name="drift_region" thickness="GEMDriftRegion_thickness" material="Ar10CO2" sensitive="true"/>
- <module_component name="cathode_cu" thickness="GEMCuElectrode_thickness" material="Copper"/>
- <module_component name="cathode_foil" thickness="GEMKapton_thickness" material="Kapton"/>
- <module_component name="entrance_region" thickness="GEMGas_thickness" material="Ar10CO2"/>
- <module_component name="entrance_window" thickness="GEMMylar_thickness" material="Mylar" vis="TrackerMPGDVis" />
- </module>
- <module name="LargeBotFrame" vis="TrackerSupportVis">
- <trd x1="GEMEndcapLargeModBotFrame_x1/2" x2="GEMEndcapLargeModBotFrame_x2/2" z="GEMEndcapLargeModBotFrame_y/2" />
- <module_component name="frame" thickness="GEMFrame_thickness" material="CarbonFiber" vis="TrackerSupportVis" />
- </module>
- <module name="LargeTopFrame" vis="TrackerSupportVis">
- <trd x1="GEMEndcapLargeModTopFrame_x1/2" x2="GEMEndcapLargeModTopFrame_x2/2" z="GEMEndcapLargeModTopFrame_y/2" />
- <module_component name="frame" thickness="GEMFrame_thickness" material="CarbonFiber" vis="TrackerSupportVis" />
- </module>
- <module name="LargeSpoke" vis="TrackerSupportVis">
- <trd x1="GEMSpoke_width/2" x2="GEMSpoke_width/2" z="GEMEndcapLargeModSpoke_length/2"/>
- <module_component thickness="GEMSpoke_thickness" material="Mylar" vis="TrackerSupportVis"/>
- </module>
<layer id="1">
<envelope vis="TrackerLayerVis"
rmin="GEMEndcapRingLayer_rmin"
@@ -1196,39 +1162,6 @@ total X0 0.24% per disk layer （4 sectors per disk):
phi0="GEMEndcapMod_angle/2"
module="RingSpoke" />
</layer>
- <layer id="3">
- <envelope vis="TrackerLayerVis"
- rmin="GEMEndcapLargeLayer_rmin"
- rmax="GEMEndcapLargeLayer_rmax"
- length="GEMEndcapLayer_thickness"
- zstart="GEMEndcapPLayer3_zmin" />
- <layer_material surface="representing" binning="binPhi,binR" bins0="20*GEMEndcapMod_count" bins1="256"/>
- <ring
- r="GEMEndcapLargeMod_rmin + GEMEndcapLargeMod_y/2"
- zstart="0"
- nmodules="GEMEndcapMod_count"
- dz="GEMEndcapMod_dz"
- module="LargeModule" />
- <ring
- r="GEMEndcapLargeModBotFrame_rmin + GEMEndcapLargeModBotFrame_y/2"
- zstart="0"
- nmodules="GEMEndcapMod_count"
- dz="GEMEndcapMod_dz"
- module="LargeBotFrame" />
- <ring
- r="GEMEndcapLargeModTopFrame_rmin + GEMEndcapLargeModTopFrame_y/2"
- zstart="0"
- nmodules="GEMEndcapMod_count"
- dz="GEMEndcapMod_dz"
- module="LargeTopFrame" />
- <ring
- r="GEMEndcapLargeModSpoke_r"
- zstart="0"
- nmodules="GEMEndcapMod_count"
- dz="0"
- phi0="GEMEndcapMod_angle/2"
- module="LargeSpoke" />
- </layer>
</detector>
<detector
id="TrackerEndcapN_3_ID"
@@ -1372,6 +1305,81 @@ total X0 0.24% per disk layer （4 sectors per disk):
module="RingSpoke" />
</layer>
</detector>
+ <detector
+ id="TrackerEndcapP_4_ID"
+ name="ForwardGEM"
+ type="athena_TrapEndcapTracker"
+ readout="GEMTrackerEndcapHits"
+ vis="TrackerVis"
+ reflect="false">
+ <module name="LargeModule" vis="TrackerGEMModuleVis">
+ <trd x1="GEMEndcapLargeMod_x1/2" x2="GEMEndcapLargeMod_x2/2" z="GEMEndcapLargeMod_y/2" />
+ <comment> going from back to front </comment>
+ <module_component name="exit_window" thickness="GEMMylar_thickness" material="Mylar" vis="TrackerServiceVis" />
+ <module_component name="exit_region" thickness="GEMGas_thickness" material="Ar10CO2"/>
+ <module_component name="readout_cu" thickness="GEMCuElectrode_thickness" material="Copper"/>
+ <module_component name="readout_foil" thickness="GEMKapton_thickness" material="Kapton"/>
+ <module_component name="induction_region" thickness="GEMGas_thickness" material="Ar10CO2"/>
+ <module_component name="gem_foil_3_cu" thickness="GEMCuElectrode_thickness * GEMAreaFactor" material="Copper"/>
+ <module_component name="gem_foil_3" thickness="GEMKapton_thickness * GEMAreaFactor" material="Kapton"/>
+ <module_component name="transfer_region2" thickness="GEMGas_thickness" material="Ar10CO2"/>
+ <module_component name="gem_foil_2_cu" thickness="GEMCuElectrode_thickness * GEMAreaFactor" material="Copper"/>
+ <module_component name="gem_foil_2" thickness="GEMKapton_thickness * GEMAreaFactor" material="Kapton"/>
+ <module_component name="transfer_region1" thickness="GEMGas_thickness" material="Ar10CO2"/>
+ <module_component name="gem_foil_1_cu" thickness="GEMCuElectrode_thickness * GEMAreaFactor" material="Copper"/>
+ <module_component name="gem_foil_1" thickness="GEMKapton_thickness * GEMAreaFactor" material="Kapton"/>
+ <module_component name="drift_region" thickness="GEMDriftRegion_thickness" material="Ar10CO2" sensitive="true"/>
+ <module_component name="cathode_cu" thickness="GEMCuElectrode_thickness" material="Copper"/>
+ <module_component name="cathode_foil" thickness="GEMKapton_thickness" material="Kapton"/>
+ <module_component name="entrance_region" thickness="GEMGas_thickness" material="Ar10CO2"/>
+ <module_component name="entrance_window" thickness="GEMMylar_thickness" material="Mylar" vis="TrackerMPGDVis" />
+ </module>
+ <module name="LargeBotFrame" vis="TrackerSupportVis">
+ <trd x1="GEMEndcapLargeModBotFrame_x1/2" x2="GEMEndcapLargeModBotFrame_x2/2" z="GEMEndcapLargeModBotFrame_y/2" />
+ <module_component name="frame" thickness="GEMFrame_thickness" material="CarbonFiber" vis="TrackerSupportVis" />
+ </module>
+ <module name="LargeTopFrame" vis="TrackerSupportVis">
+ <trd x1="GEMEndcapLargeModTopFrame_x1/2" x2="GEMEndcapLargeModTopFrame_x2/2" z="GEMEndcapLargeModTopFrame_y/2" />
+ <module_component name="frame" thickness="GEMFrame_thickness" material="CarbonFiber" vis="TrackerSupportVis" />
+ </module>
+ <module name="LargeSpoke" vis="TrackerSupportVis">
+ <trd x1="GEMSpoke_width/2" x2="GEMSpoke_width/2" z="GEMEndcapLargeModSpoke_length/2"/>
+ <module_component thickness="GEMSpoke_thickness" material="Mylar" vis="TrackerSupportVis"/>
+ </module>
+ <layer id="1">
+ <envelope vis="TrackerLayerVis"
+ rmin="GEMEndcapLargeLayer_rmin"
+ rmax="GEMEndcapLargeLayer_rmax"
+ length="GEMEndcapLayer_thickness"
+ zstart="GEMEndcapPLayer3_zmin" />
+ <layer_material surface="representing" binning="binPhi,binR" bins0="20*GEMEndcapMod_count" bins1="256"/>
+ <ring
+ r="GEMEndcapLargeMod_rmin + GEMEndcapLargeMod_y/2"
+ zstart="0"
+ nmodules="GEMEndcapMod_count"
+ dz="GEMEndcapMod_dz"
+ module="LargeModule" />
+ <ring
+ r="GEMEndcapLargeModBotFrame_rmin + GEMEndcapLargeModBotFrame_y/2"
+ zstart="0"
+ nmodules="GEMEndcapMod_count"
+ dz="GEMEndcapMod_dz"
+ module="LargeBotFrame" />
+ <ring
+ r="GEMEndcapLargeModTopFrame_rmin + GEMEndcapLargeModTopFrame_y/2"
+ zstart="0"
+ nmodules="GEMEndcapMod_count"
+ dz="GEMEndcapMod_dz"
+ module="LargeTopFrame" />
+ <ring
+ r="GEMEndcapLargeModSpoke_r"
+ zstart="0"
+ nmodules="GEMEndcapMod_count"
+ dz="0"
+ phi0="GEMEndcapMod_angle/2"
+ module="LargeSpoke" />
+ </layer>
+ </detector>
</detectors>
diff --git a/compact/tracking_config_canyonlands.xml b/compact/tracking_config_canyonlands.xml
index 153c0670d08eceda2dabe7b26f494f110b889902..c52fa39adb9a60b6a054b67b7f272e41cab8f086 100644
--- a/compact/tracking_config_canyonlands.xml
+++ b/compact/tracking_config_canyonlands.xml
@@ -43,6 +43,20 @@
<composite name="OuterTrackerBarrel"/>
<composite name="OuterTrackerCompositeEndcapP"/>
</detector>
+ <!--
+ <detector id="TrackerSubAssembly_3_ID"
+ name="EcalBarrelSubAssembly"
+ type="DD4hep_SubdetectorAssembly"
+ vis="TrackerSubAssemblyVis">
+ </detector>
+ -->
+ <detector id="TrackerSubAssembly_4_ID"
+ name="ForwardBackwardTrackerSubAssembly"
+ type="DD4hep_SubdetectorAssembly"
+ vis="TrackerSubAssemblyVis">
+ <composite name="ForwardGEM"/>
+ <composite name="BackwardNullTracker"/>
+ </detector>
<detector id="TrackerCompositeEndcapN_0_ID"
name="OuterTrackerCompositeEndcapN"
type="athena_CompositeTracker"
@@ -61,6 +75,13 @@
<composite name="OuterTrackerEndcapP"/>
<composite name="GEMEndcapP"/>
</detector>
+ <detector id="TrackerCompositeEndcapN_1_ID"
+ name="BackwardNullTracker"
+ type="athena_CompositeTracker"
+ actsType="endcap"
+ vis="TrackerSubAssemblyVis">
+ <position x="0*cm" y="0*cm" z="-1*um" />
+ </detector>
</detectors>
@@ -71,7 +92,7 @@
<plugins>
<plugin name="FileLoader">
<arg value="file:calibrations/materials-map.cbor"/>
- <arg value="url:https://eicweb.phy.anl.gov/EIC/detectors/athena/uploads/cff8f8d5919d8e78561e8caf2b4fad2b/material-maps.cbor"/>
+ <arg value="url:https://eicweb.phy.anl.gov/EIC/detectors/athena/uploads/4190e898ce4026cb6575359c57edc1e5/material-maps.cbor"/>
</plugin>
</plugins>