From 266b6c61f30e013975f2c20ccdd6edf23d0081f2 Mon Sep 17 00:00:00 2001 From: Sparks29032 Date: Sun, 13 Jul 2025 11:55:46 -0500 Subject: [PATCH 1/2] Move epsilon --- src/diffpy/morph/morphs/morphrgrid.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/diffpy/morph/morphs/morphrgrid.py b/src/diffpy/morph/morphs/morphrgrid.py index fadce9f7..b6f3e540 100644 --- a/src/diffpy/morph/morphs/morphrgrid.py +++ b/src/diffpy/morph/morphs/morphrgrid.py @@ -19,9 +19,6 @@ from diffpy.morph.morphs.morph import LABEL_GR, LABEL_RA, Morph -# roundoff tolerance for selecting bounds on arrays. -epsilon = 1e-8 - class MorphRGrid(Morph): """Resample to specified r-grid. @@ -71,6 +68,8 @@ def morph(self, x_morph, y_morph, x_target, y_target): self.rmax = rmaxinc if self.rstep is None or self.rstep < rstepinc: self.rstep = rstepinc + # roundoff tolerance for selecting bounds on arrays. + epsilon = self.rstep / 2 # Make sure that rmax is exclusive self.x_morph_out = numpy.arange( self.rmin, self.rmax - epsilon, self.rstep From cfaa83b9eadfa9cf7a6455f1e7b2b477eb840673 Mon Sep 17 00:00:00 2001 From: Sparks29032 Date: Sun, 13 Jul 2025 12:03:20 -0500 Subject: [PATCH 2/2] news --- news/epsilon.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/epsilon.rst diff --git a/news/epsilon.rst b/news/epsilon.rst new file mode 100644 index 00000000..f19b1999 --- /dev/null +++ b/news/epsilon.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* MorphRGrid can now handle grids denser than 1e-08. Previously, it was possible that multiple points on the intersection range could be excluded. + +**Security:** + +*