From 9e71cb2d648d1e2c04eb2d40798cfa40549e4cfc Mon Sep 17 00:00:00 2001 From: John Jasper Bekx Date: Mon, 30 Jun 2025 14:46:31 +0200 Subject: [PATCH 1/2] added prefactor to SAC --- azint/azint.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azint/azint.py b/azint/azint.py index f784e2f..2d6434a 100644 --- a/azint/azint.py +++ b/azint/azint.py @@ -137,8 +137,10 @@ def setup_azimuth_bins(azimuth_bins): def setup_corrections(poni, solid_angle, polarization_factor, p1, p2, tth, phi): corrections = np.ones(p1.size, dtype=np.float32) if solid_angle: - solid_angle = poni.dist / np.sqrt(poni.dist**2 + p1*p1 + p2*p2) - corrections *= (solid_angle**3).reshape(-1) + solid_angle = poni.dist * poni.det.pixel1 * poni.det.pixel2 / (poni.dist**2 + p1*p1 + p2*p2)**3. + corrections *= (solid_angle).reshape(-1) + # solid_angle = poni.dist / np.sqrt(poni.dist**2 + p1*p1 + p2*p2) + # corrections *= (solid_angle**3).reshape(-1) if not polarization_factor is None: cos2_tth = np.cos(tth) ** 2 From 07e533f780edaaec2d53a9cb0e3b1a8ea9b69b34 Mon Sep 17 00:00:00 2001 From: John Jasper Bekx Date: Mon, 30 Jun 2025 15:36:25 +0200 Subject: [PATCH 2/2] bug fix SAC --- azint/azint.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azint/azint.py b/azint/azint.py index 2d6434a..a11880d 100644 --- a/azint/azint.py +++ b/azint/azint.py @@ -137,10 +137,8 @@ def setup_azimuth_bins(azimuth_bins): def setup_corrections(poni, solid_angle, polarization_factor, p1, p2, tth, phi): corrections = np.ones(p1.size, dtype=np.float32) if solid_angle: - solid_angle = poni.dist * poni.det.pixel1 * poni.det.pixel2 / (poni.dist**2 + p1*p1 + p2*p2)**3. + solid_angle = poni.dist * poni.det.pixel1 * poni.det.pixel2 / (poni.dist**2 + p1*p1 + p2*p2)**(3./2.) corrections *= (solid_angle).reshape(-1) - # solid_angle = poni.dist / np.sqrt(poni.dist**2 + p1*p1 + p2*p2) - # corrections *= (solid_angle**3).reshape(-1) if not polarization_factor is None: cos2_tth = np.cos(tth) ** 2