diff --git a/athena.xml b/athena.xml
index 9edd47480f6fcf30746c47ee7e54c0573e5fecee..69168a33e6604e2e465b7a734c75eefb4993def3 100644
--- a/athena.xml
+++ b/athena.xml
@@ -172,7 +172,7 @@
<documentation level="10">
### PID detectors
</documentation>
- <!--include ref="compact/dirc.xml"/-->
+ <include ref="compact/dirc.xml"/>
<include ref="compact/mrich.xml"/>
<!--include ref="compact/forward_trd.xml"/-->
<include ref="compact/drich.xml"/>
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 9f96a84be61a6c0c3547512bb617e0d40754f98b..1490d9c4f73dd2cf44ae620596e59ef301955cc2 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -323,27 +323,20 @@ Examples:
### PID Detector Region Parameters
</documentation>
- <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="ForwardPID_length" value="180.0*cm"/>
+ <constant name="ForwardTracking_length" value="25.0*cm"/>
+ <constant name="ForwardPID_rmin1" value="Beampipe_rmax + 80*mm"/>
+ <constant name="ForwardPID_rmin2" value="19.0*cm"/>
- <constant name="BackwardCherenkov_rmax" value="100.0*cm"/>
- <constant name="BackwardCherenkov_length" value="40.0*cm"/>
- <constant name="ExtraTrackingEndcapN_length" value="5.0*cm"/>
- <constant name="BackwardTOF_length" value="0.0*cm"/>
+ <!--constant name="BackwardPID_rmax" value="83.65*cm"/-->
+ <constant name="BackwardPID_rmax" value="95.*cm"/>
+ <constant name="BackwardPID_length" value="40.0*cm"/>
+ <constant name="BackwardTracking_length" value="10.0*cm"/>
+ <constant name="BackwardTOF_length" value="0.0*cm"/>
- <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: PID has space for DIRC and optional uRWEL layers</comment>
- <constant name="BarrelPIDThickness" value="20.0 * cm"/>
+ <constant name="BarrelPIDThickness" value="10.0 * cm"/>
+
<documentation>
## Tracking Detector Parameters
@@ -351,12 +344,6 @@ Examples:
Generic tracking space allocations
</documentation>
- <constant name="ForwardTracking_length" value="25.0*cm"/>
- <documentation>
- `BackwardTracking_length` and `ForwardTracking_length` compensate for the asymmetry of the setup
- </documentation>
- <constant name="BackwardTracking_length" value="7.5*cm"/>
-
<documentation>
## Vertex Tracker Parameters
</documentation>
@@ -387,7 +374,7 @@ Examples:
</documentation>
<constant name="TrackerBarrel_rmin" value="VertexTrackingRegion_rmax"/>
- <constant name="TrackerBarrel_rmax" value="83.65*cm"/>
+ <constant name="TrackerBarrel_rmax" value="BackwardPID_rmax"/>
<constant name="TrackerBarrel_thickness" value="TrackerBarrel_rmax-TrackerBarrel_rmin"/>
<constant name="TrackerBarrel_length" value="VertexTrackingRegion_length + 2000.0*mm"/>
@@ -395,6 +382,13 @@ Examples:
<constant name="TrackerBarrelInside_zmax" value="TrackerBarrelInside_length/2.0"/>
<constant name="TrackerBarrel_zmax" value="TrackerBarrel_length/2.0"/>
+ <documentation>
+ `TrackerBarrelForwardPadding` and `TrackerBarrelBackwardPadding` compensate for the asymmetry of the setup
+ </documentation>
+ <constant name="TrackerBarrelForwardPadding" value="25.0*cm"/>
+ <constant name="TrackerBarrelBackwardPadding" value="7.5*cm"/>
+
+
<comment> Deprecated
constant name="SiliconTrackerInnerRadius" value="TrackerBarrel_rmin"
constant name="SiliconTrackerInnerBarrelLength" value="TrackerBarrelInner_length"
@@ -415,16 +409,22 @@ The central tracking detectors are assumed to be symmtric about the origin.
<constant name="BarrelTracking_rmax" value="TrackerBarrel_rmax"/>
<constant name="BarrelTracking_zmax" value="BarrelTracking_length/2.0"/>
- <constant name="BarrelTrackingAndPID_length" value="BarrelTracking_length "/>
+ <constant name="BarrelTrackingAndPID_length" value="BarrelTracking_length"/>
<constant name="BarrelTrackingAndPID_rmax" value="BarrelTracking_rmax + BarrelPIDThickness"/>
- <constant name="CentralTracking_length" value="BarrelTracking_length + ForwardTracking_length + BackwardTracking_length"/>
+ <constant name="CentralTracking_length" value="BarrelTracking_length + TrackerBarrelForwardPadding + TrackerBarrelBackwardPadding"/>
<constant name="CentralTracking_rmax" value="TrackerBarrel_rmax"/>
+ <constant name="CentralTrackingHalfN_length" value="BarrelTracking_length/2. + TrackerBarrelBackwardPadding"/>
+ <constant name="CentralTrackingHalfP_length" value="BarrelTracking_length/2. + TrackerBarrelForwardPadding"/>
<comment> These are used by ddsim </comment>
<constant name="tracker_region_rmax" value="CentralTracking_rmax"/>
<constant name="tracker_region_zmax" value="CentralTracking_length/2.0"/>
+ <comment> Total length of the endcap detectors</comment>
+ <constant name="BackwardInnerEndcap_length" value="BackwardPID_length + BackwardTracking_length"/>
+ <constant name="ForwardInnerEndcap_length" value="ForwardPID_length + ForwardTracking_length"/>
+
<documentation level="3">
## Calorimeter Parameters
@@ -439,7 +439,7 @@ the solenoid inner diameter/length and by the central tracking and PID outer dia
### Endcaps
-The extra HCal endcap lengths are for offsetting the outside endcap surface (zmax) from the
+The extra endcap lengths are for offsetting the outside endcap surface (zmax) from the
end of the solenoid coils.
</documentation>
@@ -448,11 +448,11 @@ end of the solenoid coils.
<constant name="EcalEndcapPSolenoid_offset" value="800.0*mm" />
<constant name="EcalEndcapNSolenoid_offset" value="-100.0*mm" />
- <constant name="HcalEndcapPExtra_length" value="40.0*cm"/>
- <constant name="HcalEndcapNExtra_length" value="0.0*cm"/>
+ <constant name="EndcapPExtra_length" value="40.0*cm"/>
+ <constant name="EndcapNExtra_length" value="0.0*cm"/>
- <constant name="SolenoidYokeEndcapP_zmin" value="Solenoid_length/2.0 + Solenoid_offset + HcalEndcapPExtra_length"/>
- <constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset + HcalEndcapNExtra_length"/>
+ <constant name="SolenoidYokeEndcapP_zmin" value="Solenoid_length/2.0 + Solenoid_offset + EndcapPExtra_length"/>
+ <constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset + EndcapNExtra_length"/>
<constant name="EcalBarrel_rmin" value="BarrelTrackingAndPID_rmax + 35.0 * mm"/>
<constant name="Barrel_rmax" value="Solenoid_rmin - 1.0 *cm "/>
@@ -460,21 +460,25 @@ 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="max(BarrelTracking_length/2.0 + BackwardTracking_length + BackwardPIDLength, SolenoidYokeEndcapN_zmin)"/>
+ <constant name="EcalEndcapP_zmin" value="CentralTrackingHalfP_length + ForwardInnerEndcap_length"/>
+ <constant name="EcalEndcapN_zmin" value="max(CentralTrackingHalfN_length+ BackwardInnerEndcap_length, SolenoidYokeEndcapN_zmin)"/>
<constant name="BarrelLength" value="BarrelTrackingAndPID_length" />
<constant name="Barrel_offset" value="(EcalEndcapP_zmin-EcalEndcapN_zmin)/2.0" />
+
<documentation>
### Ecal Endcaps
</documentation>
+ <comment>
+ Unused, TBD
+ </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="0.8"/> <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="EndcapP_CalDivide" value="0.8"/> <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="EcalEndcapP_length" value="40*cm"/>
@@ -486,7 +490,8 @@ end of the solenoid coils.
EcalEndcapP_rmin and EcalEndcapN_rmin need to be set in sync with the forward and backward detectors
</documentation>
<constant name="EcalEndcapP_rmin" value="200.0*mm"/>
- <constant name="EcalEndcapN_rmin" value="100.0*mm"/>
+ <constant name="EcalEndcapN_rmin" value="5*cm"/>
+ <constant name="EcalEndcapN_rmax" value="BarrelTracking_rmax"/>
<constant name="HcalEndcapP_rmin" value="EcalEndcapP_rmin"/>
<constant name="HcalEndcapN_rmin" value="EcalEndcapN_rmin"/>
@@ -548,12 +553,12 @@ The logic goes like this:
<constant name="EcalEndcapNLayer3_NRepeat" value="EcalEndcapNLayers"/>
<comment> EM Endcap Thickness </comment>
- <constant name="EcalEndcapPThickness"
- value="EcalEndcapPLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapPLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapPLayer3_NRepeat*EcalLayer3_thickness "/>
- <constant name="EcalEndcapNThickness"
- value="EcalEndcapNLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapNLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapNLayer3_NRepeat*EcalLayer3_thickness"/>
+ <!--constant name="EcalEndcapPThickness"
+ value="EcalEndcapPLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapPLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapPLayer3_NRepeat*EcalLayer3_thickness "/-->
+ <!--constant name="EcalEndcapNThickness"
+ value="EcalEndcapNLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapNLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapNLayer3_NRepeat*EcalLayer3_thickness"/-->
- <constant name="EcalBarrel_length" value="CentralTracking_length + BackwardPIDLength + EcalEndcapNThickness - 10*cm"/>
+ <constant name="EcalBarrel_length" value="CentralTracking_length + BackwardInnerEndcap_length + EcalEndcapN_length"/>
<constant name="EcalBarrel_offset" value="(CentralTracking_length - EcalBarrel_length)/2.0"/>
<documentation>
@@ -570,7 +575,11 @@ The logic goes like this:
<constant name="HcalBarrelAvailThickness" value="HcalBarrel_thickness"/>
<constant name="HcalEndcapP_zmin" value="max(EcalEndcapP_zmin + EcalEndcapP_length, Solenoid_length / 2.0 + Solenoid_offset) "/>
- <constant name="HcalEndcapN_zmin" value="max(EcalEndcapN_zmin + EcalEndcapN_length, Solenoid_length / 2.0 - Solenoid_offset) "/>
+ <!--constant name="HcalEndcapN_zmin" value="max(EcalEndcapN_zmin + EcalEndcapN_length, Solenoid_length / 2.0 - Solenoid_offset) "/-->
+ <comment> Hard coded for now, but we really need to fix the parametrization...</comment>
+ <comment> Note: we can go up to 350cm here for 1m thick hcal</comment>
+ <constant name="HcalEndcapN_zmin" value="300*cm"/>
+
<constant name="HcalBarrelLength" value="HcalEndcapP_zmin + HcalEndcapN_zmin "/>
<documentation>
@@ -602,6 +611,10 @@ The logic goes like this:
<constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
<constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
+ <comment> Special DIRC parameters </comment>
+ <constant name="DIRCFull_length" value="max(CentralTracking_length + BackwardInnerEndcap_length + EcalEndcapN_length, EcalBarrel_length) + 50*cm"/>
+ <constant name="DIRCExtra_offset" value="-5*cm"/>
+
</define>
diff --git a/compact/dirc.xml b/compact/dirc.xml
index b5f21f7a5fdb6c3cf649b568c7c01bb63f3c5e3b..9b69c1afce9ab5b6f0afe7cc204dffc83f7c6935 100644
--- a/compact/dirc.xml
+++ b/compact/dirc.xml
@@ -21,9 +21,7 @@
</comment>
<define>
- <constant name="DIRC_length" value="CentralTracking_length + BackwardPIDLength"/>
- <constant name="DIRC_offset" value="(CentralTracking_length - DIRC_length)/2.0"/>
- <constant name="DIRC_rmin" value="83.65*cm"/>
+ <constant name="DIRC_rmin" value="BarrelTracking_rmax-11*cm"/>
<constant name="DIRC_rotation" value="pi" comment="Allows DIRC flip"/>
<!-- <constant name="cb_DIRC_length" value="DIRCLength"/> -->
<!-- CLEANUP THIS if not sure. This is from the initial implementation
@@ -38,6 +36,10 @@
<constant name="DIRCPrism_long_edge" value="DIRCPrism_short_edge + DIRCPrism_length * tan(DIRCPrism_angle)"/>
<constant name="DIRCPrism_height" value="DIRCPrism_long_edge"/>
+ <!-- DIRC length -->
+ <constant name="DIRC_length" value="DIRCFull_length - DIRCPrism_length"/>
+ <constant name="DIRC_offset" value="(CentralTracking_length - DIRC_length)/2.0 - DIRCExtra_offset"/>
+
<!-- Box - main DIRC modules -->
<constant name="DIRCBox_count" value="16" comment="Number of DIRC boxes per... DIRC. 16 - default"/>
<constant name="DIRCBox_width" value="DIRCPrism_width"/>
diff --git a/compact/drich.xml b/compact/drich.xml
index a7051d238468c48f8261e9a20f317a5cd479e411..d6ccfe05c38f69132a297c5b14038ab6e41bd30c 100644
--- a/compact/drich.xml
+++ b/compact/drich.xml
@@ -10,7 +10,7 @@
<constant name="DRICH_f4a_length" value="161.0*cm"/> <!-- z-length of fun4all design -->
<!-- vessel (=snout+tank) geometry -->
<constant name="DRICH_zmin" value="BarrelTracking_length/2.0 + ForwardTracking_length "/> <!-- vessel front -->
- <constant name="DRICH_Length" value="ForwardRICH_length"/> <!-- overall vessel length (including snout) -->
+ <constant name="DRICH_Length" value="ForwardPID_length"/> <!-- overall vessel length (including snout) -->
<constant name="DRICH_rmin0" value="ForwardPID_rmin1"/> <!-- bore radius at dRICh vessel frontplane -->
<constant name="DRICH_rmin1" value="19.0*cm"/> <!-- bore radius at dRICh vessel backplane -->
<constant name="DRICH_wall_thickness" value="0.5*cm"/> <!-- thickness of radial walls -->
diff --git a/compact/ecal_barrel_interlayers.xml b/compact/ecal_barrel_interlayers.xml
index b92259a300324f2c216503a3695c44344f38c13b..032562dd70abeed4da8bfc9ceb094e78634a993b 100644
--- a/compact/ecal_barrel_interlayers.xml
+++ b/compact/ecal_barrel_interlayers.xml
@@ -124,7 +124,8 @@
sensitive="yes"
radius="EcalBarrel_FiberRadius"
spacing_x="EcalBarrel_FiberXSpacing"
- spacing_z="EcalBarrel_FiberZSpacing">
+ spacing_z="EcalBarrel_FiberZSpacing"
+ vis="EcalBarrelFiberLayerVis">
</fiber>
</slice>
<slice material="CarbonFiber" thickness="EcalBarrel_CarbonThickness" vis="EcalBarrelSliceVis"/>
@@ -139,7 +140,8 @@
sensitive="yes"
radius="EcalBarrel_FiberRadius"
spacing_x="EcalBarrel_FiberXSpacing"
- spacing_z="EcalBarrel_FiberZSpacing">
+ spacing_z="EcalBarrel_FiberZSpacing"
+ vis="EcalBarrelFiberLayerVis">
</fiber>
</slice>
</layer>
diff --git a/compact/gem_tracker_endcap.xml b/compact/gem_tracker_endcap.xml
index 0752cfb9a9de62a0f7aacdba30ae17341ff011a0..d8497045a29d586d41f6ccf27212bff8ba1ec1cd 100644
--- a/compact/gem_tracker_endcap.xml
+++ b/compact/gem_tracker_endcap.xml
@@ -3,8 +3,8 @@
<comment> Endcap Tracker </comment>
<define>
- <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_thickness" value="min(10.0*cm,ForwardTracking_length)" />
+ <constant name="GEMTrackerEndcapN_thickness" value="min(10.0*cm,BackwardTracking_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" />
diff --git a/compact/hybrid_ecal.xml b/compact/hybrid_ecal.xml
index d53ced04a9bd23e6340926fc9e986d885ad6aa22..35726050e966f468e5ecb008c40fc16e2487582f 100644
--- a/compact/hybrid_ecal.xml
+++ b/compact/hybrid_ecal.xml
@@ -34,8 +34,6 @@
<constant name="GlassModule_wrap" value="2*CrystalModule_wrap"/>
<constant name="GlassModule_z0" value="0.0*cm"/>
- <constant name="EcalEndcapN_rmax" value="80*cm"/>
- <constant name="EcalEndcapN_rmin" value="5*cm"/>
<constant name="EcalEndcapN_thickness" value="GlassModule_length"/>
<constant name="EcalEndcapN_z0" value="-EcalEndcapN_zmin - EcalEndcapN_thickness/2"/>
<constant name="EcalEndcapNCrystal_rmax" value="40*cm"/>
diff --git a/compact/mrich.xml b/compact/mrich.xml
index 7a8e34b62a09404bc0f8dda9d9f77a126a21f110..a7270fb6f101314e2b1884a8fed89bfb3458a2ca 100644
--- a/compact/mrich.xml
+++ b/compact/mrich.xml
@@ -2,9 +2,9 @@
<comment> MRICH </comment>
<define>
<constant name="MRICH_rmin" value="10*cm"/>
- <constant name="MRICH_rmax" value="BackwardCherenkov_rmax"/>
- <constant name="MRICH_length" value="BackwardCherenkov_length"/>
- <constant name="MRICH_zmin" value="BarrelTracking_length/2.0 + BackwardTracking_length"/>
+ <constant name="MRICH_rmax" value="BackwardPID_rmax"/>
+ <constant name="MRICH_length" value="BackwardPID_length"/>
+ <constant name="MRICH_zmin" value="CentralTrackingHalfN_length"/>
<constant name="MRICHAerogel_thickness" value="30.0*mm"/>
<constant name="MRICHAerogel_width" value="126.5*mm"/>
@@ -116,7 +116,7 @@
<position x=" 96.0250000001" y="590.7250000003"/>
<position x="233.3750000002" y="590.7250000003"/>
<position x="370.7250000003" y="590.7250000003"/>
- <position x="508.0750000004" y="590.7250000003"/>
+ <!--position x="508.0750000004" y="590.7250000003"/-->
<position x="508.0750000004" y="178.6750000000"/>
<position x="508.0750000004" y="316.0250000001"/>
<position x="508.0750000004" y="453.3750000002"/>
@@ -124,11 +124,11 @@
<positions scale="1.09">
<position x="-41.3250000000" y="728.0750000004"/>
<position x=" 96.0250000001" y="728.0750000004"/>
- <position x="233.3750000002" y="728.0750000004"/>
+ <!--position x="233.3750000002" y="728.0750000004"/-->
<!--position x="370.7250000003" y="728.0750000004"/-->
<!--position x="508.0750000004" y="728.0750000004"/-->
<!--position x="645.4250000005" y="590.7250000003"/-->
- <position x="645.4250000005" y="453.3750000002"/>
+ <!--position x="645.4250000005" y="453.3750000002"/-->
<position x="645.4250000005" y="316.0250000001"/>
<position x="645.4250000005" y="178.6750000000"/>
</positions>
@@ -136,7 +136,7 @@
<!--position x="-41.3250000000" y="865.4250000005"/-->
<!--position x=" 96.0250000001" y="865.4250000005"/-->
<!--position x="233.3750000002" y="865.4250000005"/-->
- <position x="782.7750000006" y="178.6750000000"/>
+ <!--position x="782.7750000006" y="178.6750000000"/-->
<!--position x="782.7750000006" y="316.0250000001"/-->
<!--position x="782.7750000006" y="453.3750000002"/-->
</positions>
diff --git a/compact/subsystem_views/dirc_only.xml b/compact/subsystem_views/dirc_only.xml
index 7e1783ee5aef938ee6e7c97a3cf5d262c14b8313..251b7f57e848cdaee079d19a0727821b46bc0301 100644
--- a/compact/subsystem_views/dirc_only.xml
+++ b/compact/subsystem_views/dirc_only.xml
@@ -133,46 +133,9 @@
</detectors>
-<!-- <include ref="compact/vertex_tracker.xml"/>-->
-
-<!-- <include ref="compact/central_tracker.xml"/>-->
-
-<!-- <include ref="compact/tof_barrel.xml"/>-->
-<!-- <include ref="compact/tof_endcap.xml"/>-->
-
- <!--include ref="compact/rwell_tracker_barrel.xml"-->
<include ref="compact/dirc.xml"/>
- <!-- When changing magnet, also select dimensions in definitions.xml. -->
-<!-- <include ref="compact/solenoid.xml"/>-->
-
-<!-- <include ref="compact/ci_ecal.xml"/>-->
- <!--<include ref="compact/ci_ecal_shashlik.xml"/>-->
- <!--<include ref="compact/ce_ecal.xml"/>-->
-<!-- <include ref="compact/ce_ecal_crystal_glass.xml"/>-->
- <!-- <include ref="compact/ecal_barrel.xml"/> -->
- <!-- <include ref="compact/ecal_barrel_hybrid.xml"/> -->
-<!-- <include ref="compact/ecal_barrel_interlayers.xml"/>-->
-
-<!-- <include ref="compact/hcal.xml"/>-->
-
- <!--include ref="compact/ce_GEM.xml"/-->
- <!--include ref="compact/gem_tracker_endcap.xml"/-->
- <!--include ref="compact/mrich.xml"/-->
-<!-- <include ref="compact/forward_trd.xml"/>-->
-<!-- <include ref="compact/gaseous_rich.xml"/>-->
-
-<!-- <include ref="ip6/B0_tracker.xml"/>-->
-<!-- <include ref="ip6/far_forward_offM_tracker.xml"/>-->
-<!-- <include ref="ip6/far_forward_romanpots.xml"/>-->
-<!-- <include ref="ip6/far_forward_detectors.xml"/>-->
-
- <!--
- <include ref="compact/mm_tracker_barrel.xml"/>
- <include ref="compact/cb_VTX_Barrel.xml"/>
- -->
-
<readouts>
</readouts>
diff --git a/compact/subsystem_views/pid_only.xml b/compact/subsystem_views/pid_only.xml
index baa45851f49bb29bdd6fd6b4f7580ea68e0f88d0..8917782d142bc8dc7d555b7818d7e09075d76c1d 100644
--- a/compact/subsystem_views/pid_only.xml
+++ b/compact/subsystem_views/pid_only.xml
@@ -163,9 +163,9 @@
PID detectors
-------------
</comment>
- <!--include ref="compact/dirc.xml"/-->
- <!--include ref="compact/mrich.xml"/-->
- <include ref="compact/gaseous_rich.xml"/>
+ <include ref="compact/dirc.xml"/>
+ <include ref="compact/mrich.xml"/>
+ <include ref="compact/drich.xml"/>
<comment>
diff --git a/compact/subsystem_views/vertex_only.xml b/compact/subsystem_views/vertex_only.xml
index a5aea68820be62972961fffa67827e069a76c04e..1c2f4b6904ecc5505a0fb73a3652974b64a18f29 100644
--- a/compact/subsystem_views/vertex_only.xml
+++ b/compact/subsystem_views/vertex_only.xml
@@ -163,22 +163,10 @@
</comment>
<include ref="compact/vertex_tracker.xml"/>
- <!--include ref="compact/tof_barrel.xml"/-->
- <!--include ref="compact/tof_endcap.xml"/-->
- <!--include ref="compact/rwell_tracker_barrel.xml"-->
- <!--include ref="compact/ce_GEM.xml"/-->
- <!--include ref="compact/mm_tracker_barrel.xml"/-->
- <!--include ref="compact/cb_VTX_Barrel.xml"/-->
- <!--include ref="compact/gem_tracker_endcap.xml"/-->
-
<comment>
PID detectors
-------------
</comment>
- <!--include ref="compact/dirc.xml"/-->
- <!--include ref="compact/mrich.xml"/-->
- <!--include ref="compact/forward_trd.xml"/-->
- <!--include ref="compact/gaseous_rich.xml"/-->
<fields>
diff --git a/geo.xml b/geo.xml
deleted file mode 100644
index 8497b2677d4b10caca36e919d807793813d185b9..0000000000000000000000000000000000000000
--- a/geo.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<lccdd xmlns:compact="http://www.lcsim.org/schemas/compact/1.0"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/compact/1.0/compact.xsd">
-
- <debug>
- <type name="surface" value="1"/>
- <type name="material" value="1"/>
- <type name="readout" value="1"/>
- <type name="segmentation" value="1"/>
- <type name="limits" value="1"/>
- <type name="region" value="1"/>
- <type name="includes" value="1"/>
- </debug>
-
- <documentation level="-1">
- # Athena Detector
- - https://eicweb.phy.anl.gov/EIC/detectors/athena.git
- - https://eicweb.phy.anl.gov/EIC/detectors/ip6.git
- </documentation>
-
- <!-- Some information about detector -->
- <info name="Athena Detector" title="Athena Detector"
- author="Athena Collaboration"
- url="https://eicweb.phy.anl.gov/EIC/detectors/athena.git"
- status="development"
- version="v1 2021-03-16">
- <comment> Athena </comment>
- </info>
- <define>
- <documentation level="2">
- ## Main Constant Definitions
-
- The ip6 (or other ip) defines should be included first.
- These files have only a define tags.
- </documentation>
- <include ref="ip6/ip6_defs.xml" />
- <include ref="compact/definitions.xml" />
- </define>
-
- <includes>
- <gdmlFile ref="compact/elements.xml"/>
- <gdmlFile ref="compact/materials.xml"/>
- <file ref="compact/optical_materials.xml"/>
- </includes>
-
- <limits>
- <limitset name="EICBeamlineLimits">
- <limit name="step_length_max" particles="*" value="1.0" unit="mm" />
- <limit name="track_length_max" particles="*" value="1.0" unit="mm" />
- <limit name="time_max" particles="*" value="0.1" unit="ns" />
- <limit name="ekin_min" particles="*" value="0.001" unit="MeV" />
- <limit name="range_min" particles="*" value="0.1" unit="mm" />
- </limitset>
- <limitset name="cal_limits">
- <limit name="step_length_max" particles="*" value="5.0" unit="mm"/>
- </limitset>
- </limits>
-
- <display>
- <include ref="compact/colors.xml" />
- <include ref="compact/display.xml" />
- </display>
-
- <documentation level="0">
- ## Detector Subsystems
-
- ### IP Subsystems
-
- The interaction point subsystems are included before the central detector subsystems.
- This is becuase the IP subsystems, for exmaple the beampipe, will define paramters
- which are subsquently used in the central detector construction -- e.g. the vertex tracker
- uses the beampipe OD to help define its placement.
-
- The IP subsystems include the Far forward and backward regions. The list of subsystem includes:
- - Interaction region beampipe
- - B0 tracker
- - Off-momentum tracker
- - Far forward roman pots
- - Zero Degree Calorimeter
- - Beam line magnets.
- - and more...
- </documentation>
-
- <comment>
- Beamline elements
- -----------------
- </comment>
-
- <comment>
- Main magnet
- -----------
- Note: When changing magnet, also select dimensions in definitions.xml.
- </comment>
- <!--include ref="compact/solenoid.xml"/-->
-
- <comment>
- Tracker subassemblies for ACTS
- ------------------------------
- </comment>
- <detectors>
- <detector id="VertexBarrelSubAssembly_ID"
- name="VertexBarrelSubAssembly"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="VertexBarrel" />
- </detector>
- <detector id="VertexEndcapSubAssembly_ID"
- name="VertexEndcapSubAssembly"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="VertexEndcapN" />
- <composite name="VertexEndcapP" />
- </detector>
-
- <detector id="TrackerBarrelSubAssembly_Inner_ID"
- name="TrackerBarrelSubAssembly_Inner"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="TrackerBarrel_Inner"/>
- </detector>
- <detector id="TrackerEndcapSubAssembly_Inner_ID"
- name="TrackerEndcapSubAssembly_Inner"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="TrackerEndcapN_Inner"/>
- <composite name="TrackerEndcapP_Inner"/>
- </detector>
-
- <detector id="TrackerBarrelSubAssembly_Outer_ID"
- name="TrackerSubAssembly_Outer"
- type="DD4hep_SubdetectorAssembly"
- vis="TrackerSubAssemblyVis">
- <composite name="TrackerBarrel_Outer"/>
- <composite name="TrackerEndcapP_Outer"/>
- <composite name="TrackerEndcapN_Outer"/>
- </detector>
-
- <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>
-
- <comment>
- Central tracking detectors
- --------------------------
- </comment>
- <include ref="compact/vertex_tracker.xml"/>
- <include ref="compact/central_tracker.xml"/>
-
- <comment>
- PID detectors
- -------------
- </comment>
-
- <fields>
- <field name="B0PF_Magnet" type="MultipoleMagnet">
- <position x="B0PF_XPosition" y="0" z="B0PF_CenterPosition"/>
- <rotation x="0" y="B0PF_RotationAngle" z="0"/>
- <shape type="Tube" rmin="0.0" rmax="B0PF_InnerRadius" dz="B0PF_Length*0.5"/>
- <coefficient coefficient="B0PF_Bmax" skew="0.0*tesla"/>
- <!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
- </field>
- <field name="B0APF_Magnet" type="MultipoleMagnet">
- <position x="B0APF_XPosition" y="0" z="B0APF_CenterPosition"/>
- <rotation x="0" y="B0APF_RotationAngle" z="0"/>
- <shape type="Tube" rmin="0.0" rmax="B0APF_InnerRadius" dz="B0APF_Length*0.5"/>
- <coefficient coefficient="B0APF_Bmax" skew="0.0*tesla"/>
- <!--<coefficient coefficient="2.0*tesla/cm" skew="0.2*tesla/cm"/> -->
- </field>
- <field name="Q1APF_Magnet" type="MultipoleMagnet">
- <position x="Q1APF_XPosition" y="0" z="Q1APF_CenterPosition"/>
- <rotation x="0" y="Q1APF_RotationAngle" z="0"/>
- <shape type="Tube" rmin="0.0" rmax="Q1APF_InnerRadius" dz="Q1APF_Length*0.5"/>
- <coefficient coefficient="Q1APF_Bmax" skew="0.0*tesla"/>
- <coefficient coefficient="Q1APF_GradientMax" skew="0.0*tesla/cm"/>
- </field>
- <field name="Q1BPF_Magnet" type="MultipoleMagnet">
- <position x="Q1BPF_XPosition" y="0" z="Q1BPF_CenterPosition"/>
- <rotation x="0" y="Q1BPF_RotationAngle" z="0"/>
- <shape type="Tube" rmin="0.0" rmax="Q1BPF_InnerRadius" dz="Q1BPF_Length*0.5"/>
- <coefficient coefficient="Q1BPF_Bmax" skew="0.0*tesla"/>
- <coefficient coefficient="Q1BPF_GradientMax" skew="0.0*tesla/cm"/>
- </field>
- <field name="Q2PF_Magnet" type="MultipoleMagnet">
- <position x="Q2PF_XPosition" y="0" z="Q2PF_CenterPosition"/>
- <rotation x="0" y="Q2PF_RotationAngle" z="pi/2.0"/>
- <shape type="Tube" rmin="0.0" rmax="Q2PF_InnerRadius" dz="Q2PF_Length*0.5"/>
- <coefficient coefficient="Q2PF_Bmax" skew="0.0*tesla"/>
- <coefficient coefficient="Q2PF_GradientMax" skew="0.0*tesla/cm"/>
- </field>
- <field name="B1PF_Magnet" type="MultipoleMagnet">
- <position x="B1PF_XPosition" y="0" z="B1PF_CenterPosition"/>
- <rotation x="0" y="B1PF_RotationAngle" z="0"/>
- <shape type="Tube" rmin="0.0" rmax="B1PF_InnerRadius" dz="B1PF_Length*0.5"/>
- <coefficient coefficient="B1PF_Bmax" skew="0.0*tesla"/>
- <coefficient coefficient="B1PF_GradientMax" skew="0.0*tesla/cm"/>
- </field>
- <field name="B1APF_Magnet" type="MultipoleMagnet">
- <position x="B1APF_XPosition" y="0" z="B1APF_CenterPosition"/>
- <rotation x="0" y="B1APF_RotationAngle" z="0"/>
- <shape type="Tube" rmin="0.0" rmax="B1APF_InnerRadius" dz="B1APF_Length*0.5"/>
- <coefficient coefficient="B1APF_Bmax" skew="0.0*tesla"/>
- <coefficient coefficient="B1APF_GradientMax" skew="0.0*tesla/cm"/>
- </field>
- <field name="B2PF_Magnet" type="MultipoleMagnet">
- <position x="B2PF_XPosition" y="0" z="B2PF_CenterPosition"/>
- <rotation x="0" y="B2PF_RotationAngle" z="0"/>
- <shape type="Tube" rmin="0.0" rmax="B2PF_InnerRadius" dz="B2PF_Length*0.5"/>
- <coefficient coefficient="B2PF_Bmax" skew="0.0*tesla"/>
- <coefficient coefficient="B2PF_GradientMax" skew="0.0*tesla/cm"/>
- </field>
- </fields>
-
- <comment>
- FB elements
- -----------
- None (TODO)
- </comment>
-
- <readouts>
- </readouts>
-
-</lccdd>