diff --git a/compact/definitions.xml b/compact/definitions.xml index bd3d79d98ff0af6c4c7978c8a5ae7d103109f7a9..4ebaf809292550702b243de3aba3a6e0b10c342b 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -302,8 +302,9 @@ -------------------------------- These are needed here to compute the dependent parameters. </comment> - <constant name="RICHLength" value="1.3*m"/> - <constant name="TRDLength" value="30.0*cm"/> + + <constant name="RICHLength" value="1.1*m"/> + <constant name="TRDLength" value="20.0*cm"/> <constant name="ForwardTOFLength" value="10.0*cm"/> <constant name="ForwardPIDLength" value="RICHLength + TRDLength + ForwardTOFLength"/> @@ -339,7 +340,7 @@ <constant name="SiliconTrackerInnerRadius" value="95.0*mm"/> <constant name="SiliconTrackerInnerBarrelLength" value="300.0*mm"/> <constant name="SiliconTrackerOuterRadius" value="Solenoid_rmax/3.0"/> - <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/4.0"/> + <constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5"/> <constant name="SiliconTrackerOuterBarrel_zmax" value="SiliconTrackerOuterBarrelLength/2.0"/> <comment> @@ -366,6 +367,7 @@ <comment> Ecal and Hcal Barrel </comment> + <constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + BarrelPIDThickness + 3.0 * cm"/> <constant name="HcalBarrel_rmax" value="Solenoid_rmin - 5.0 *cm "/> <constant name="Barrel_TotalCalThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/> @@ -541,7 +543,7 @@ <constant name="RICH_rmax0" value="SiliconTrackerOuterRadius"/> <constant name="RICH_rmax1" value="EcalBarrel_rmin"/> <constant name="RICH_rmax2" value="SolenoidBarrel_rmin-2*cm"/> - <constant name="RICHDepth" value="1.0*m"/> + <constant name="RICHDepth" value="0.9*m"/> <comment> diff --git a/compact/solenoid.xml b/compact/solenoid.xml index 1a7ddd8ddd540a1f43514dfa96cf2502f8f6cd94..d8899e6c184b6603df3f8c217dd1adfe6782999d 100644 --- a/compact/solenoid.xml +++ b/compact/solenoid.xml @@ -21,6 +21,7 @@ name="SolenoidCoilBarrel" type="DD4hep_MultiLayerTracker" insideTrackingVolume="false"> + <position x="0" y="0" z="EcalBarrel_offset"/> <layer id="1" inner_r="Solenoid_rmin" outer_z="SolenoidBarrel_zmax"