Resolve "50cm shift of lattice and FF detectors"

Closes #35 (closed)

src/hadronDownstreamBeamPipe.cpp

@@ -49,7 +49,7 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens)  {
 
   /// hard-code defintion here, then refine and make more general
 
-  double drift_beam_pipe_angle = -0.0476570177;
+  double drift_beam_pipe_angle = -0.047666638;
   //double zPosShift             = 50.0; //cm
 
   double b0_hadron_tube_inner_r = 2.9; // cm
@@ -58,7 +58,7 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens)  {
 
   double drift_hadron_section_1_inner_r = 19.5;
   double drift_hadron_section_1_outer_r = 20.5;
-  double drift_hadron_section_1_length  = 343.7249973; //393.4334363;
+  double drift_hadron_section_1_length  = 342.225466; //393.4334363;
 
   double drift_hadron_section_2_inner_r = 19.5;
   double drift_hadron_section_2_outer_r = 20.5;
@@ -112,24 +112,24 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens)  {
   tube_de_1.setPlacement(pv_b0_hadron_tube);
 
   //first tube section - right after b1apf - has same size as RP chamber, but keeping separate.
-  auto pv_drift_tube_section_1 = assembly.placeVolume( v_drift_tube_section_1, Transform3D(RotationY(drift_beam_pipe_angle), Position(-73.228529, 0.0, 2378.3427))); //2353.06094)));
+  auto pv_drift_tube_section_1 = assembly.placeVolume( v_drift_tube_section_1, Transform3D(RotationY(drift_beam_pipe_angle), Position(-73.23100294, 0.0, 2378.69291))); //2353.06094)));
   pv_drift_tube_section_1.addPhysVolID("sector", 1);
   DetElement tube_de_2(sdet, "sector2_de", 1);
   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.54268, 0.0, 2699.44034)));
+  auto pv_drift_tube_section_2 = assembly.placeVolume( v_drift_tube_section_2, Transform3D(RotationY(drift_beam_pipe_angle), Position(-88.5315717, 0.0, 2699.440911)));
   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(-99.261451, 0.0, 2924.18488)));
+  auto pv_drift_tube_section_3 = assembly.placeVolume( v_drift_tube_section_3, Transform3D(RotationY(drift_beam_pipe_angle), Position(-99.25250431, 0.0, 2924.185347)));
   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);
 
-  auto pv_drift_tube_section_4 = assembly.placeVolume( v_drift_tube_section_4, Transform3D(RotationY(drift_beam_pipe_angle), Position(-123.080941, 0.0, 3423.61719)));
+  auto pv_drift_tube_section_4 = assembly.placeVolume( v_drift_tube_section_4, Transform3D(RotationY(drift_beam_pipe_angle), Position(-123.076799, 0.0, 3423.617428)));
   pv_drift_tube_section_4.addPhysVolID("sector", 1);
   DetElement tube_de_5(sdet, "sector5_de", 1);
   tube_de_5.setPlacement(pv_drift_tube_section_4);