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

Increased ZDC_HCAL Box dimensions, Reduced ZDC_EMCAL world volume

parent fe7db153
No related branches found
No related tags found
No related merge requests found
Pipeline #8517 failed
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
<comment> Global parameters </comment> <comment> Global parameters </comment>
<constant name="ffi_ZDC_width" value="60.0 * cm"/> <constant name="ffi_ZDC_width" value="60.0 * cm"/>
<constant name="ffi_ZDC_thickness" value="200.0 * cm"/> <constant name="ffi_ZDC_thickness" value="65.0 * cm"/><comment> Changed from 200.0 cm </comment>
<comment> Original Global parameters </comment> <comment> Original Global parameters </comment>
<!-- <!--
<constant name="ffi_ZDC_thickness" value="250.0 * cm"/> <constant name="ffi_ZDC_thickness" value="250.0 * cm"/>
......
...@@ -14,11 +14,6 @@ ...@@ -14,11 +14,6 @@
<!-- Use DD4hep elements and materials definitions --> <!-- Use DD4hep elements and materials definitions -->
<includes> <includes>
<<<<<<< HEAD
<gdmlFile ref="elements.xml"/>
<gdmlFile ref="materials.xml"/>
=======
>>>>>>> 9ee3db9223b2155b54d5db56319ad967a8d6c7c0
</includes> </includes>
<!-- Define the dimensions of the world volume --> <!-- Define the dimensions of the world volume -->
......
...@@ -36,7 +36,7 @@ static Ref_t createDetector(Detector& lcdd, xml_h e, SensitiveDetector sens) { ...@@ -36,7 +36,7 @@ static Ref_t createDetector(Detector& lcdd, xml_h e, SensitiveDetector sens) {
int layer_num = 1; int layer_num = 1;
int slice_num = 1; int slice_num = 1;
double totWidth = Layering(x_det).totalThickness(); double totWidth = Layering(x_det).totalThickness();
Box envelope (pixel_x/2.0, pixel_y/2.0,totWidth/2.0); Box envelope ((pixel_x + 10.0*dd4hep::mm)/2.0, (pixel_y + 10.0*dd4hep::mm)/2.0,totWidth/2.0);
Volume envelopeVol(det_name+"_envelope",envelope,air); Volume envelopeVol(det_name+"_envelope",envelope,air);
PlacedVolume pv; PlacedVolume pv;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment