Skip to content
Snippets Groups Projects

Resolve "50cm shift of lattice and FF detectors"

Merged Alex Jentsch requested to merge 35-50cm-shift-of-lattice-and-ff-detectors into master
Compare and Show latest version
1 file
+ 4
4
Compare changes
  • Side-by-side
  • Inline
@@ -62,13 +62,13 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
double drift_hadron_section_2_inner_r = 19.5;
double drift_hadron_section_2_outer_r = 20.5;
double drift_hadron_section_2_length = 300.0;
double drift_hadron_section_2_length = 250.0;
double drift_hadron_section_3_inner_r_ent = 19.5;
double drift_hadron_section_3_outer_r_ent = 20.5;
double drift_hadron_section_3_inner_r_ex = 5.0;
double drift_hadron_section_3_outer_r_ex = 5.2;
double drift_hadron_section_3_length = 100.0;
double drift_hadron_section_3_length = 150.0;
double drift_hadron_section_4_inner_r = 5.0;
double drift_hadron_section_4_outer_r = 5.2;
@@ -118,13 +118,13 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens) {
tube_de_2.setPlacement(pv_drift_tube_section_1);
//Second section - RP scattering chamber -- keeping separate for now.
auto pv_drift_tube_section_2 = assembly.placeVolume( v_drift_tube_section_2, Transform3D(RotationY(drift_beam_pipe_angle), Position(-88.555365, 0.0, 2699.43969)));
auto pv_drift_tube_section_2 = assembly.placeVolume( v_drift_tube_section_2, Transform3D(RotationY(drift_beam_pipe_angle), Position(-87.3646644, 0.0, 2674.468064)));
pv_drift_tube_section_2.addPhysVolID("sector", 1);
DetElement tube_de_3(sdet, "sector3_de", 1);
tube_de_3.setPlacement(pv_drift_tube_section_2);
//Third section -- tapered section acting as poor man's universal exit window.
auto pv_drift_tube_section_3 = assembly.placeVolume( v_drift_tube_section_3, Transform3D(RotationY(drift_beam_pipe_angle), Position(-98.080966, 0.0, 2899.21272)));
auto pv_drift_tube_section_3 = assembly.placeVolume( v_drift_tube_section_3, Transform3D(RotationY(drift_beam_pipe_angle), Position(-96.890266, 0.0, 2874.241092)));
pv_drift_tube_section_3.addPhysVolID("sector", 1);
DetElement tube_de_4(sdet, "sector4_de", 1);
tube_de_4.setPlacement(pv_drift_tube_section_3);
Loading