From b8751ad84c642622e809a2c076f125acb351141e Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wouter.deconinck@umanitoba.ca>
Date: Fri, 22 Oct 2021 00:18:12 +0000
Subject: [PATCH] Thinner solenoid
---
compact/definitions.xml | 6 +++---
compact/drich.xml | 2 +-
compact/solenoid.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 683a1497..ed3773d0 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -323,7 +323,7 @@ Examples:
<comment>Solenoid option</comment>
<constant name="Solenoid_length" value="3840.0*mm"/>
<constant name="Solenoid_rmin" value="1600.0*mm"/>
- <constant name="Solenoid_thickness" value="640*mm"/>
+ <constant name="Solenoid_thickness" value="455*mm"/>
<constant name="Solenoid_offset" value="-240*mm"/>
<!--
@@ -462,13 +462,13 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
<comment> HcalEndcapP needs to clear the expanding beampipe with 2 * crossing angle + its radius of BeampipeOD / 2</comment>
<constant name="HcalEndcapP_rmin" value="max((HcalEndcapP_zmin + HcalEndcapP_length) * tan(2.0 * abs(CrossingAngle)) + BeampipeOD / 2.0, 15 * cm)"/>
- <constant name="HcalEndcapN_zmin" value="max(DIRCBackward_zmax + BackwardServiceGap_length, 335*cm)"/>
+ <constant name="HcalEndcapN_zmin" value="max(DIRCBackward_zmax + BackwardServiceGap_length, 355*cm)"/>
<constant name="HcalEndcapN_length" value="105.0*cm"/>
<comment> HcalEndcapN needs to clear the straight beampipe with 1 * crossing angle + its radius of 22.25 mm </comment>
<constant name="HcalEndcapN_rmin" value="max((HcalEndcapN_zmin + HcalEndcapN_length) * tan(abs(CrossingAngle)) + 22.25 * mm, 11 * cm)"/>
<constant name="HcalBarrel_thickness" value="100.0*cm "/>
- <constant name="HcalBarrel_rmin" value="Solenoid_rmax"/>
+ <constant name="HcalBarrel_rmin" value="max(Solenoid_rmax, 230*cm)"/>
<constant name="HcalBarrel_rmax" value="HcalBarrel_rmin + HcalBarrel_thickness"/>
<constant name="HcalBarrelForward_zmax" value="HcalEndcapP_zmin - ForwardServiceGap_length - EcalEndcapP_length"/>
<constant name="HcalBarrelBackward_zmax" value="HcalEndcapN_zmin - BackwardServiceGap_length"/>
diff --git a/compact/drich.xml b/compact/drich.xml
index 61c303d8..1aa239f2 100644
--- a/compact/drich.xml
+++ b/compact/drich.xml
@@ -10,7 +10,7 @@
<constant name="DRICH_wall_thickness" value="0.5*cm"/> <!-- thickness of radial walls -->
<constant name="DRICH_window_thickness" value="0.1*cm"/> <!-- thickness of entrance and exit walls -->
<!-- tank geometry: cylinder, holding the majority of detector components -->
-<constant name="DRICH_rmax2" value="220*cm"/> <!-- cylinder radius, near maximal to fit HCal barrel inner polygon -->
+<constant name="DRICH_rmax2" value="HcalBarrel_rmin-10*cm"/> <!-- cylinder radius, near maximal to fit HCal barrel inner polygon -->
<!-- snout geometry: cone with front radius rmax0 and back radius of rmax1 -->
<constant name="DRICH_SnoutLength" value="4.0*cm"/>
<constant name="DRICH_SnoutSlope" value="DRICH_rmax2 / (DRICH_zmin + DRICH_Length)"/>
diff --git a/compact/solenoid.xml b/compact/solenoid.xml
index ba402b8c..2955097d 100644
--- a/compact/solenoid.xml
+++ b/compact/solenoid.xml
@@ -13,7 +13,7 @@
<constant name="SolenoidBarrelInnerFirstMLILayerThickness" value=" 15.0 * mm"/>
<constant name="SolenoidBarrelInnerHeliumVesselThickness" value=" 15.0 * mm"/>
<constant name="SolenoidBarrelInnerHeliumThickness" value=" 10.0 * mm"/>
- <constant name="SolenoidBarrelCoilFormerThickness" value=" 50.0 * mm"/>
+ <constant name="SolenoidBarrelCoilFormerThickness" value=" 10.0 * mm"/>
<constant name="SolenoidBarrelCoilThickness" value="210.0 * mm"/>
<constant name="SolenoidBarrelCoilOverbindThickness" value=" 50.0 * mm"/>
<constant name="SolenoidBarrelOuterHeliumThickness" value=" 15.0 * mm"/>
--
GitLab