From 59a96478ead8b397f65042c7030852cd2baced11 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:06:51 +0000 Subject: [PATCH 1/2] Bump pyfai from 2023.9.0 to 2024.1.0 in /.github/dependabot Bumps [pyfai](https://github.com/silx-kit/pyFAI) from 2023.9.0 to 2024.1.0. - [Release notes](https://github.com/silx-kit/pyFAI/releases) - [Commits](https://github.com/silx-kit/pyFAI/compare/v2023.09...v2024.01) --- updated-dependencies: - dependency-name: pyfai dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/dependabot/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot/constraints.txt b/.github/dependabot/constraints.txt index 79a76d0..b14c709 100644 --- a/.github/dependabot/constraints.txt +++ b/.github/dependabot/constraints.txt @@ -10,7 +10,7 @@ nbval==0.10.0 numexpr!=2.8.6, <=2.8.8 numpy<1.27.0 Pillow<10.3.0 -pyFAI==2023.9.0 +pyFAI==2024.1.0 pyparsing==3.1.1 pytest<7.5.0 pytest-cov==4.1.0 From a3655b2c08772dcf45adcdff7f04c7e62a1c812e Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Thu, 18 Jan 2024 13:35:51 +0000 Subject: [PATCH 2/2] Add CORNERS definition to pyFAI DSSC class --- extra_geom/pyfai.py | 1 + 1 file changed, 1 insertion(+) diff --git a/extra_geom/pyfai.py b/extra_geom/pyfai.py index aa651a3..850322b 100644 --- a/extra_geom/pyfai.py +++ b/extra_geom/pyfai.py @@ -29,6 +29,7 @@ def __init__(self, pixel1=200e-6, pixel2=200e-6, **kwargs): class DSSC1M(Detector): IS_CONTIGUOUS = False MAX_SHAPE = (16*128, 512) + CORNERS = 6 # Hexagonal pixels aliases = ["DSSC 1M"] def __init__(self, pixel1=236e-6 * 1.5/np.sqrt(3), pixel2=236e-6, **kwargs):