Merge pull request #27435 from mantidproject/pychop_maps_distance_changes

Corrected Fermi and sample distance on MAPS for PyChop

scripts/PyChop/maps.yaml

@@ -3,7 +3,7 @@ name: MAPS
 
 chopper_system:
   name: MAPS chopper system
-  chop_sam: 1.9                 # Distance (x1) from final chopper to sample (m)
+  chop_sam: 1.899               # Distance (x1) from final chopper to sample (m)
   sam_det: 6.0                  # Distance (x2) from sample to detector (m)
   aperture_width: 0.094         # Width of aperture at moderator face (m)
   aperture_height: 0.094        # Height of aperture at moderator face (m)
@@ -26,7 +26,7 @@ chopper_system:
       phaseName: 'Multirep mode number'
     -
       name: MAPS Fermi
-      distance: 10.1            # Distance from moderator to this chopper in metres
+      distance: 10.143          # Distance from moderator to this chopper in metres
       aperture_distance: 8.27   # Distance from aperture (moderator face) to this chopper (only for Fermi)
       packages:                 # A hash of chopper packages
         A:

scripts/test/PyChopTest.py

@@ -34,10 +34,11 @@ class PyChop2Tests(unittest.TestCase):
         self.assertGreater(flux[2], flux[1])
         # Note that MAPS has been upgraded so now should have higher flux than MARI.
         self.assertGreater(flux[0], flux[1])
-        # Checks that the resolution should be best for MARI, MAPS, and MERLIN in that order
-        # actually MAPS and MARI resolutions are very close
-        self.assertLess(res[1][0], res[0][0])
-        self.assertLess(res[0][0], res[2][0])
+        # Checks that the resolution should be best for MAPS, MARI, and MERLIN in that order
+        # actually MAPS and MARI resolutions are very close (previous error in MAPS distances
+        # meant that MARI was calculated to have a better resolution, but it *should* be MAPS)
+        self.assertLess(res[0][0], res[1][0])
+        self.assertLess(res[1][0], res[2][0])
         # Now tests the standalone function
         for inc, instname in enumerate(instnames):
             rr, ff = PyChop2.calculate(instname, 's', 200, 18, 0)