From cdd2894134bbdefd614c08e6d55753ce9b8ac7fb Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wouter.deconinck@umanitoba.ca>
Date: Wed, 20 Oct 2021 17:45:28 +0000
Subject: [PATCH] Updated magnetic field September 2021 and Shift magnet by 25
cm
---
compact/definitions.xml | 6 +++---
compact/solenoid.xml | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 12627278..6c5df132 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -323,7 +323,7 @@ Examples:
<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_offset" value="10*mm"/>
+ <constant name="Solenoid_offset" value="-240*mm"/>
<!--
<comment>Helmholtz option</comment>
@@ -425,9 +425,9 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
<constant name="EcalEndcapP_rmin" value="200.0*mm" />
<constant name="EcalEndcapP_rmax" value="Solenoid_rmax "/>
- <constant name="EcalEndcapN_zmin" value="BackwardPIDRegion_zmin + BackwardInnerEndcapRegion_length" />
+ <constant name="EcalEndcapN_zmin" value="max(BackwardPIDRegion_zmin + BackwardInnerEndcapRegion_length, SolenoidBackward_zmax)"/>
<constant name="EcalEndcapN_length" value="60*cm" />
- <constant name="EcalEndcapN_rmin" value="max((EcalEndcapN_zmin + EcalEndcapN_length) * tan(abs(CrossingAngle)) + 12.5 * mm, 5*cm)" />
+ <constant name="EcalEndcapN_rmin" value="max((EcalEndcapN_zmin + EcalEndcapN_length) * tan(abs(CrossingAngle)) + 15.5 * mm, 5*cm)" />
<constant name="EcalEndcapN_rmax" value="CentralTrackingRegion_rmax" />
<constant name="EcalBarrelRegion_thickness" value="45.0*cm"/>
diff --git a/compact/solenoid.xml b/compact/solenoid.xml
index 7efe56ae..ffcf504f 100644
--- a/compact/solenoid.xml
+++ b/compact/solenoid.xml
@@ -327,12 +327,12 @@
zmin="-SolenoidBarrelCoil_zmax" zmax="SolenoidBarrelCoil_zmax"
inner_radius="SolenoidalFieldRadius" outer_radius="SolenoidalFieldRadius+20*cm"/-->
<field type="FieldMapBrBz" name="GlobalSolenoid" field_type="magnetic"
- field_map="fieldmaps/EIC_Magnetic_Field_Map_2021_05_07_radial_coords__cm___T_.120000.lines.Bmap"
- url="https://eicweb.phy.anl.gov/EIC/detectors/athena/uploads/9179a98c5a80df1f2b98968c747c1c48/EIC_Magnetic_Field_Map_2021_05_07_radial_coords__cm___T_.120000.lines.Bmap"
+ field_map="fieldmaps/EIC_v.2.0.3_Magnetic_Field_Map_2021_09_28_radial_coords_cm_T.Bmap.txt"
+ url="https://eicweb.phy.anl.gov/EIC/detectors/athena/uploads/fd64db33e1c99547ab1840d8847fd1c1/EIC_v.2.0.3_Magnetic_Field_Map_2021_09_28_radial_coords_cm_T.Bmap.txt"
scale="-1.0">
<dimensions>
- <transverse step="2.0*cm" rmin="0*cm" rmax="398*cm" />
- <longitudinal step="2.0*cm" zmin="-600*cm" zmax="598*cm" />
+ <transverse step="2.0*cm" rmin="0*cm" rmax="998*cm" />
+ <longitudinal step="2.0*cm" zmin="-800*cm" zmax="798*cm" />
<translation x="0.0*cm" y="0.0*cm" z="0.0*cm" />
<rotation x="0" y="0" z="0" />
</dimensions>
--
GitLab