Resolve "50cm shift of lattice and FF detectors"

Closes #35 (closed)

src/hadronDownstreamBeamPipe.cpp

@@ -49,8 +49,8 @@ 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.0475492667;
-  double zPosShift             = 50.0; //cm
+  double drift_beam_pipe_angle = -0.0476460332;
+  //double zPosShift             = 50.0; //cm
 
   double b0_hadron_tube_inner_r = 2.9; // cm
   double b0_hadron_tube_outer_r = 3.1; //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  = 392.0; //393.4334363;
+  double drift_hadron_section_1_length  = 343.7249973; //393.4334363;
 
   double drift_hadron_section_2_inner_r = 19.5;
   double drift_hadron_section_2_outer_r = 20.5;
@@ -112,7 +112,7 @@ 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.115695, 0.0, 2377.94246))); //2353.06094)));
+  auto pv_drift_tube_section_1 = assembly.placeVolume( v_drift_tube_section_1, Transform3D(RotationY(drift_beam_pipe_angle), Position(-73.225695, 0.0, 2377.94246))); //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);
@@ -124,12 +124,12 @@ static Ref_t create_detector(Detector& det, xml_h e, SensitiveDetector sens)  {
   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(-105.225167, 0.0, 3049.04249)));
+  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)));
   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(-129.039171, 0.0, 3548.47506)));
+  auto pv_drift_tube_section_4 = assembly.placeVolume( v_drift_tube_section_4, Transform3D(RotationY(drift_beam_pipe_angle), Position(-121.89497, 0.0, 3398.64529)));
   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);