diff --git a/athena.xml b/athena.xml
index 8592b4afe6594eec8b946ac22d82ca5082fd1837..1ba8f221b45d874e83fc3cc17bf63d663da042ae 100644
--- a/athena.xml
+++ b/athena.xml
@@ -139,14 +139,25 @@
<composite name="TrackerEndcapN_Outer"/>
</detector>
- <detector id="TOFSubAssembly_ID"
- name="TOFSubAssembly"
+ <comment>
+ TOF disabled for baseline
+ <detector id="OuterTrackingSubAssembly_ID"
+ name="OuterTrackingSubAssembly"
type="DD4hep_SubdetectorAssembly"
vis="TOFSubAssemblyVis">
<composite name="BarrelTOF"/>
<composite name="ForwardTOF"/>
<composite name="BackwardTOF"/>
</detector>
+ </comment>
+
+ <detector id="OuterTrackingSubAssembly_ID"
+ name="OuterTrackingSubAssembly"
+ type="DD4hep_SubdetectorAssembly"
+ vis="SubAssemblyVis">
+ <composite name="GEMTrackerEndcapP"/>
+ <composite name="GEMTrackerEndcapN"/>
+ </detector>
</detectors>
@@ -154,7 +165,7 @@
## Central tracking detectors
</documentation>
- <include ref="compact/tracking_config_silicon.xml"/>
+ <include ref="compact/tracking_config_accadia.xml"/>
<!--include ref="compact/tracking_config_mgpds.xml"/-->
@@ -163,7 +174,7 @@
</documentation>
<!--include ref="compact/dirc.xml"/-->
<!--include ref="compact/mrich.xml"/-->
- <include ref="compact/forward_trd.xml"/>
+ <!--include ref="compact/forward_trd.xml"/-->
<include ref="compact/drich.xml"/>
<documentation level="10">
@@ -173,6 +184,7 @@
<include ref="compact/hcal.xml"/>
+ <comment>
<documentation level="11">
## Far foward detectors
</documentation>
@@ -240,6 +252,7 @@
<coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
</field>
</fields>
+ </comment>
<comment>
FB elements
diff --git a/compact/ce_ecal.xml b/compact/ce_ecal.xml
index 02807118021201c13761feab670cddef1595f778..ec38d03b30f432703b5c393876dd2e57ad8443e1 100644
--- a/compact/ce_ecal.xml
+++ b/compact/ce_ecal.xml
@@ -43,7 +43,7 @@
numsides="CaloSides"
zmin="EcalEndcapN_zmin"
rmin="EcalEndcapN_rmin"
- rmax="EcalBarrel_rmin " />
+ rmax="TrackerBarrel_rmax" />
<layer repeat="EcalEndcapNLayer1_NRepeat">
<slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
<slice material="Copper" thickness="EcalCopperThickness"/>
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 5becd21b28aba574308b05e84fe18f5a53e68eed..5b8de90af763484e8f1163b0e8240472dbaca7d9 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -88,6 +88,7 @@ The unused IDs below are saved for future use.
<constant name="TrackerBarrelSubAssembly_Outer_ID" value="52"/>
<constant name="TrackerEndcapSubAssembly_Outer_ID" value="53"/>
+ <constant name="OuterTrackingSubAssembly_ID" value="54"/>
<!--constant name="TrackerSubAssemblyLayer4_ID" value="54"/-->
<!--constant name="TrackerSubAssemblyLayer5_ID" value="55"/-->
@@ -137,8 +138,7 @@ The unused IDs below are saved for future use.
- DIRC subsystem ID: 90
- Barrel TRD subsystem ID: 91
- Barrel TOF subsystem ID: 92
- - TOFSubAssembly ID: 93
- - Unused IDs: 94-99
+ - Unused IDs: 93-99
</documentation>
<constant name="BarrelDIRC_ID" value="90"/>
<constant name="BarrelTRD_ID" value="91"/>
@@ -179,7 +179,7 @@ The unused IDs below are saved for future use.
<constant name="HCalBarrel_ID" value="111"/>
<constant name="HCalEndcapP_ID" value="112"/>
<constant name="HCalEndcapN_ID" value="113"/>
- <constant name="ci_HCAL_id" value="200"/>
+ <!--constant name="ci_HCAL_id" value="200"/-->
<documentation>
#### (120-129) (near) Forward reserved
@@ -190,9 +190,9 @@ The unused IDs below are saved for future use.
</documentation>
<constant name="ForwardTracking_ID" value="120"/>
<constant name="ForwardRICH_ID" value="121"/>
- <constant name="ci_GEM_id" value="122"/>
+ <!--constant name="ci_GEM_id" value="122"/-->
<constant name="ForwardTRD_ID" value="123"/>
- <constant name="GEMTrackerEndcap_ID" value="124"/>
+ <constant name="GEMTrackerEndcapP_ID" value="124"/>
<constant name="GEMTrackerEndcapN_ID" value="125"/>
<constant name="ForwardTOF_ID" value="126"/>
<constant name="BackwardTOF_ID" value="127"/>
@@ -206,7 +206,7 @@ The unused IDs below are saved for future use.
</documentation>
<constant name="MRICH_ID" value="130"/>
- <constant name="ce_GEM_ID" value="131"/>
+ <!--constant name="ce_GEM_ID" value="131"/-->
<documentation>
#### (140-149) Central Magnet
@@ -243,6 +243,7 @@ The unused IDs below are saved for future use.
<constant name="ForwardOffMTracker_station_2_ID" value="160"/>
<constant name="ForwardOffMTracker_station_3_ID" value="161"/>
<constant name="ForwardOffMTracker_station_4_ID" value="162"/>
+ <comment> TODO naming consistency </comment>
<constant name="ffi_ZDC_ECAL_ID" value="163"/>
<constant name="ffi_ZDC_HCAL_ID" value="164"/>
@@ -324,28 +325,26 @@ Examples:
### PID Detector Region Parameters
</documentation>
- <constant name="ForwardRICH_length" value="180.0*cm"/>
- <constant name="ForwardTRD_length" value="10.0*cm"/>
- <constant name="ForwardTOF_length" value="3.0*cm"/>
+ <constant name="ForwardRICH_length" value="180.0*cm"/>
+ <constant name="ExtraTrackingEndcapP_length" value="25.0*cm"/>
+ <constant name="ForwardTRD_length" value="25.0*cm"/>
+ <constant name="ForwardTOF_length" value="ExtraTrackingEndcapP_length-ForwardTRD_length"/>
- <constant name="BackwardCherenkov_length" value="20.0*cm"/>
- <constant name="BackwardTOF_length" value="3.0*cm"/>
+ <constant name="BackwardCherenkov_length" value="20.0*cm"/>
+ <constant name="ExtraTrackingEndcapN_length" value="5.0*cm"/>
+ <constant name="BackwardTOF_length" value="0.0*cm"/>
- <comment> Total length of PID detectors above</comment>
- <constant name="ForwardPIDLength" value="ForwardRICH_length + ForwardTRD_length + ForwardTOF_length"/>
- <constant name="BackwardPIDLength" value="BackwardCherenkov_length + BackwardTOF_length"/>
+ <comment> Total length of the endcap detectors</comment>
+ <constant name="ForwardPIDLength" value="ForwardRICH_length + ExtraTrackingEndcapP_length"/>
+ <constant name="BackwardPIDLength" value="BackwardCherenkov_length + ExtraTrackingEndcapN_length"/>
<comment> For detectors adjacent to beam pipe.</comment>
<constant name="ForwardPID_rmin" value="Beampipe_rmax + 10*mm"/>
<constant name="ForwardPID_rmin1" value="Beampipe_rmax + 80*mm"/>
<comment> Barrel PID thicknesses</comment>
- <comment> Note: ExtraPID has space for DIRC and optional uRWEL layers</comment>
- <constant name="BarrelExtraPIDThickness" value="14.0 * cm"/>
- <constant name="BarrelTRDThickness" value="1.0 * cm"/>
- <constant name="BarrelTOFThickness" value="1.0 * cm"/>
- <constant name="BarrelPIDThickness" value="BarrelExtraPIDThickness + BarrelTRDThickness + BarrelTOFThickness"/>
-
+ <comment> Note: PID has space for DIRC and optional uRWEL layers</comment>
+ <constant name="BarrelPIDThickness" value="20.0 * cm"/>
<documentation>
## Tracking Detector Parameters
@@ -359,13 +358,6 @@ Examples:
</documentation>
<constant name="BackwardTracking_length" value="7.5*cm"/>
- <documentation>
- ### GEM Tracker Parameters
- TODO: this section should be in the gem xml file
- </documentation>
- <constant name="ForwardTrackingGEMLength" value="ForwardTracking_length"/>
- <constant name="BackwardTrackingGEMLength" value="BackwardTracking_length"/>
-
<documentation>
## Vertex Tracker Parameters
</documentation>
@@ -392,11 +384,12 @@ Examples:
<documentation>
### Tracker Detector Parameters
+ TrackerBarrel_rmax: also the rmin for the barrel PID system (DIRC)
</documentation>
- <constant name="TrackerBarrel_rmin" value="VertexTrackingRegion_zmax"/>
- <constant name="TrackerBarrel_thickness" value="58.0*cm"/>
- <constant name="TrackerBarrel_rmax" value="TrackerBarrel_rmin + TrackerBarrel_thickness"/>
+ <constant name="TrackerBarrel_rmin" value="VertexTrackingRegion_rmax"/>
+ <constant name="TrackerBarrel_rmax" value="83.65*cm"/>
+ <constant name="TrackerBarrel_thickness" value="TrackerBarrel_rmax-TrackerBarrel_rmin"/>
<constant name="TrackerBarrel_length" value="VertexTrackingRegion_length + 2000.0*mm"/>
<constant name="TrackerBarrelInside_length" value="VertexTrackingRegion_length"/>
@@ -469,7 +462,7 @@ end of the solenoid coils.
<constant name="EcalBarrel_TotalThickness" value="40.0*cm"/>
<constant name="EcalEndcapP_zmin" value="BarrelTracking_length/2.0 + ForwardTracking_length + ForwardPIDLength"/>
- <constant name="EcalEndcapN_zmin" value="BarrelTracking_length/2.0 + BackwardTracking_length + BackwardPIDLength"/>
+ <constant name="EcalEndcapN_zmin" value="max(BarrelTracking_length/2.0 + BackwardTracking_length + BackwardPIDLength, SolenoidYokeEndcapN_zmin)"/>
<constant name="BarrelLength" value="BarrelTrackingAndPID_length" />
<constant name="Barrel_offset" value="(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0" />
diff --git a/compact/dirc.xml b/compact/dirc.xml
index 42deb8241349a0eba6be5d287d87cf10976c5b3a..d759866d2d903e8f702073d422b53e12f72b286e 100644
--- a/compact/dirc.xml
+++ b/compact/dirc.xml
@@ -14,6 +14,7 @@
<constant name="DIRC_offset" value="(CentralTracking_length - DIRC_length)/2.0"/>
<constant name="DIRC_rmin" value="83.65*cm"/>
+ <constant name="DIRC_rmin" value="TrackerBarrel_rmax"/>
<constant name="DIRCBars_DX" value="1.7*cm"/>
<constant name="DIRCBars_DY" value="42.*cm"/>
<constant name="DIRCNum" value="2*Pi*DIRC_rmin/DIRCBars_DY"/>
diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml
index ea30963e75c1977ea9530f4698f4f83c9ca76049..00357f9f0736e0d8d66235370dca0246d9b2e3bf 100644
--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -3,22 +3,28 @@
<comment> Endcap Tracker </comment>
<define>
- <constant name="GEMTrackerEndcap_zmin" value="BarrelTracking_zmax"/>
- <constant name="GEMTrackerEndcap_NLayers" value="1"/>
- <constant name="GEMTrackerEndcapFoilOpeningAngle" value="30.1*degree"/>
+ <constant name="GEMTrackerEndcapP_thickness" value="min(10.0*cm,ExtraTrackingEndcapP_length)" />
+ <constant name="GEMTrackerEndcapN_thickness" value="min(10.0*cm,ExtraTrackingEndcapN_length)" />
+ <constant name="GEMTrackerEndcapP_zmin" value="EcalEndcapP_zmin - GEMTrackerEndcapP_thickness"/>
+ <constant name="GEMTrackerEndcapN_zmin" value="EcalEndcapN_zmin - GEMTrackerEndcapN_thickness"/>
+ <constant name="GEMTrackerEndcapP_rmin" value="19*cm" />
+ <constant name="GEMTrackerEndcapN_rmin" value="15*cm" />
+ <constant name="GEMTrackerEndcapP_rmax" value="Solenoid_rmax - 0.5*cm" />
+ <constant name="GEMTrackerEndcapN_rmax" value="TrackerBarrel_rmax - 0.5*cm" />
+ <constant name="GEMTrackerEndcapOpeningAngle" value="30.4*degree"/>
+ <constant name="GEMTrackerEndcap_dz" value="15*mm" />
<comment>
____X2____
\ /
\ / Y (=z for the trd)
\_X1_/
</comment>
- <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="BarrelTracking_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))"/>
+ <constant name="GEMTrackerEndcapP_x1" value="2.0*GEMTrackerEndcapP_rmin*sin(GEMTrackerEndcapOpeningAngle/2.0)"/>
+ <constant name="GEMTrackerEndcapP_x2" value="2.0*GEMTrackerEndcapP_rmax*sin(GEMTrackerEndcapOpeningAngle/2.0)"/>
+ <constant name="GEMTrackerEndcapP_y" value="GEMTrackerEndcapP_rmax*cos(GEMTrackerEndcapOpeningAngle/2.0) - GEMTrackerEndcapP_rmin"/>
+ <constant name="GEMTrackerEndcapN_x1" value="2.0*GEMTrackerEndcapN_rmin*sin(GEMTrackerEndcapOpeningAngle/2.0)"/>
+ <constant name="GEMTrackerEndcapN_x2" value="2.0*GEMTrackerEndcapN_rmax*sin(GEMTrackerEndcapOpeningAngle/2.0)"/>
+ <constant name="GEMTrackerEndcapN_y" value="GEMTrackerEndcapN_rmax*cos(GEMTrackerEndcapOpeningAngle/2.0) - GEMTrackerEndcapN_rmin"/>
<comment>
Needs implimentation:
@@ -37,10 +43,10 @@
<comment> Account for the fact that GEMs have holes, so they are not solid volumes </comment>
<constant name="GEMAreaFactor" value="0.80" />
<comment>
- From https://github.com/eic/EicToyModel/blob/master/source/eicroot/GemGeoParData.cxx
+ From https://github.com/eic/EicToyModel/blob/master/source/eicroot/GEMGeoParData.cxx
// FIXME: put aluminum layer later as well),
- mEntranceWindowMaterial ( "GemKapton"),
+ mEntranceWindowMaterial ( "GEMKapton"),
mEntranceWindowThickness ( 50.0 * etm::um),
// Use evaristo.pdf p.10 for the foil parameters:
@@ -49,16 +55,16 @@
// - readout foils : 30um kapton + 3um copper total)
mDriftFoilKaptonThickness ( 50.0 * etm::um),
mDriftFoilCopperThickness ( 3.0 * etm::um),
- mGemFoilAreaFraction ( 0.80),
- mGemFoilKaptonThickness ( 30.0 * etm::um),
- mGemFoilCopperThickness ( 3.0 * etm::um),
+ mGEMFoilAreaFraction ( 0.80),
+ mGEMFoilKaptonThickness ( 30.0 * etm::um),
+ mGEMFoilCopperThickness ( 3.0 * etm::um),
mReadoutG10Thickness ( 0.0 * etm::mm),
mReadoutKaptonThickness ( 30.0 * etm::um),
mReadoutCopperThickness ( 3.0 * etm::um),
// 3mm thick Nomex honeycomb for SBS GEMs),
- mReadoutSupportMaterial ( "GemNomex"),
+ mReadoutSupportMaterial ( "GEMNomex"),
mReadoutSupportThickness ( 3.0 * etm::mm),
mEntranceRegionLength ( 3.0 * etm::mm),
@@ -81,29 +87,32 @@
<detectors>
<detector
- id="GEMTrackerEndcap_ID"
- name="GEMTrackerEndcap"
+ id="GEMTrackerEndcapP_ID"
+ name="GEMTrackerEndcapP"
type="athena_GEMTrackerEndcap"
readout="GEMTrackerEndcapHits"
vis="AnlRed"
reflect="false">
- <module name="GEMModule1" vis="AnlProcess_Blue">
- <trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
+ <module name="GEMModule1" vis="TrackerLayerVis">
+ <trd x1="GEMTrackerEndcapP_x1/2.0" x2="GEMTrackerEndcapP_x2/2.0" z="GEMTrackerEndcapP_y/2"/>
+ <comment>
+ Frame disabled as it gives issue with the ACTS geometry conversion
<frame material="G10" thickness="GEMTrackerEndcapFrame_thickness" vis="TrackerSupportVis">
<position x="0" y="0" z="0" />
- <trd x1="GEMTrackerEndcapFoilX1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- x2="GEMTrackerEndcapFoilX2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- z="GEMTrackerEndcapFoilY/2 - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
+ <trd x1="GEMTrackerEndcapP_x1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapOpeningAngle)
+ + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapOpeningAngle)"
+ x2="GEMTrackerEndcapP_x2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapOpeningAngle)
+ - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapOpeningAngle)"
+ z="GEMTrackerEndcapP_y/2 - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
<position x="0" y="0" z="0" />
</trd>
</frame>
+ </comment>
<comment> Going from HV side to readout side</comment>
- <module_component thickness="25.0*um" material="Mylar" name="entrance_window"/>
- <module_component thickness=" 2.0*mm" material="Ar10CO2" name="entrance_region" />
+ <module_component thickness="25.0*um" material="Mylar" name="entrance_window" vis="TrackerLayerVis"/>
+ <module_component thickness=" 2.0*mm" material="Ar10CO2" name="entrance_region" />
<module_component thickness="50.0*um" material="Kapton" name="cathode_foil"/>
- <module_component thickness=" 5.0*um" material="Copper" name="cathode_cu"/>
+ <module_component thickness=" 5.0*um" material="Copper" name="cathode_cu"/>
<module_component thickness=" 3.0*mm" material="Ar10CO2" sensitive="true" name="drift_region" vis="AnlProcess_Blue"/>
<module_component thickness="GEMAreaFactor*50.0*um" material="Kapton" name="gem_foil_1"/>
<module_component thickness="GEMAreaFactor*10.0*um" material="Copper" name="gem_foil_1_cu"/>
@@ -115,42 +124,28 @@
<module_component thickness="GEMAreaFactor*10.0*um" material="Copper" name="gem_foil_3_cu"/>
<module_component thickness=" 2.0*mm" material="Ar10CO2" name="induction_region"/>
<module_component thickness="50.0*um" material="Kapton" name="readout_foil"/>
- <module_component thickness=" 5.0*um" material="Copper" name="readout_cu"/>
- <module_component thickness=" 2.0*mm" material="Ar10CO2" name="exit_region"/>
- <module_component thickness="25.0*um" material="Mylar" name="exit_window"/>
- </module>
- <module name="GEMSupportModule1" vis="AnlProcess_Blue">
- <trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
- <frame material="G10" thickness="GEMTrackerEndcapFrame_thickness" vis="TrackerSupportVis">
- <position x="0" y="0" z="0" />
- <trd x1="GEMTrackerEndcapFoilX1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- x2="GEMTrackerEndcapFoilX2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- z="GEMTrackerEndcapFoilY/2 - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
- <position x="0" y="0" z="0" />
- </trd>
- </frame>
+ <module_component thickness=" 5.0*um" material="Copper" name="readout_cu"/>
+ <module_component thickness=" 2.0*mm" material="Ar10CO2" name="exit_region"/>
+ <module_component thickness="25.0*um" material="Mylar" name="exit_window" vis="TrackerLayerVis"/>
</module>
- <module name="GEMSupportModule2" vis="AnlProcess_Blue">
- <trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapFoilY/2"/>
- <module_component thickness="1.0*mm" material="Mylar"/>
+ <module name="GEMSupportSpokes" vis="TrackerSupportVis">
+ <trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapP_y/2"/>
+ <module_component thickness="1.0*mm" material="Mylar" vis="TrackerSupportVis"/>
</module>
<layer id="1" >
+ <envelope vis="AnlRed"
+ rmin = "GEMTrackerEndcapP_rmin"
+ rmax = "GEMTrackerEndcapP_rmax"
+ length="GEMTrackerEndcapP_thickness"
+ zstart="GEMTrackerEndcapP_zmin" />
<ring vis="AnlRed" module="GEMModule1"
- r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
- zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
- nmodules="12" dz="10 * mm" />
- <!--
- <ring vis="AnlRed" module="GEMSupportModule1"
- r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
- zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
- nmodules="12" dz="10 * mm"/>
- -->
- <ring vis="AnlBlue" phi0="15.0*degree" module="GEMSupportModule2"
- r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
- zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
- nmodules="12" dz="0 * mm" />
+ r="GEMTrackerEndcapP_rmin+GEMTrackerEndcapP_y/2.0"
+ zstart="0"
+ nmodules="12" dz="GEMTrackerEndcap_dz" />
+ <ring vis="AnlBlue" phi0="GEMTrackerEndcapOpeningAngle/2." module="GEMSupportSpokes"
+ r="GEMTrackerEndcapP_rmin+GEMTrackerEndcapP_y/2.0"
+ zstart="0"
+ nmodules="12" dz="0*mm" />
</layer>
</detector>
@@ -161,23 +156,26 @@
readout="GEMTrackerEndcapHits"
vis="AnlRed"
reflect="true">
- <module name="GEMModule1" vis="AnlProcess_Blue">
- <trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
+ <module name="GEMModule1" vis="TrackerLayerVis">
+ <trd x1="GEMTrackerEndcapN_x1/2.0" x2="GEMTrackerEndcapN_x2/2.0" z="GEMTrackerEndcapN_y/2"/>
+ <comment>
+ Frame disabled as it gives issue with the ACTS geometry conversion
<frame material="G10" thickness="GEMTrackerEndcapFrame_thickness" vis="TrackerSupportVis">
<position x="0" y="0" z="0" />
- <trd x1="GEMTrackerEndcapFoilX1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- x2="GEMTrackerEndcapFoilX2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- z="GEMTrackerEndcapFoilY/2 - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
+ <trd x1="GEMTrackerEndcapN_x1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapOpeningAngle)
+ + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapOpeningAngle)"
+ x2="GEMTrackerEndcapN_x2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapOpeningAngle)
+ - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapOpeningAngle)"
+ z="GEMTrackerEndcapN_y/2 - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
<position x="0" y="0" z="0" />
</trd>
</frame>
+ </comment>
<comment> Going from HV side to readout side</comment>
- <module_component thickness="25.0*um" material="Mylar" name="entrance_window"/>
- <module_component thickness=" 2.0*mm" material="Ar10CO2" name="entrance_region" />
+ <module_component thickness="25.0*um" material="Mylar" name="entrance_window"/>
+ <module_component thickness=" 2.0*mm" material="Ar10CO2" name="entrance_region" />
<module_component thickness="50.0*um" material="Kapton" name="cathode_foil"/>
- <module_component thickness=" 5.0*um" material="Copper" name="cathode_cu"/>
+ <module_component thickness=" 5.0*um" material="Copper" name="cathode_cu"/>
<module_component thickness=" 3.0*mm" material="Ar10CO2" sensitive="true" name="drift_region" vis="AnlProcess_Blue"/>
<module_component thickness="GEMAreaFactor*50.0*um" material="Kapton" name="gem_foil_1"/>
<module_component thickness="GEMAreaFactor*10.0*um" material="Copper" name="gem_foil_1_cu"/>
@@ -189,44 +187,35 @@
<module_component thickness="GEMAreaFactor*10.0*um" material="Copper" name="gem_foil_3_cu"/>
<module_component thickness=" 2.0*mm" material="Ar10CO2" name="induction_region"/>
<module_component thickness="50.0*um" material="Kapton" name="readout_foil"/>
- <module_component thickness=" 5.0*um" material="Copper" name="readout_cu"/>
- <module_component thickness=" 2.0*mm" material="Ar10CO2" name="exit_region"/>
- <module_component thickness="25.0*um" material="Mylar" name="exit_window"/>
- </module>
- <module name="GEMSupportModule1" vis="AnlProcess_Blue">
- <trd x1="GEMTrackerEndcapFoilX1/2.0" x2="GEMTrackerEndcapFoilX2/2.0" z="GEMTrackerEndcapFoilY/2"/>
- <frame material="G10" thickness="GEMTrackerEndcapFrame_thickness" vis="TrackerSupportVis">
- <position x="0" y="0" z="0" />
- <trd x1="GEMTrackerEndcapFoilX1/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- + GEMTrackerEndcapFrameBotEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- x2="GEMTrackerEndcapFoilX2/2.0 - GEMTrackerEndcapFrameSideEdge_width/cos(GEMTrackerEndcapFoilOpeningAngle)
- - GEMTrackerEndcapFrameTopEdge_width*tan(GEMTrackerEndcapFoilOpeningAngle)"
- z="GEMTrackerEndcapFoilY/2 - (GEMTrackerEndcapFrameBotEdge_width +GEMTrackerEndcapFrameTopEdge_width)/2.0 ">
- <position x="0" y="0" z="0" />
- </trd>
- </frame>
+ <module_component thickness=" 5.0*um" material="Copper" name="readout_cu"/>
+ <module_component thickness=" 2.0*mm" material="Ar10CO2" name="exit_region"/>
+ <module_component thickness="25.0*um" material="Mylar" name="exit_window"/>
</module>
- <module name="GEMSupportModule2" vis="AnlProcess_Blue">
- <trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapFoilY/2"/>
- <module_component thickness="1.0*mm" material="Mylar"/>
+ <module name="GEMSupportSpokes" vis="TrackerSupportVis">
+ <trd x1="GEMTrackerEndcapFrameSideEdge_width" x2="GEMTrackerEndcapFrameSideEdge_width" z="GEMTrackerEndcapN_y/2"/>
+ <module_component thickness="1.0*mm" material="Mylar" vis="TrackerSupportVis"/>
</module>
<layer id="1" >
+ <envelope vis="AnlRed"
+ rmin = "GEMTrackerEndcapN_rmin"
+ rmax = "GEMTrackerEndcapN_rmax"
+ length="GEMTrackerEndcapN_thickness"
+ zstart="GEMTrackerEndcapN_zmin" />
<ring vis="AnlRed" module="GEMModule1"
- r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
- zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
- nmodules="12" dz="10 * mm" />
- <ring vis="AnlBlue" phi0="15.0*degree" module="GEMSupportModule2"
- r="GEMTrackerEndcapFoil_rmin+GEMTrackerEndcapFoilY/2.0"
- zstart="GEMTrackerEndcap_zmin + 0.5*GEMTrackerEndcapLayer_thickness"
- nmodules="12" dz="0 * mm" />
+ r="GEMTrackerEndcapN_rmin+GEMTrackerEndcapN_y/2.0"
+ zstart="0.1"
+ nmodules="12" dz="GEMTrackerEndcap_dz" />
+ <ring vis="AnlBlue" phi0="GEMTrackerEndcapOpeningAngle/2." module="GEMSupportSpokes"
+ r="GEMTrackerEndcapN_rmin+GEMTrackerEndcapN_y/2.0"
+ zstart="0.1"
+ nmodules="12" dz="0*mm" />
</layer>
</detector>
-
</detectors>
<readouts>
<readout name="GEMTrackerEndcapHits">
- <segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
+ <segmentation type="CartesianGridXZ" grid_size_x="50*um" grid_size_z="250*um" />
<id>system:8,barrel:2,layer:4,module:12,sensor:2,x:32:-16,y:-16</id>
</readout>
</readouts>
diff --git a/compact/tracking_config_silicon.xml b/compact/tracking_config_accadia.xml
similarity index 84%
rename from compact/tracking_config_silicon.xml
rename to compact/tracking_config_accadia.xml
index 8860011b141ecf3e88bc8a15573d864e97253b2c..03b4fdaf9bada6cbe7103b3a34322b660809f788 100644
--- a/compact/tracking_config_silicon.xml
+++ b/compact/tracking_config_accadia.xml
@@ -11,7 +11,7 @@
<include ref="vertex_tracker.xml"/>
<include ref="central_tracker.xml"/>
- <include ref="tof.xml"/>
+ <include ref="gem_tracker_endcap.xml"/>
</lccdd>