Commit 41df9daa authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

modified: src/TopsideIRBeamPipe_geo.cpp

parent 211e39f3
......@@ -84,16 +84,15 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
Tube upstream_IP_tube(IP_beampipe_ID/2.0, IP_beampipe_OD/2.0, upstream_straight_length/2.0);
Tube upstream_IP_vacuum(0.0, IP_beampipe_OD/2.0, upstream_straight_length/2.0);
Volume v_upstream_IP_tube("v_upstream_IP_tube", upstream_IP_tube, m_Al);
Volume v_downstream_IP_tube("v_downstream_IP_tube", downstream_IP_tube, m_Al);
Volume v_upstream_IP_tube("v_upstream_IP_tube", upstream_IP_tube, m_Be);
Volume v_downstream_IP_tube("v_downstream_IP_tube", downstream_IP_tube, m_Be);
//v_upstream_IP_tube.setVisAttributes(det,"GrayVis");
//v_downstream_IP_tube.setVisAttributes(det,"RedVis");
sdet.setAttributes(det, v_upstream_IP_tube , x_det.regionStr(), x_det.limitsStr(), vis_name);
sdet.setAttributes(det, v_downstream_IP_tube, x_det.regionStr(), x_det.limitsStr(), vis_name);
auto pv_upstream_IP_tube = assembly.placeVolume(
v_upstream_IP_tube, Position(0, 0, -upstream_straight_length / 2.0));
auto pv_upstream_IP_tube = assembly.placeVolume( v_upstream_IP_tube, Position(0, 0, -upstream_straight_length / 2.0));
auto pv_downstream_IP_tube = assembly.placeVolume(
v_downstream_IP_tube, Position(0, 0, downstream_straight_length / 2.0));
......@@ -110,8 +109,8 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
Cone upstream_conic_section_vacuum(upstream_conic_length / 2.0,
0.0, IP_beampipe_ID / 2.0,
0.0, IP_beampipe_ID / 2.0 + upstream_delta_r);
Volume v_upstream_conic_section("v_upstream_conic_section", upstream_conic_section, m_Al);
Volume v_upstream_electron_tube("v_upstream_electron_tube", upstream_electron_tube, m_Al);
Volume v_upstream_conic_section("v_upstream_conic_section", upstream_conic_section, m_Be);
Volume v_upstream_electron_tube("v_upstream_electron_tube", upstream_electron_tube, m_Be);
sdet.setAttributes(det, v_upstream_conic_section, x_det.regionStr(), x_det.limitsStr(), vis_name);
sdet.setAttributes(det, v_upstream_electron_tube, x_det.regionStr(), x_det.limitsStr(), vis_name);
//Volume v_upstream_conic_section_vacuum("v_upstream_conic_section_vacuum", upstream_electron_tube, m_Al);
......@@ -153,13 +152,13 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
RotationY(crossing_angle));
SubtractionSolid downstream_pipe_split1(downstream_pipe_split0,
downstream_pipe_vacuum_split0);
Volume v_downstream_pipe_split1("v_downstream_pipe_split1", downstream_pipe_split1, m_Al);
Volume v_downstream_pipe_split1("v_downstream_pipe_split1", downstream_pipe_split1, m_Be);
sdet.setAttributes(det, v_downstream_pipe_split1, x_det.regionStr(), x_det.limitsStr(), vis_name);
auto pv_downstream_pipe_split1 = assembly.placeVolume(v_downstream_pipe_split1,
Position(0, 0,
downstream_straight_length +
downstream_conic_length / 2.0));
Volume v_downstream_taper_section("v_downstream_taper_section", downstream_taper_section, m_Al);
Volume v_downstream_taper_section("v_downstream_taper_section", downstream_taper_section, m_Be);
sdet.setAttributes(det, v_downstream_taper_section, x_det.regionStr(), x_det.limitsStr(), vis_name);
auto pv_downstream_taper_section = assembly.placeVolume(
v_downstream_taper_section, Position(0, 0,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment