From fdfdd14d0c7d7425e2d9e25b5ff55ba34770b2f9 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Wed, 18 Aug 2021 01:39:28 +0000
Subject: [PATCH] Updated negative endcap to use all available space
---
.gitlab-ci.yml | 1 +
compact/definitions.xml | 34 ++++----
manifest.txt | 169 ----------------------------------------
3 files changed, 14 insertions(+), 190 deletions(-)
delete mode 100644 manifest.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4571beda..458c7676 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ workflow:
- if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_PIPELINE_SOURCE == "webide"'
- if: '$CI_COMMIT_BRANCH == "master"'
+ - if: '$CI_COMMIT_BRANCH == "acadia"'
- if: '$CI_COMMIT_TAG'
default:
diff --git a/compact/definitions.xml b/compact/definitions.xml
index 3de2425d..132f933c 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -331,7 +331,7 @@ Examples:
<!--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="5.0*cm"/>
+ <constant name="BackwardTracking_length" value="68.0*cm"/>
<constant name="BackwardTOF_length" value="0.0*cm"/>
<comment> Note: PID has space for DIRC, ExtraSpace has room for other detectors past the PID</comment>
@@ -393,19 +393,8 @@ Examples:
`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"/>
+ <constant name="TrackerBarrelBackwardPadding" value="7.0*cm"/>
-
- <comment> Deprecated
- constant name="SiliconTrackerInnerRadius" value="TrackerBarrel_rmin"
- constant name="SiliconTrackerInnerBarrelLength" value="TrackerBarrelInner_length"
- constant name="SiliconTrackerOuterRadius" value="TrackerBarrel_rmax"
- constant name="SiliconTrackerOuterBarrelLength" value="TrackerBarrelOuter_length"
- constant name="SiliconTrackerOuterBarrel_zmax" value="TrackerBarrelOuter_length/2.0"
- TrackerBarrelOuter_length -> TrackerBarrel_length
- TrackerBarrelInner_length -> TrackerBarrelInside_length
- </comment>
-
<documentation>
## Central tracking and PID detector boundaries
@@ -562,17 +551,20 @@ The logic goes like this:
<!--constant name="EcalEndcapNThickness"
value="EcalEndcapNLayer1_NRepeat*EcalLayer1_thickness + EcalEndcapNLayer2_NRepeat*EcalLayer2_thickness + EcalEndcapNLayer3_NRepeat*EcalLayer3_thickness"/-->
- <constant name="EcalBarrel_length" value="CentralTracking_length + BackwardInnerEndcap_length + EcalEndcapN_length"/>
- <constant name="EcalBarrel_offset" value="(CentralTracking_length - EcalBarrel_length)/2.0"/>
+ <constant name="EcalBarrelForward_length" value="4*cm"/>
+ <constant name="EcalBarrelForward_zmax" value="CentralTrackingHalfP_length + EcalBarrelForward_length"/>
+ <constant name="EcalBarrelBackward_zmax" value="CentralTrackingHalfN_length + BackwardInnerEndcap_length + EcalEndcapN_length"/>
+ <constant name="EcalBarrel_length" value="EcalBarrelForward_zmax + EcalBarrelBackward_zmax"/>
+ <constant name="EcalBarrel_offset" value="(EcalBarrelForward_zmax - EcalBarrelBackward_zmax)/2.0"/>
<comment> Special DIRC parameters (depend on the ECAL setup) </comment>
- <constant name="DIRCReadout_length" value="30*cm" />
- <constant name="DIRC_length" value="max(CentralTracking_length + BackwardInnerEndcap_length + EcalEndcapN_length, EcalBarrel_length) + DIRCReadout_length"/>
- <constant name="DIRCExtra_offset" value="-5*cm"/>
- <constant name="DIRC_offset" value="(CentralTracking_length - DIRC_length) / 2 - DIRCExtra_offset"/>
- <constant name="DIRCForward_zmax" value="DIRC_length/2. + DIRC_offset"/>
- <constant name="DIRCBackward_zmax" value="DIRC_length/2. - DIRC_offset"/>
+ <constant name="DIRCReadout_length" value="30*cm"/>
+ <constant name="DIRCForward_length" value="0*cm"/>
+ <constant name="DIRCForward_zmax" value="CentralTrackingHalfP_length + DIRCForward_length"/>
+ <constant name="DIRCBackward_zmax" value="CentralTrackingHalfN_length + BackwardInnerEndcap_length + EcalEndcapN_length + DIRCReadout_length"/>
+ <constant name="DIRC_length" value="DIRCForward_zmax + DIRCBackward_zmax"/>
+ <constant name="DIRC_offset" value="(DIRCForward_zmax - DIRCBackward_zmax)/2"/>
<constant name="DIRC_rmin" value="BarrelTracking_rmax"/>
<constant name="DIRC_rmax" value="DIRC_rmin + BarrelPIDThickness"/>
diff --git a/manifest.txt b/manifest.txt
deleted file mode 100644
index f9890bb3..00000000
--- a/manifest.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-B0Tracker_zmin = 540.000 = B0TrackerCenter_zpos - B0Tracker_length/2.0
-BackwardPID_rmax = 95.000 = 95.*cm
-BarrelTrackingAndPID_rmax = 105.000 = BarrelTracking_rmax + BarrelPIDThickness
-BarrelTracking_rmax = 95.000 = TrackerBarrel_rmax
-BarrelTracking_zmax = 130.000 = BarrelTracking_length/2.0
-Barrel_rmax = 159.000 = Solenoid_rmin - 1.0 *cm
-Beampipe_rmax = 3.176 = IPBeampipe_rmax
-CentralTracking_rmax = 95.000 = TrackerBarrel_rmax
-DIRCBackward_zmax = 276.250 = DIRC_length/2. - DIRC_offset
-DIRCForward_zmax = 151.250 = DIRC_length/2. + DIRC_offset
-DIRCFrame_rmax = 99.000 = DIRC_rmin + DIRCFrame_thickness
-DIRCModule_rmax = 97.200 = DIRC_rmin + DIRCBar_thickness + DIRCSkinFront_thickness + DIRCSkinBack_thickness
-DIRCModule_rmin = 96.000 = DIRC_rmin + 1*cm
-DIRC_rmax = 105.000 = DIRC_rmin + BarrelPIDThickness
-DIRC_rmin = 95.000 = BarrelTracking_rmax
-DRICH_rmax0 = 110.000 = 110.0*cm
-DRICH_rmax1 = 125.000 = 125.0*cm
-DRICH_rmax2 = 200.000 = 200*cm
-DRICH_rmin0 = 11.176 = ForwardPID_rmin1
-DRICH_rmin1 = 19.000 = 19.0*cm
-DRICH_zmin = 155.000 = CentralTrackingHalfP_length
-EcalBarrel_rmax = 151.272 = EcalBarrel_rmin + EcalBarrelThickness
-EcalBarrel_rmin = 112.000 = BarrelTrackingAndPID_rmax + BarrelExtraSpaceThickness
-EcalEndcapNCrystal_rmax = 40.000 = 40*cm
-EcalEndcapN_rmax = 95.000 = BarrelTracking_rmax
-EcalEndcapN_rmin = 7.526 = max((EcalEndcapN_zmin + EcalEndcapN_length) * tan(abs(CrossingAngle)) + 12.5 * mm, 5*cm)
-EcalEndcapN_zmin = 191.000 = max(CentralTrackingHalfN_length+ BackwardInnerEndcap_length, SolenoidYokeEndcapN_zmin)
-EcalEndcapP_rmax = 224.000 = Solenoid_rmax
-EcalEndcapP_rmin = 20.000 = 200.0*mm
-EcalEndcapP_zmin = 350.000 = CentralTrackingHalfP_length + ForwardInnerEndcap_length + ForwardServiceGap_length
-ForwardPID_rmin1 = 11.176 = Beampipe_rmax + 80*mm
-ForwardPID_rmin2 = 19.000 = 19.0*cm
-GEMTrackerEndcapN_rmax = 94.500 = TrackerBarrel_rmax - 0.5*cm
-GEMTrackerEndcapN_rmin = 15.000 = 15*cm
-GEMTrackerEndcapN_zmin = 177.500 = CentralTrackingHalfN_length + BackwardPID_length
-GEMTrackerEndcapP_rmax = 223.500 = Solenoid_rmax - 0.5*cm
-GEMTrackerEndcapP_rmin = 19.000 = 19*cm
-GEMTrackerEndcapP_zmin = 335.000 = CentralTrackingHalfP_length + ForwardPID_length
-HcalBarrel_rmax = 324.000 = HcalBarrel_rmin + HcalBarrel_thickness
-HcalBarrel_rmin = 224.000 = Solenoid_rmax
-HcalEndcapN_rmin = 12.008 = max((HcalEndcapN_zmin + HcalEndcapN_length) * tan(abs(CrossingAngle)) + 22.25 * mm, 11 * cm)
-HcalEndcapN_zmin = 286.250 = DIRCBackward_zmax + BackwardServiceGap_length
-HcalEndcapP_rmin = 28.698 = max((HcalEndcapP_zmin + HcalEndcapP_length) * tan(2.0 * abs(CrossingAngle)) + BeampipeOD / 2.0, 15 * cm)
-HcalEndcapP_zmin = 390.000 = max(EcalEndcapP_zmin + EcalEndcapP_length, Solenoid_length / 2.0 + Solenoid_offset)
-IPBeampipe_rmax = 3.176 = 2.501*25.4*mm/2.0
-MRICH_rmax = 95.000 = BackwardPID_rmax
-MRICH_rmin = 10.000 = 10*cm
-MRICH_zmin = 137.500 = CentralTrackingHalfN_length
-SolenoidBarrelCoilFormer_rmax = 174.500 = SolenoidBarrelCoilFormer_rmin + SolenoidBarrelCoilFormerThickness
-SolenoidBarrelCoilFormer_rmin = 169.500 = SolenoidBarrelInnerHelium_rmax
-SolenoidBarrelCoilFormer_zmax = 180.000 = 1800.0 * mm
-SolenoidBarrelCoilOverbind_rmax = 214.500 = SolenoidBarrelCoilOverbind_rmin + SolenoidBarrelCoilOverbindThickness
-SolenoidBarrelCoilOverbind_rmin = 194.500 = SolenoidBarrelCoil_rmax
-SolenoidBarrelCoilOverbind_zmax = 180.000 = 1800.0 * mm
-SolenoidBarrelCoil_rmax = 194.500 = SolenoidBarrelCoil_rmin + SolenoidBarrelCoilThickness
-SolenoidBarrelCoil_rmin = 174.500 = SolenoidBarrelCoilFormer_rmax
-SolenoidBarrelCoil_zmax = 180.000 = 1800.0 * mm
-SolenoidBarrelInnerFirstMLILayer_rmax = 166.500 = SolenoidBarrelInnerFirstMLILayer_rmin + SolenoidBarrelInnerFirstMLILayerThickness
-SolenoidBarrelInnerFirstMLILayer_rmin = 165.000 = SolenoidBarrelInnerThermalShield_rmax
-SolenoidBarrelInnerFirstMLILayer_zmax = 185.500 = 1855.0 * mm
-SolenoidBarrelInnerHeliumVessel_rmax = 168.500 = SolenoidBarrelInnerHeliumVessel_rmin + SolenoidBarrelInnerHeliumVesselThickness
-SolenoidBarrelInnerHeliumVessel_rmin = 166.500 = SolenoidBarrelInnerFirstMLILayer_rmax
-SolenoidBarrelInnerHeliumVessel_zmax = 184.000 = 1840.0 * mm
-SolenoidBarrelInnerHelium_rmax = 169.500 = SolenoidBarrelInnerHelium_rmin + SolenoidBarrelInnerHeliumThickness
-SolenoidBarrelInnerHelium_rmin = 168.500 = SolenoidBarrelInnerHeliumVessel_rmax
-SolenoidBarrelInnerHelium_zmax = 182.000 = 1820.0 * mm
-SolenoidBarrelInnerSecondMLILayer_rmax = 164.000 = SolenoidBarrelInnerSecondMLILayer_rmin + SolenoidBarrelInnerSecondMLILayerThickness
-SolenoidBarrelInnerSecondMLILayer_rmin = 162.000 = SolenoidBarrelInnerVacuumVessel_rmax
-SolenoidBarrelInnerSecondMLILayer_zmax = 189.500 = 1895.0 * mm
-SolenoidBarrelInnerThermalShield_rmax = 165.000 = SolenoidBarrelInnerThermalShield_rmin + SolenoidBarrelInnerThermalShieldThickness
-SolenoidBarrelInnerThermalShield_rmin = 164.000 = SolenoidBarrelInnerSecondMLILayer_rmax
-SolenoidBarrelInnerThermalShield_zmax = 187.500 = 1875.0 * mm
-SolenoidBarrelInnerVacuumVessel_rmax = 162.000 = SolenoidBarrelInnerVacuumVessel_rmin + SolenoidBarrelInnerVacuumVesselThickness
-SolenoidBarrelInnerVacuumVessel_rmin = 160.000 = SolenoidBarrel_rmin
-SolenoidBarrelInnerVacuumVessel_zmax = 192.000 = 1920.0 * mm
-SolenoidBarrelOuterFirstMLILayer_rmax = 218.500 = SolenoidBarrelOuterFirstMLILayer_rmin + SolenoidBarrelOuterFirstMLILayerThickness
-SolenoidBarrelOuterFirstMLILayer_rmin = 217.000 = SolenoidBarrelOuterHeliumVessel_rmax
-SolenoidBarrelOuterFirstMLILayer_zmax = 185.500 = 1855.0 * mm
-SolenoidBarrelOuterHeliumVessel_rmax = 217.000 = SolenoidBarrelOuterHeliumVessel_rmin + SolenoidBarrelOuterHeliumVesselThickness
-SolenoidBarrelOuterHeliumVessel_rmin = 216.000 = SolenoidBarrelOuterHelium_rmax
-SolenoidBarrelOuterHeliumVessel_zmax = 184.000 = 1840.0 * mm
-SolenoidBarrelOuterHelium_rmax = 216.000 = SolenoidBarrelOuterHelium_rmin + SolenoidBarrelOuterHeliumThickness
-SolenoidBarrelOuterHelium_rmin = 214.500 = SolenoidBarrelCoilOverbind_rmax
-SolenoidBarrelOuterHelium_zmax = 182.000 = 1820.0 * mm
-SolenoidBarrelOuterSecondMLILayer_rmax = 221.500 = SolenoidBarrelOuterSecondMLILayer_rmin + SolenoidBarrelOuterSecondMLILayerThickness
-SolenoidBarrelOuterSecondMLILayer_rmin = 219.500 = SolenoidBarrelOuterThermalShield_rmax
-SolenoidBarrelOuterSecondMLILayer_zmax = 189.500 = 1895.0 * mm
-SolenoidBarrelOuterThermalShield_rmax = 219.500 = SolenoidBarrelOuterThermalShield_rmin + SolenoidBarrelOuterThermalShieldThickness
-SolenoidBarrelOuterThermalShield_rmin = 218.500 = SolenoidBarrelOuterFirstMLILayer_rmax
-SolenoidBarrelOuterThermalShield_zmax = 187.500 = 1875.0 * mm
-SolenoidBarrelOuterVacuumVessel_rmax = 224.000 = SolenoidBarrelOuterVacuumVessel_rmin + SolenoidBarrelOuterVacuumVesselThickness
-SolenoidBarrelOuterVacuumVessel_rmin = 221.500 = SolenoidBarrelOuterSecondMLILayer_rmax
-SolenoidBarrelOuterVacuumVessel_zmax = 192.000 = 1920.0 * mm
-SolenoidBarrel_rmin = 160.000 = Solenoid_rmin
-SolenoidBarrel_zmax = 192.000 = Solenoid_length/2.0
-SolenoidEndcapCoilEndSupport_rmax = 214.500 = SolenoidBarrelCoilOverbind_rmax
-SolenoidEndcapCoilEndSupport_rmin = 169.500 = SolenoidBarrelCoilFormer_rmin
-SolenoidEndcapCoilEndSupport_zmin = 180.000 = 1800.0 * mm
-SolenoidEndcapFirstMLILayer_rmax = 218.500 = SolenoidBarrelOuterFirstMLILayer_rmax
-SolenoidEndcapFirstMLILayer_rmin = 165.000 = SolenoidBarrelInnerFirstMLILayer_rmin
-SolenoidEndcapFirstMLILayer_zmin = 185.500 = 1855.0 * mm
-SolenoidEndcapHeliumVessel_rmax = 217.000 = SolenoidBarrelOuterHeliumVessel_rmax
-SolenoidEndcapHeliumVessel_rmin = 166.500 = SolenoidBarrelInnerHeliumVessel_rmin
-SolenoidEndcapHeliumVessel_zmin = 184.000 = 1840.0 * mm
-SolenoidEndcapHelium_rmax = 216.000 = SolenoidBarrelOuterHelium_rmax
-SolenoidEndcapHelium_rmin = 168.500 = SolenoidBarrelInnerHelium_rmin
-SolenoidEndcapHelium_zmin = 182.000 = 1820.0 * mm
-SolenoidEndcapSecondMLILayer_rmax = 219.500 = SolenoidBarrelOuterSecondMLILayer_rmin
-SolenoidEndcapSecondMLILayer_rmin = 164.000 = SolenoidBarrelInnerSecondMLILayer_rmax
-SolenoidEndcapSecondMLILayer_zmin = 187.500 = 1875.0 * mm
-SolenoidEndcapThermalShield_rmax = 218.500 = SolenoidBarrelOuterThermalShield_rmin
-SolenoidEndcapThermalShield_rmin = 165.000 = SolenoidBarrelInnerThermalShield_rmax
-SolenoidEndcapThermalShield_zmin = 186.500 = 1865.0 * mm
-SolenoidEndcapVacuumVessel_rmax = 221.500 = SolenoidBarrelOuterVacuumVessel_rmin
-SolenoidEndcapVacuumVessel_rmin = 162.000 = SolenoidBarrelInnerVacuumVessel_rmax
-SolenoidEndcapVacuumVessel_zmin = 189.500 = 1895.0 * mm
-SolenoidYokeEndcapN_zmin = 191.000 = Solenoid_length/2.0 - Solenoid_offset + EndcapNExtra_length
-SolenoidYokeEndcapP_zmin = 233.000 = Solenoid_length/2.0 + Solenoid_offset + EndcapPExtra_length
-Solenoid_rmax = 224.000 = Solenoid_rmin + Solenoid_thickness
-Solenoid_rmin = 160.000 = 1600.0*mm
-TrackerBarrelInner_rmin1 = 21.000 = 21.0*cm
-TrackerBarrelInner_rmin2 = 22.680 = 22.68*cm
-TrackerBarrelInside_zmax = 30.000 = TrackerBarrelInside_length/2.0
-TrackerBarrelOuter_rmin1 = 39.300 = 39.3*cm
-TrackerBarrelOuter_rmin2 = 43.230 = 43.23*cm
-TrackerBarrel_rmax = 95.000 = BackwardPID_rmax
-TrackerBarrel_rmin = 20.000 = VertexTrackingRegion_rmax
-TrackerBarrel_zmax = 130.000 = TrackerBarrel_length/2.0
-TrackerEndcapInner_rmax1 = 35.760 = 36.26*cm-5.0*mm
-TrackerEndcapInner_rmin1 = 4.176 = Beampipe_rmax+1.0*cm
-TrackerEndcapInner_zmax = 51.000 = TrackerEndcapInner_zmin+TrackerEndcapLayer_dz
-TrackerEndcapInner_zmin = 49.000 = 49*cm
-TrackerEndcapOuterShell_zmin = 60.236 = TrackerEndcapOuter_rmax1 * TrackerEndcapInner_zmin/TrackerEndcapInner_rmax1+1*cm
-TrackerEndcapOuter_rmax1 = 43.230 = 43.23*cm
-TrackerEndcapOuter_rmax2 = 43.230 = 43.23*cm
-TrackerEndcapOuter_rmax3 = 43.230 = 43.23*cm
-TrackerEndcapOuter_rmin1 = 3.600 = 3.6*cm
-TrackerEndcapOuter_rmin2 = 4.700 = 4.7*cm
-TrackerEndcapOuter_rmin3 = 5.910 = 5.91*cm
-TrackerEndcapOuter_zmax = 123.000 = TrackerEndcapOuter_zmin3 + TrackerEndcapLayer_dz
-TrackerEndcapOuter_zmin = 73.000 = TrackerEndcapOuter_zmin1
-TrackerEndcapOuter_zmin1 = 73.000 = 73*cm
-TrackerEndcapOuter_zmin2 = 97.000 = 97*cm
-TrackerEndcapOuter_zmin3 = 121.000 = 121*cm
-VertexBarrelLayer_rmax1 = 3.500 = VertexBarrelLayer_rmin1 + VertexBarrelLayer_thickness
-VertexBarrelLayer_rmax2 = 5.800 = VertexBarrelLayer_rmin2 + VertexBarrelLayer_thickness
-VertexBarrelLayer_rmin1 = 3.300 = VertexBarrelMod1_rmin - VertexBarrelLayer_thickness/2.0
-VertexBarrelLayer_rmin2 = 5.600 = VertexBarrelMod2_rmin - VertexBarrelLayer_thickness/2.0
-VertexBarrelMod1_rmin = 3.400 = 3.4*cm
-VertexBarrelMod2_rmin = 5.700 = 5.7*cm
-VertexBarrelShell_rmax = 10.030 = VertexBarrelShell_rmin + VertexBarrelShell_thickness
-VertexBarrelShell_rmin = 10.000 = 10.0*cm
-VertexBarrelSupport_rmax = 10.500 = VertexBarrelSupport_rmin + VertexBarrelSupport_thickness
-VertexBarrelSupport_rmin = 9.500 = VertexBarrelShell_rmin-VertexBarrelSupport_thickness/2.0
-VertexTrackerBarrel_rmax = 20.000 = 200.0*mm
-VertexTrackerBarrel_rmin = 3.276 = Beampipe_rmax + 1.0*mm
-VertexTrackerBarrel_zmax = 15.000 = VertexTrackerBarrel_length/2.0
-VertexTrackerEndcapN_rmax = 20.000 = VertexTrackerBarrel_rmax
-VertexTrackerEndcapN_rmin = 3.676 = Beampipe_rmax + 5.0*mm
-VertexTrackerEndcapN_zmax = 30.000 = 300.0*mm
-VertexTrackerEndcapN_zmin = 15.000 = VertexTrackerBarrel_zmax
-VertexTrackerEndcapP_rmax = 20.000 = VertexTrackerBarrel_rmax
-VertexTrackerEndcapP_rmin = 3.676 = Beampipe_rmax + 5.0*mm
-VertexTrackerEndcapP_zmax = 30.000 = 300.0*mm
-VertexTrackerEndcapP_zmin = 15.000 = VertexTrackerBarrel_zmax
-VertexTrackingRegion_rmax = 20.000 = VertexTrackerBarrel_rmax
-VertexTrackingRegion_zmax = 30.000 = VertexTrackerEndcapP_zmax
-tracker_region_rmax = 95.000 = CentralTracking_rmax
-tracker_region_zmax = 146.250 = CentralTracking_length/2.0
--
GitLab