From 0e64d3f85cf07f512a80667612d1c3af33d8a1bd Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sylvester.joosten@gmail.com>
Date: Thu, 22 Apr 2021 00:08:21 +0000
Subject: [PATCH] Resolve "Fix Solenoid radius"
---
.gitignore | 12 ++++++++++++
compact/definitions.xml | 8 ++++----
reference_detector.xml | 2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8b9741e..28f71b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,15 @@ build/*
.DAWN*
*/*.pyc
**.pyc
+
+images/*
+doc/*
+
+accelerator
+eic_ip6
+eic
+ip6_build
+ip6
+
+*.swp
+
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 6e066ba..be61d00 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -301,8 +301,8 @@
==========================
</comment>
- <constant name="Solenoid_length" value="7000.0*mm"/>
- <constant name="Solenoid_rmin" value="3000.0*mm"/>
+ <constant name="Solenoid_length" value="3600.0*mm"/>
+ <constant name="Solenoid_rmin" value="1600.0*mm"/>
<constant name="Solenoid_thickness" value="400*mm"/>
<constant name="Solenoid_offset" value="600.0*mm"/>
@@ -365,7 +365,7 @@
</comment>
<constant name="SiliconTrackerInnerRadius" value="95.0*mm"/>
<constant name="SiliconTrackerInnerBarrelLength" value="300.0*mm"/>
- <constant name="SiliconTrackerOuterRadius" value="Solenoid_rmax/3.0"/>
+ <constant name="SiliconTrackerOuterRadius" value="Solenoid_rmin-70*cm"/>
<constant name="SiliconTrackerOuterBarrelLength" value="Solenoid_length/2.5"/>
<constant name="SiliconTrackerOuterBarrel_zmax" value="SiliconTrackerOuterBarrelLength/2.0"/>
@@ -419,7 +419,7 @@
<constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0 *cm "/>
<constant name="Barrel_TotalCalThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/>
- <constant name="CalBarrelDivider" value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
+ <constant name="CalBarrelDivider" value="1.0"/> <comment> 100% Ecal, no HCAL inside of the solenoid for now </comment>
<constant name="EcalBarrel_TotalThickness" value="Barrel_TotalCalThickness * CalBarrelDivider"/>
<constant name="HcalBarrel_TotalThickness" value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/>
diff --git a/reference_detector.xml b/reference_detector.xml
index 2776cb5..4abed83 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -120,7 +120,7 @@
<include ref="compact/far_forward_detectors.xml"/>
<include ref="compact/ce_mrich.xml"/>
<include ref="compact/ce_GEM.xml"/>
- <include ref="compact/hcal.xml"/>
+ <!--include ref="compact/hcal.xml"/-->
<include ref="compact/forward_trd.xml"/>
<include ref="compact/B0_tracker.xml"/>
<include ref="compact/forward_romanpot.xml"/>
--
GitLab