Skip to content
Snippets Groups Projects

Resolve "Parameterized Detector Structure"

Merged Resolve "Parameterized Detector Structure"
37-parameterized-detector-structure into master
Merged Whitney Armstrong requested to merge 37-parameterized-detector-structure into master
Viewing commit f1732d15
Prev Next
Show latest version
7 files
+ 81
− 43
Compare changes
  • Side-by-side
  • Inline
Files
7
  • f1732d15 
    	modified:   compact/forward_rich.xml
	modified:   reference_detector.xml
	modified:   src/ForwardRICH_geo.cpp
	modified:   src/cb_CTD_Si.cpp
	modified:   src/ce_GEM.cpp
	modified:   src/ffi_ZDC.cpp
compact/definitions.xml
+ 5
− 5
@@ -354,7 +354,7 @@
<!--
<constant name="cb_CTD_zmax" value="120.0 * cm"/>
-->
<constant name="cb_CTD_length" value="SolenoidLength - cb_CTD_zmax"/>
<constant name="cb_CTD_length" value="Solenoid_length - cb_CTD_zmax"/>
<comment> After fix cb_Solenoid parameters </comment>
<!--
<constant name="cb_CTD_length" value="cb_Solenoid_z - cb_CTD_zmax"/>
@@ -545,9 +545,9 @@
Gaseous RICH Parameters
-----------------------
</comment>
<constant name="RICHZMin" value="SiliconTrackerOuterBarrelLength/2.0 + 1 * cm"/>
<constant name="RICHZMin" value="SiliconTrackerOuterBarrel_zmax + 1 * cm"/>
<constant name="RICHRMin" value="15 * cm"/>
<constant name="RICH_rmax0" value="SiliconTrackerOuterBarrel_zmin"/>
<constant name="RICH_rmax0" value="SiliconTrackerOuterRadius"/>
<constant name="RICH_rmax1" value="EcalBarrel_rmin"/>
<constant name="RICH_rmax2" value="SolenoidBarrel_rmin-2*cm"/>
<constant name="RICHDepth" value="1.0*m"/>
@@ -580,7 +580,7 @@
<constant name="ce_MRICHRMin" value="15*cm"/>
<constant name="ce_MRICHRMax" value="100*cm"/>
<constant name="ce_MRICHLength" value="15*cm"/>
<constant name="ce_MRICHZMin" value="-EcalEndcap_zmin+10.*cm"/>
<constant name="ce_MRICHZMin" value="-EcalEndcapP_zmin+10.*cm"/>
<comment>
------------------
@@ -594,7 +594,7 @@
<constant name="ce_GEM_length" value="30.0 * cm"/>
<constant name="ce_GEM_x_pos" value="0.0 * cm"/>
<constant name="ce_GEM_y_pos" value="0.0 * cm"/>
<constant name="ce_GEM_z_pos" value="-SolenoidLength/2.0 + ce_GEM_length/2.0"/>
<constant name="ce_GEM_z_pos" value="-Solenoid_length/2.0 + ce_GEM_length/2.0"/>
<constant name="ce_GEM_layer" value="8"/>
<constant name="ce_GEM_layer_thickness" value="1.0 * cm"/>