diff --git a/compact/definitions.xml b/compact/definitions.xml index b32f212ce057933a31fcbfd1b812eed22c71469c..1bee6a7d3390ee292adea082eba75ce97973e3d1 100644 --- a/compact/definitions.xml +++ b/compact/definitions.xml @@ -666,7 +666,7 @@ <constant name="ffi_ZDC_ECAL_outer_radius" value="60.0 * cm"/> <constant name="ffi_ZDC_ECAL_width" value="5.0 * cm"/> <constant name="ffi_ZDC_ECAL_gap" value="5.0 * mm"/> - <constant name="ffi_ZDC_ECAL_ntower" value="12"/> + <constant name="ffi_ZDC_ECAL_ntower" value="11"/> <comment> Original number of towers parameter </comment> <!-- <constant name="ffi_ZDC_ECAL_ntower" value="20"/> diff --git a/reference_detector.xml b/reference_detector.xml index 16f467a5bc170c38977dbb88fa3e83d0741de362..b84e4bf7f9d194f9db07ae3a4abf23d1634e6274 100644 --- a/reference_detector.xml +++ b/reference_detector.xml @@ -108,7 +108,6 @@ </display> <comment> Include the IP components first </comment> - <!-- <include ref="ip6/forward_ion_beamline.xml"/> <include ref="ip6/beampipe.xml"/> @@ -118,18 +117,18 @@ <include ref="compact/solenoid.xml"/> <include ref="compact/ecal.xml"/> - <include ref="compact/hcal.xml"/>--> + <include ref="compact/hcal.xml"/> <!--include ref="compact/ce_GEM.xml"/--> <!--include ref="compact/vertex_tracker.xml"/--> <!--include ref="compact/gem_tracker_endcap.xml"/--> - <!--<include ref="compact/ce_mrich.xml"/> + <include ref="compact/ce_mrich.xml"/> <include ref="compact/tof_endcap.xml"/> <include ref="compact/forward_trd.xml"/> <include ref="compact/forward_rich.xml"/> <include ref="compact/B0_tracker.xml"/> <include ref="compact/far_forward_offM_tracker.xml"/> - <include ref="compact/far_forward_romanpots.xml"/>--> + <include ref="compact/far_forward_romanpots.xml"/> <include ref="compact/far_forward_detectors.xml"/> diff --git a/src/ffi_ZDC.cpp b/src/ffi_ZDC.cpp index 0a567188d05d72dc0175fa840b2160c34ef3e937..5d0b39beb00290e0deb59531b22bc41fd15c2bb4 100644 --- a/src/ffi_ZDC.cpp +++ b/src/ffi_ZDC.cpp @@ -18,7 +18,7 @@ static Ref_t createDetector(Detector& desc, xml_h e, SensitiveDetector sens) int detID = x_det.id(); xml_dim_t dim = x_det.dimensions(); - double Width = dim.x() + 10.0 * cm; + double Width = dim.x() + 5.0 * cm; double Thickness = dim.z(); xml_dim_t pos = x_det.position();