From e7d2d57070675e811593c6a06e1200399cc182fb Mon Sep 17 00:00:00 2001
From: Jiao Lin <linjiao@ornl.gov>
Date: Thu, 7 Mar 2019 15:33:55 -0500
Subject: [PATCH] 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 | 2 +-
scripts/test/PyChopTest.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/PyChop/Chop.py b/scripts/PyChop/Chop.py
index f5fe45525dd..4b4847d4adb 100644
--- a/scripts/PyChop/Chop.py
+++ b/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
diff --git a/scripts/test/PyChopTest.py b/scripts/test/PyChopTest.py
index 9bb10f1421c..7ec38023a50 100644
--- a/scripts/test/PyChopTest.py
+++ b/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)
--
GitLab