Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into diffmap_zerodiv_error
Browse files Browse the repository at this point in the history
  • Loading branch information
kif committed Aug 29, 2023
2 parents 2ae4941 + febca03 commit 450dfa3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions pyFAI/ext/splitBBox_common.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

__author__ = "Jerome Kieffer"
__contact__ = "[email protected]"
__date__ = "07/01/2022"
__date__ = "29/08/2023"
__status__ = "stable"
__license__ = "MIT"

Expand Down Expand Up @@ -294,8 +294,8 @@ class SplitBBoxIntegrator:
position_t[::1] cpos0, cpos1, dpos0, dpos1
mask_t[::1] cmask
bint check_mask=False, do_split=True
position_t c0, c1, d0, d1, min0 = 0, max0 = 0, min1 = 0, max1 = 0, inv_area = 0
position_t pos0_min = 0, pos1_min = 0
position_t c0, c1, d0=0.0, d1=0.0, min0=0.0, max0=0.0, min1=0.0, max1=0.0, inv_area=0.0
position_t pos0_min=0.0, pos1_min=0.0
position_t delta0, delta1, delta_down, delta_up, delta_left, delta_right
position_t fbin0_min, fbin0_max, fbin1_min, fbin1_max
Py_ssize_t i = 0, j = 0, idx = 0
Expand Down
8 changes: 4 additions & 4 deletions pyFAI/ext/splitpixel_common.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

__author__ = "Jerome Kieffer"
__contact__ = "[email protected]"
__date__ = "07/01/2022"
__date__ = "29/08/2023"
__status__ = "stable"
__license__ = "MIT"

Expand Down Expand Up @@ -288,9 +288,9 @@ class FullSplitIntegrator:
position_t[:, ::1] v8 = numpy.empty((4,2), dtype=position_d)
mask_t[:] cmask = self.cmask
bint check_mask = False, chiDiscAtPi = self.chiDiscAtPi
position_t min0 = 0, max0 = 0, min1 = 0, max1 = 0, inv_area = 0
position_t pos0_min = 0, pos1_min = 0, pos1_max = 0, pos0_maxin = 0, pos1_maxin = 0
position_t a0 = 0, a1 = 0, b0 = 0, b1 = 0, c0 = 0, c1 = 0, d0 = 0, d1 = 0
position_t min0 = 0.0, max0 = 0.0, min1 = 0.0, max1 = 0.0, inv_area = 0.0
position_t pos0_min = 0.0, pos1_min = 0.0, pos1_max = 0.0, pos0_maxin = 0.0, pos1_maxin = 0.0
position_t a0 = 0.0, a1 = 0.0, b0 = 0.0, b1 = 0.0, c0 = 0.0, c1 = 0.0, d0 = 0.0, d1 = 0.0
position_t delta0, delta1
position_t foffset0, foffset1, sum_area, area
Py_ssize_t i = 0, j = 0, idx = 0
Expand Down

0 comments on commit 450dfa3

Please sign in to comment.