Skip to content
Snippets Groups Projects
Commit aed4c8d1 authored by Marshall Scott's avatar Marshall Scott
Browse files

Changed things after rebasing

parent 74420844
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !12. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
compact/ci_GEM.xml
+ 9
− 2
View file @ aed4c8d1
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
<comment> <comment>
Central Ion GEM Central Ion GEM
</comment> </comment>
<detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis"> <detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis" readout="ci_GEM_Hits">
<material name="Ar10CO2"/> <material name="Ar10CO2"/>
<dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz" z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1. * cm"/> <dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz" z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1*cm"/>
<layer id="0" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 0) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 0) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 0) * cm" dz="1 * cm" /> <layer id="0" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 0) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 0) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 0) * cm" dz="1 * cm" />
<layer id="1" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 1) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 1) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 1) * cm" dz="1 * cm" /> <layer id="1" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 1) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 1) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 1) * cm" dz="1 * cm" />
<layer id="2" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 2) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 2) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 2) * cm" dz="1 * cm" /> <layer id="2" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 2) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 2) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 2) * cm" dz="1 * cm" />
...@@ -55,6 +55,13 @@ ...@@ -55,6 +55,13 @@
<layer id="7" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 7) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 7) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 7) * cm" dz="1 * cm" /> <layer id="7" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 7) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 7) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 7) * cm" dz="1 * cm" />
</detector> </detector>
</detectors> </detectors>
<readouts>
<readout name="ci_GEM_Hits">
<segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
<id>system:8,layer:8,x:32:-16,y:-16</id>
</readout>
</readouts>
<plugins> <plugins>
</plugins> </plugins>
......
compact/ci_HCAL.xml
+ 8
− 1
View file @ aed4c8d1
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<comment> <comment>
Central Ion HCAL Central Ion HCAL
</comment> </comment>
<detector id="ci_HCAL_id" name="ci_HCAL" type="ci_HCAL" insideTrackingVolume="false" vis="ci_HCALVis"> <detector id="ci_HCAL_id" name="ci_HCAL" type="ci_HCAL" insideTrackingVolume="false" vis="ci_HCALVis" readout="ci_HCAL_Hits">
<material name="Iron"/> <material name="Iron"/>
<dimensions rmin="ci_HCAL_rin" rmax="ci_HCAL_rout" z_length="ci_HCAL_sizez" z_offset="ci_HCAL_shiftz" z="ci_HCAL_posz" x="ci_HCAL_posx" number="ci_HCAL_nlayers" rmin1="ci_HCAL_lay_rin" rmax1="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness"/> <dimensions rmin="ci_HCAL_rin" rmax="ci_HCAL_rout" z_length="ci_HCAL_sizez" z_offset="ci_HCAL_shiftz" z="ci_HCAL_posz" x="ci_HCAL_posx" number="ci_HCAL_nlayers" rmin1="ci_HCAL_lay_rin" rmax1="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness"/>
<layer id="0" z="-ci_HCAL_sizez * 0.5 + (1 + 0) * ci_HCAL_lay_thickness + (1 + 0) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" /> <layer id="0" z="-ci_HCAL_sizez * 0.5 + (1 + 0) * ci_HCAL_lay_thickness + (1 + 0) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" />
...@@ -53,6 +53,13 @@ ...@@ -53,6 +53,13 @@
<layer id="19" z="-ci_HCAL_sizez * 0.5 + (1 + 19) * ci_HCAL_lay_thickness + (1 + 19) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" /> <layer id="19" z="-ci_HCAL_sizez * 0.5 + (1 + 19) * ci_HCAL_lay_thickness + (1 + 19) * 5 * cm" inner_r="ci_HCAL_lay_rin" outer_r="ci_HCAL_lay_rout" dz="ci_HCAL_lay_thickness" />
</detector> </detector>
</detectors> </detectors>
<readouts>
<readout name="ci_HCAL_Hits">
<segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
<id>system:8,layer:8,x:32:-16,y:-16</id>
</readout>
</readouts>
<plugins> <plugins>
</plugins> </plugins>
......
compact/definitions.xml
+ 37
− 46
View file @ aed4c8d1
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<comment> <comment>
=================== ===================
(75-99) Reserved IDs (75-99 Reserved IDs
=================== ===================
Unused IDs: 75-99 Unused IDs: 75-99
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<comment> <comment>
===================================== =====================================
(110-119) Hadronic Calorimeter (110-119Hadronic Calorimeter
===================================== =====================================
HCal subsystem ID: 110 HCal subsystem ID: 110
...@@ -570,16 +570,26 @@ ...@@ -570,16 +570,26 @@
ce_MRICH Parameters ce_MRICH Parameters
-------------------------- --------------------------
</comment> </comment>
<<<<<<< HEAD
<constant name="ce_MRICHRMin" value="15*cm"/> <constant name="ce_MRICHRMin" value="15*cm"/>
<constant name="ce_MRICHRMax" value="100*cm"/> <constant name="ce_MRICHRMax" value="100*cm"/>
<constant name="ce_MRICHLength" value="BackwardCherenkovLength"/> <constant name="ce_MRICHLength" value="BackwardCherenkovLength"/>
<constant name="ce_MRICHZMin" value="-EcalEndcapN_zmin+ce_MRICHLength"/> <constant name="ce_MRICHZMin" value="-EcalEndcapN_zmin+ce_MRICHLength"/>
=======
<constant name="ce_MRICHRMin" value="15*cm"/> <comment>
<constant name="ce_MRICHRMax" value="100*cm"/> ------------------
<constant name="ce_MRICHLength" value="15*cm"/> ce_GEM Parameters
<constant name="ce_MRICHZMin" value="-EcalEndcap_zmin+10.*cm"/> ------------------
</comment>
<constant name="ce_GEM_rmin" value="5.0 * cm"/> <comment> temporary number. Need beampipe radius </comment>
<!--<constant name="ce_GEM_rmin" value="0.0 * cm"/>-->
<constant name="ce_GEM_rmax" value="HcalEndcapN_rmin + 8.0 * cm"/> <comment> temporary number to avoid overlaps </comment>
<!--<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>-->
<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="-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"/>
<comment> <comment>
-------------------------- --------------------------
...@@ -588,7 +598,7 @@ ...@@ -588,7 +598,7 @@
</comment> </comment>
<constant name="ci_HCAL_id" value="200"/> <constant name="ci_HCAL_id" value="200"/>
<constant name="ci_HCAL_rin" value="SolenoidBarrel_rmax + 1 * cm"/><!-- Original = 0cm --> <constant name="ci_HCAL_rin" value="225 * cm"/><!-- Original = 0cm -->
<constant name="ci_HCAL_rout" value="300 * cm"/> <constant name="ci_HCAL_rout" value="300 * cm"/>
<constant name="ci_HCAL_sizez" value="160 * cm"/> <constant name="ci_HCAL_sizez" value="160 * cm"/>
<constant name="ci_HCAL_shiftz" value="5 * cm"/> <constant name="ci_HCAL_shiftz" value="5 * cm"/>
...@@ -615,24 +625,5 @@ ...@@ -615,24 +625,5 @@
<constant name="ci_GEM_nlayers" value="8"/> <constant name="ci_GEM_nlayers" value="8"/>
>>>>>>> 57cf00b (Changed .xml files and ci_GEM.cpp)
<comment>
------------------
ce_GEM Parameters
------------------
</comment>
<constant name="ce_GEM_rmin" value="7.0 * cm"/> <comment> temporary number. Need beampipe radius </comment>
<!--<constant name="ce_GEM_rmin" value="0.0 * cm"/>-->
<constant name="ce_GEM_rmax" value="HcalEndcapN_rmin + 8.0 * cm"/> <comment> temporary number to avoid overlaps </comment>
<!--<constant name="ce_GEM_rmax" value="45.0 * cm + 50.0 * cm"/>-->
<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="-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"/>
</define> </define>
compact/materials.xml
+ 0
− 7
View file @ aed4c8d1
...@@ -185,13 +185,6 @@ ...@@ -185,13 +185,6 @@
<composite n="1" ref="W"/> <composite n="1" ref="W"/>
<composite n="4" ref="O"/> <composite n="4" ref="O"/>
</material> </material>
<material name="Ar10CO2">
<D type="density" value="1.802e-3" unit="g / cm3"/>
<composite n="10" ref="Ar"/>
<composite n="1" ref="C"/>
<composite n="2" ref="O"/>
</material>
<material name="Ar10CO2"> <material name="Ar10CO2">
<D type="density" value="1.802" unit="mg / cm3"/> <D type="density" value="1.802" unit="mg / cm3"/>
<composite n="0.891" ref="Argon"/> <composite n="0.891" ref="Argon"/>
......
reference_detector.xml
+ 3
− 14
View file @ aed4c8d1
...@@ -114,33 +114,22 @@ ...@@ -114,33 +114,22 @@
<include ref="reference_detector/vertex_tracker.xml"/> <include ref="reference_detector/vertex_tracker.xml"/>
<include ref="compact/silicon_tracker.xml"/> <include ref="compact/silicon_tracker.xml"/>
--> -->
<!--
<include ref="ip6/beampipe.xml"/> <include ref="ip6/beampipe.xml"/>
-->
<include ref="compact/solenoid.xml"/> <include ref="compact/solenoid.xml"/>
<!--
<include ref="compact/ecal.xml"/> <include ref="compact/ecal.xml"/>
<include ref="compact/cb_CTD_Si.xml"/> <include ref="compact/cb_CTD_Si.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/ffi_ZDC.xml"/> <include ref="compact/ffi_ZDC.xml"/>
-->
<!--
<include ref="compact/forward_rich.xml"/>
<include ref="compact/hcal.xml"/>
-->
<include ref="compact/ci_HCAL.xml"/> <include ref="compact/ci_HCAL.xml"/>
<!--
<include ref="compact/ci_GEM.xml"/> <include ref="compact/ci_GEM.xml"/>
-->
<!-- <!--
<include ref="compact/forward_rich.xml"/>
<include ref="compact/hcal.xml"/>
<include ref="compact/roman_pots.xml"/> <include ref="compact/roman_pots.xml"/>
--> -->
<!--
<include ref="eic/forward_ion_beamline.xml"/> <include ref="eic/forward_ion_beamline.xml"/>
-->
<detectors> <detectors>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment