Refs #24158. fixed the annulus factor: forgot to normalize earlier.

fixed test too: turns out the original order of resolution still holds

scripts/PyChop/Chop.py

@@ -469,4 +469,4 @@ def sam0(sx, sy, sz, isam):
 
 # Sample type: 0==flat plate, 1==ellipse, 2==annulus, 3==sphere, 4==solid cylinder
 sample_shape_scaling_factors = collections.defaultdict(lambda: 1./12)
-sample_shape_scaling_factors[2] = np.pi/16.
+sample_shape_scaling_factors[2] = 1./8

scripts/test/PyChopTest.py

@@ -34,10 +34,10 @@ class PyChop2Tests(unittest.TestCase):
         self.assertTrue(flux[2] > flux[1])
         # Note that MAPS has been upgraded so now should have higher flux than MARI.
         self.assertTrue(flux[0] > flux[1])
-        # Checks that the resolution should be best for MAPS, MARI and MERLIN in that order
+        # Checks that the resolution should be best for MARI, MAPS, and MERLIN in that order
         # actually MAPS and MARI resolutions are very close
-        self.assertTrue(res[0][0] < res[1][0])
-        self.assertTrue(res[1][0] < res[2][0])
+        self.assertTrue(res[1][0] < res[0][0])
+        self.assertTrue(res[0][0] < res[2][0])
         # Now tests the standalone function
         for inc, instname in enumerate(instnames):
             rr, ff = PyChop2.calculate(instname, 's', 200, 18, 0)