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

Should be good to go

parent 5616c8c2
No related branches found
No related tags found
No related merge requests found
Pipeline #8065 passed
Stage: config
Stage: build
Stage: docs
Stage: test
Stage: finalize
This commit is part of merge request !12. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
compact/definitions.xml
+ 20
− 37
View file @ 1f39f68e
......@@ -570,16 +570,28 @@
ce_MRICH Parameters
--------------------------
</comment>
<<<<<<< HEAD
<constant name="ce_MRICHRMin" value="15*cm"/>
<constant name="ce_MRICHRMax" value="100*cm"/>
<constant name="ce_MRICHLength" value="BackwardCherenkovLength"/>
<constant name="ce_MRICHZMin" value="-EcalEndcapN_zmin+ce_MRICHLength"/>
=======
<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"/>
<comment>
------------------
ce_GEM Parameters
------------------
</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>
--------------------------
......@@ -588,22 +600,14 @@
</comment>
<constant name="ci_HCAL_id" value="200"/>
<<<<<<< HEAD
<constant name="ci_HCAL_rin" value="SolenoidBarrel_rmax + 1 * cm"/><!-- Original = 0cm -->
=======
<constant name="ci_HCAL_rin" value="225 * cm"/><!-- Original = 0cm -->
>>>>>>> accc12d945b665ea0ea64496ddc2f0177aa5e3a9
<constant name="ci_HCAL_rin" value="225 * cm"/><comment> Orginally 0, changed to not overlap solenoid </comment>
<constant name="ci_HCAL_rout" value="300 * cm"/>
<constant name="ci_HCAL_sizez" value="160 * cm"/>
<constant name="ci_HCAL_shiftz" value="5 * cm"/>
<constant name="ci_HCAL_posz" value="0 * cm"/>
<constant name="ci_HCAL_nlayers" value="20"/>
<<<<<<< HEAD
<constant name="ci_HCAL_lay_rin" value="ci_HCAL_rin"/> <!-- Original = 80cm -->
=======
<constant name="ci_HCAL_lay_rin" value="225 * cm"/> <!-- Original = 80cm -->
>>>>>>> accc12d945b665ea0ea64496ddc2f0177aa5e3a9
<constant name="ci_HCAL_lay_rin" value="ci_HCAL_rin"/> <comment> Orginally 80cm, changed to not overlap solenoid </comment>
<constant name="ci_HCAL_lay_rout" value="ci_HCAL_rout - 1 * cm"/>
<constant name="ci_HCAL_lay_thickness" value="2* cm"/>
<constant name="ci_HCAL_lay_gapz" value="2* cm"/>
......@@ -622,29 +626,8 @@
<constant name="ci_GEM_posx" value="0 * cm"/>
<constant name="ci_GEM_nlayers" value="8"/>
<<<<<<< HEAD
=======
>>>>>>> accc12d945b665ea0ea64496ddc2f0177aa5e3a9
>>>>>>> 57cf00b (Changed .xml files and ci_GEM.cpp)
<comment>
------------------
ce_GEM Parameters
------------------
</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"/>
</define>
compact/display.xml
+ 0
− 3
View file @ 1f39f68e
......@@ -59,9 +59,6 @@
<vis name="ci_GEMVis" r= "0.8" g="0.4" b="0.3" alpha="0.8" showDaughters="true" visible="true"/>
<vis name="ci_HCALVis" r= "0.6" g="0" b="0.6" alpha="1.0" showDaughters="true" visible="true"/>
<vis name="ci_GEMVis" r= "0.8" g="0.4" b="0.3" alpha="0.8" showDaughters="true" visible="true"/>
<vis name="ci_HCALVis" r= "0.6" g="0" b="0.6" alpha="1.0" showDaughters="true" visible="true"/>
<comment>
Deprecated colors.
</comment>
......
compact/materials.xml
+ 0
− 10
View file @ 1f39f68e
......@@ -185,14 +185,6 @@
<composite n="1" ref="W"/>
<composite n="4" ref="O"/>
</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>
<<<<<<< HEAD
<material name="Ar10CO2">
<D type="density" value="1.802" unit="mg / cm3"/>
<composite n="0.891" ref="Argon"/>
......@@ -200,7 +192,5 @@
<composite n="0.036" ref="C"/>
<composite n="0.073" ref="O"/>
</material>
=======
>>>>>>> accc12d945b665ea0ea64496ddc2f0177aa5e3a9
</materials>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment