Skip to content
Snippets Groups Projects
Commit dce1cd50 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Disabled HCAL and made ECAL take 100% of available space

parent 2c0c1bc6
Branches
No related tags found
No related merge requests found
...@@ -10,3 +10,15 @@ build/* ...@@ -10,3 +10,15 @@ build/*
.DAWN* .DAWN*
*/*.pyc */*.pyc
**.pyc **.pyc
images/*
doc/*
accelerator
eic_ip6
eic
ip6_build
ip6
*.swp
*.history
...@@ -417,12 +417,12 @@ ...@@ -417,12 +417,12 @@
<constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"/> <constant name="SolenoidYokeEndcapN_zmin" value="Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"/>
<constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/> <constant name="EcalBarrel_rmin" value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/>
<constant name="HcalBarrel_rmax" value="Solenoid_rmin - 10.0 *cm "/> <constant name="EcalBarrel_rmax" value="Solenoid_rmin - 10.0 *cm "/>
<constant name="Barrel_TotalCalThickness" value="HcalBarrel_rmax - EcalBarrel_rmin"/> <constant name="Barrel_TotalCalThickness" value="EcalBarrel_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> Ecal only (but option to add HCAL inside of solenoid</comment>
<constant name="EcalBarrel_TotalThickness" value="Barrel_TotalCalThickness * CalBarrelDivider"/> <constant name="EcalBarrel_TotalThickness" value="Barrel_TotalCalThickness * CalBarrelDivider"/>
<constant name="HcalBarrel_TotalThickness" value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/> <!--constant name="HcalBarrel_TotalThickness" value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/-->
<constant name="EcalBarrelLength" value="CentralTracking_length + BackwardPIDLength"/> <constant name="EcalBarrelLength" value="CentralTracking_length + BackwardPIDLength"/>
<constant name="EcalBarrel_offset" value="(CentralTracking_length -(CentralTracking_length+BackwardPIDLength))/2.0"/> <constant name="EcalBarrel_offset" value="(CentralTracking_length -(CentralTracking_length+BackwardPIDLength))/2.0"/>
...@@ -436,14 +436,14 @@ ...@@ -436,14 +436,14 @@
<constant name="EndcapPTotalCal_length" value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 20.0 * mm)"/> <constant name="EndcapPTotalCal_length" value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 20.0 * mm)"/>
<constant name="EndcapNTotalCal_length" value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 20.0 * mm)"/> <constant name="EndcapNTotalCal_length" value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 20.0 * mm)"/>
<constant name="EndcapP_CalDivide" value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment> <constant name="EndcapP_CalDivide" value="1.0"/> <comment> 100% ECAL inside the endcap, HCAL at back of endcap </comment>
<constant name="EndcapN_CalDivide" value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment> <constant name="EndcapN_CalDivide" value="1.0"/> <comment> 100% ECAL (assuming HCAL behind the endcap </comment>
<constant name="EcalEndcapP_length" value="EndcapPTotalCal_length * EndcapP_CalDivide"/> <constant name="EcalEndcapP_length" value="EndcapPTotalCal_length * EndcapP_CalDivide"/>
<constant name="EcalEndcapN_length" value="EndcapNTotalCal_length * EndcapN_CalDivide"/> <constant name="EcalEndcapN_length" value="EndcapNTotalCal_length * EndcapN_CalDivide"/>
<constant name="HcalEndcapP_length" value="EndcapPTotalCal_length * (1.0 - EndcapP_CalDivide)"/> <!--constant name="HcalEndcapP_length" value="EndcapPTotalCal_length * (1.0 - EndcapP_CalDivide)"/-->
<constant name="HcalEndcapN_length" value="EndcapNTotalCal_length * (1.0 - EndcapN_CalDivide)"/> <!--constant name="HcalEndcapN_length" value="EndcapNTotalCal_length * (1.0 - EndcapN_CalDivide)"/-->
<comment> These need to be set in sync with the forward and backward detectors </comment> <comment> These need to be set in sync with the forward and backward detectors </comment>
<constant name="EcalEndcapP_rmin" value="200.0*mm"/> <constant name="EcalEndcapP_rmin" value="200.0*mm"/>
...@@ -520,6 +520,7 @@ ...@@ -520,6 +520,7 @@
Hadronic Calorimeter Parameters Hadronic Calorimeter Parameters
------------------------------- -------------------------------
</comment> </comment>
<!--
<constant name="HcalBarrel_rmin" value="EcalBarrel_rmax"/> <constant name="HcalBarrel_rmin" value="EcalBarrel_rmax"/>
<constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/> <constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
<constant name="HcalBarrelLength" value="Solenoid_length + ExtraHcalEndcapP_length + ExtraHcalEndcapN_length- HcalEndcapP_length- HcalEndcapN_length - 10*cm"/> <constant name="HcalBarrelLength" value="Solenoid_length + ExtraHcalEndcapP_length + ExtraHcalEndcapN_length- HcalEndcapP_length- HcalEndcapN_length - 10*cm"/>
...@@ -548,6 +549,7 @@ ...@@ -548,6 +549,7 @@
<constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/> <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
<constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/> <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
-->
<comment> <comment>
---------------------- ----------------------
Zero Degree Parameters Zero Degree Parameters
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<include ref="compact/far_forward_detectors.xml"/> <include ref="compact/far_forward_detectors.xml"/>
<include ref="compact/ce_mrich.xml"/> <include ref="compact/ce_mrich.xml"/>
<include ref="compact/ce_GEM.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/forward_trd.xml"/>
<include ref="compact/B0_tracker.xml"/> <include ref="compact/B0_tracker.xml"/>
<include ref="compact/forward_romanpot.xml"/> <include ref="compact/forward_romanpot.xml"/>
......
1.34392e+07
90
180
0
0
0
0
1
1
0.001
0
1
1
1
0.5
0.5
0.5
19
71
0.001
0.001
0.001
3
71
0.001
0
0
1
evince
0
0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment