Skip to content
Snippets Groups Projects
Commit 1628be70 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

modified: compact/ci_GEM.xml

	modified:   src/ci_GEM.cpp
parent a3fa1230
No related branches found
No related tags found
No related merge requests found
Pipeline #8113 failed
This commit is part of merge request !12. Comments created here will be created in the context of that merge request.
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis" readout="ci_GEM_Hits"> <detector id="ci_GEM_id" name="ci_GEM" type="ci_GEM" insideTrackingVolume="false" vis="ci_GEMVis" readout="ci_GEM_Hits">
<material name="Ar10CO2"/> <material name="Ar10CO2"/>
<comment> position of the front face of the detector </comment> <comment> position of the front face of the detector </comment>
<position x="0" y="0" z="0"/> <position x="0" y="0" z="SiliconTrackerOuterBarrel_zmax"/>
<dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz" z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1. * cm"/> <dimensions rmin="ci_GEM_rin" rmax="ci_GEM_rout" z_length="ci_GEM_sizez" z_offset="ci_GEM_shiftz" z="ci_GEM_posz" x="ci_GEM_posx" number="ci_GEM_nlayers" rmax1="ci_HCAL_lay_rin -1. * cm"/>
<layer id="0" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 0) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 0) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 0) * cm" dz="1 * cm" /> <layer id="0" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 0) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 0) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 0) * cm" dz="1 * cm" />
<layer id="1" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 1) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 1) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 1) * cm" dz="1 * cm" /> <layer id="1" z="-ci_GEM_sizez * 0.5 + (5 + 3. * 1) * cm" inner_r="ci_GEM_rin + (1. + 0.5 * 1) * cm" outer_r="ci_GEM_rout + (-25. + 2. * 1) * cm" dz="1 * cm" />
......
...@@ -33,7 +33,9 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens ...@@ -33,7 +33,9 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
xml_comp_t x_layer = li; xml_comp_t x_layer = li;
std::string layer_name = detName + _toString(x_layer.id(), "_layer%d"); std::string layer_name = detName + _toString(x_layer.id(), "_layer%d");
double outer_r = x_layer.outer_r(); double outer_r = x_layer.outer_r();
if (outer_r > HCAL_rmin){outer_r = HCAL_rmin;} if (outer_r > HCAL_rmin) {
outer_r = HCAL_rmin;
}
Volume layer_vol(layer_name, Tube(x_layer.inner_r(), outer_r, x_layer.dz()), mat); Volume layer_vol(layer_name, Tube(x_layer.inner_r(), outer_r, x_layer.dz()), mat);
layer_vol.setVisAttributes(desc.visAttributes(detElem.visStr())); layer_vol.setVisAttributes(desc.visAttributes(detElem.visStr()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment