diff --git a/compact/cb_CTD_Si.xml b/compact/cb_CTD_Si.xml index a4dda7bb031a4cc124fcd0c11f4764016fecba04..3505aa3fad614d89d53223692b46031734b668f9 100644 --- a/compact/cb_CTD_Si.xml +++ b/compact/cb_CTD_Si.xml @@ -16,7 +16,7 @@ <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"> - <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"> <slice name="Silicon_slice" material="Si" sensitive="true"/> </layer> diff --git a/compact/definitions.xml b/compact/definitions.xml index 1da460b2c9f9b39db9bc9271bf3c880b4d51740a..e6e086092340063d62dd7f44ae2e7343ddd3b5d9 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -325,11 +325,11 @@ </comment> <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_limitZ" value="120.0 * cm"/> - <constant name="cb_CTD_Si_length" value="SolenoidLength - cb_CTD_Si_limitZ"/> + <constant name="cb_CTD_Si_zmax" value="120.0 * cm"/> + <constant name="cb_CTD_Si_length" value="SolenoidLength - cb_CTD_Si_zmax"/> <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_layer" value="15"/> diff --git a/reference_detector.xml b/reference_detector.xml index db0a52b76c7796d6581f981be0b256404480359f..5273af7b84b6b03b87e67300717f2e01bb4d90cc 100644 --- a/reference_detector.xml +++ b/reference_detector.xml @@ -114,6 +114,7 @@ <include ref="reference_detector/vertex_tracker.xml"/> <include ref="compact/silicon_tracker.xml"/> --> + <include ref="compact/cb_CTD_Si.xml"/> <include ref="ip6/beampipe.xml"/> <include ref="compact/ffi_ZDC.xml"/> <include ref="compact/solenoid.xml"/> diff --git a/src/cb_CTD_Si.cpp b/src/cb_CTD_Si.cpp index 0265eb8710e6dec6cf9cf7d48ad96fec6b287b44..d0f7025f9c3246f31a578252bfe8ceffe8947e50 100644 --- a/src/cb_CTD_Si.cpp +++ b/src/cb_CTD_Si.cpp @@ -16,7 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) double RIn = dim.rmin(); double ROut = dim.rmax(); double SizeZ = dim.length(); - double SizeZCut = dim.limit(); + double SizeZCut = dim.zmax(); double SiLayerGap = dim.gap(); Material Vacuum = desc.material("Vacuum"); @@ -35,4 +35,4 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) return det; } -DECLARE_DETELEMENT(ffi_ZDC, createDetector) +DECLARE_DETELEMENT(cb_CTD_Si, createDetector)