Skip to content
Snippets Groups Projects
Commit a8547b93 authored by Jihee Kim's avatar Jihee Kim
Browse files

Rename dimensions

parent ee4c20e8
No related branches found
No related tags found
1 merge request!30Resolve "Implement cb_CTD_SI"
Pipeline #7879 failed
This commit is part of merge request !30. Comments created here will be created in the context of that merge request.
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<detectors> <detectors>
<detector id="cb_CTD_Si_ID" name="cb_CTD_Si" type="cb_CTD_Si" readout="cb_CTD_Si_Hits" vis="cb_CTD_SiVis" insideTrackingVloume="true"> <detector id="cb_CTD_Si_ID" name="cb_CTD_Si" type="cb_CTD_Si" readout="cb_CTD_Si_Hits" vis="cb_CTD_SiVis" insideTrackingVloume="true">
<dimensions rmin="cb_CTD_Si_rmin" rmax="cb_CTD_Si_rmax" length="cb_CTD_Si_length" limit="cb_CTD_Si_limitZ" gap="cb_CTD_Si_gap"/> <dimensions rmin="cb_CTD_Si_rmin" rmax="cb_CTD_Si_rmax" length="cb_CTD_Si_length" zmax="cb_CTD_Si_zmax" gap="cb_CTD_Si_gap"/>
<layer repeat="cb_CTD_Si_layer" vis="cb_CTD_Si_layerVis"> <layer repeat="cb_CTD_Si_layer" vis="cb_CTD_Si_layerVis">
<slice name="Silicon_slice" material="Si" sensitive="true"/> <slice name="Silicon_slice" material="Si" sensitive="true"/>
</layer> </layer>
......
...@@ -325,11 +325,11 @@ ...@@ -325,11 +325,11 @@
</comment> </comment>
<constant name="cb_CTD_Si_rmin" value="21.0 * cm"/> <constant name="cb_CTD_Si_rmin" value="21.0 * cm"/>
<constant name="cb_CTD_Si_rmax" value="80.0 * cm"/> <constant name="cb_CTD_Si_rmax" value="80.0 * cm"/>
<constant name="cb_CTD_Si_limitZ" value="120.0 * cm"/> <constant name="cb_CTD_Si_zmax" value="120.0 * cm"/>
<constant name="cb_CTD_Si_length" value="SolenoidLength - cb_CTD_Si_limitZ"/> <constant name="cb_CTD_Si_length" value="SolenoidLength - cb_CTD_Si_zmax"/>
<comment> After fix cb_Solenoid parameters </comment> <comment> After fix cb_Solenoid parameters </comment>
<!-- <!--
<constant name="cb_CTD_Si_length" value="cb_Solenoid_z - cb_CTD_Si_limitZ"/> <constant name="cb_CTD_Si_length" value="cb_Solenoid_z - cb_CTD_Si_zmax"/>
--> -->
<constant name="cb_CTD_Si_gap" value="5.0 * cm"/> <constant name="cb_CTD_Si_gap" value="5.0 * cm"/>
<constant name="cb_CTD_Si_layer" value="15"/> <constant name="cb_CTD_Si_layer" value="15"/>
......
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
<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="compact/cb_CTD_Si.xml"/>
<include ref="ip6/beampipe.xml"/> <include ref="ip6/beampipe.xml"/>
<include ref="compact/ffi_ZDC.xml"/> <include ref="compact/ffi_ZDC.xml"/>
<include ref="compact/solenoid.xml"/> <include ref="compact/solenoid.xml"/>
......
...@@ -16,7 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) ...@@ -16,7 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
double RIn = dim.rmin(); double RIn = dim.rmin();
double ROut = dim.rmax(); double ROut = dim.rmax();
double SizeZ = dim.length(); double SizeZ = dim.length();
double SizeZCut = dim.limit(); double SizeZCut = dim.zmax();
double SiLayerGap = dim.gap(); double SiLayerGap = dim.gap();
Material Vacuum = desc.material("Vacuum"); Material Vacuum = desc.material("Vacuum");
...@@ -35,4 +35,4 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) ...@@ -35,4 +35,4 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens)
return det; return det;
} }
DECLARE_DETELEMENT(ffi_ZDC, createDetector) DECLARE_DETELEMENT(cb_CTD_Si, createDetector)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment