Skip to content

Commit 871d4c6

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 2707_remove_setuptools
2 parents 797c193 + 2825164 commit 871d4c6

22 files changed

+686
-808
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
# cibw_archs: "ppc64le"
9797
- os: windows-2022
9898
cibw_archs: "auto64"
99-
- os: macos-13
99+
- os: macos-15-intel
100100
cibw_archs: "x86_64"
101101
macos_target: "11.0"
102102
# - os: macos-14

.travis.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ Contributors
182182
------------
183183

184184
* Valentin Valls (ESRF)
185+
* Gudrun Lotze
185186
* Frédéric-Emmanuel Picca (Soleil)
186187
* Thomas Vincent (ESRF)
187188
* Dimitris Karkoulis (Formerly ESRF)

ci/requirements_travis.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

doc/source/changelog.rst

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,80 @@
11
:Author: Jérôme Kieffer
2-
:Date: 20/11/2025
2+
:Date: 12/12/2025
33
:Keywords: changelog
44

55
Change-log of versions
66
======================
77

8-
2025.11? DD/11/2025 --> 3.14 came out in October, drop 3.9
9-
-------------------
10-
- [Parallax] This effect shifts the pixel position when the inclinaison of the beam is large (>30°) making calibration challenging
8+
2025.12 12/12/2025
9+
------------------
10+
- [Parallax] This effect shifts the pixel position when the inclination of the beam is large (>30°) making calibration challenging
1111

1212
* Provide absorption coefficients of most common sensor materials
13-
* Update the database of detectors with sensor material and thickness
13+
* Update the database of detectors with sensor material and thickness (#2606)
1414
* New PONI-file version (backwards compatible when possible)
1515
* [Calib2] exposes the feature in detector configuration
1616
* Performance regression while calibrating and geometry initialization (will be addressed in the future)
1717

18-
- [GUI] Like `silx`, `pyFAI` moves from pyQt5 to pySide6 (or pyQt6). Several bugs were found
19-
and addressed to increase compatibility with Qt6. PyQt5 is no more a priority.
20-
- [Pilx] is now compatible with files produced by mesh-scan on BM29 in addition to diffmap.
21-
- [median filtering] fix an infinite loop in the OpenCL code.
18+
- [GUI]
19+
20+
* Like `silx`, `pyFAI` moves from pyQt5 to pySide6 (or pyQt6). Several bugs were found
21+
and addressed to increase compatibility with Qt6. PyQt5 is no more a priority and will be dropped in next release
22+
* `Integrate` is now able to perform fiber integration.
23+
* `Calib2` exposes the sensor definition in detector configuration
24+
* `Pilx` is now compatible with files produced by mesh-scan on BM29 in addition to `diffmap`.
25+
- [Median filtering] fix an infinite loop in the OpenCL code
2226
- [Crystallography] improvements:
2327

24-
* Move most of the `calibrant` file into several other in the crystallography module
28+
* Move most of the `calibrant` file into the crystallography module
2529
* Calibrant have seen the IO part devoted to a dataclass called CalibrantConfig:
2630

2731
- Import/export of D-file, including now the relative intensity
28-
- Import from diff-files available from the american mineralogist database
32+
- Import from diff-files available from the American Mineralogist Database
2933

3034
* `space_groups` contain an extensive list of 2320 space-groups with their extinctions for use in the `Cell` class
3135
* The `Cell` class can now be directly exported as calibrant
3236
* Added new resolution functions for powder diffraction peak shapes with:
3337

3438
- Constant resolution
35-
- Caglioti model (U,V,W parametrization)
36-
- Langford model (4-parameter)
37-
- Chernyshov model (3-parameter)
39+
- Caglioti model (U, V, W parametrization)
40+
- Langford model (4 parameters)
41+
- Chernyshov model (3 parameters)
3842

3943
* Added `fake_xrpdp` method to generate 1D powder patterns with configurable resolution
40-
* Refactoring of the `fake_image` method which takes benefit of `fake_xrpdp`
44+
* Refactoring of the `fake_image` method which takes benefit of `fake_xrpdp` improvements
4145
* Documentation with a new tutorial on carbon polymorphs (diamond, graphite and C60)
46+
4247
- [integrate1|2d] enforce arguments to be kwargs to limit user errors
4348
- [Doc] Improve the notebook about "flatfield" calculation.
4449
- [Fiber/GrazingIncidence]
50+
4551
* Compatibility with pyFAI-integrate GUI and Worker
4652
* Build the missing wedge mask using percentile threshold of counts
4753

48-
- [Integrate1/2dResult]
54+
- [Integrate1/2dResult]
4955

50-
* can perform some basic maths (+, -), uncertainties are propagated accordingly.
56+
* Can perform some basic maths (+, -), uncertainties are propagated accordingly.
5157
* 2D container can be rebinned in 1D containers.
5258
* 1D container can calculate the spottiness of the initial frame (with azimuthal error-model).
5359

5460
- [Fit2dGeometry] becomes a case-insensitive dataclass (thus mutable, was NamedTuple) which behaves like a dict.
55-
- [Deprecation] `splineFile` --> `splinefile` in most arguments and also as properties
56-
- Prefer the `numexpr` (fallback on `numpy`) function evaluation in favor of the `Cython` path for geometry initialization, less prone to numerical noise.
57-
`Cython` is still prefered for geometry optimization where performance is critical.
58-
- Start to support type annotation in the code.
59-
- Replace python2.5 style properties with @property dectorator. Deprecate former accessors where appropriate.
60-
- Supports python 3.10-3.14
61-
- ~1500 commits, 500+ files modified over 8 months.
61+
- [Deprecation]
62+
63+
* `splineFile` --> `splinefile` in most arguments and also as properties (PEP8 compliance)
64+
* Replace python2.5 style properties with @property decorators. Deprecate former accessors where appropriate.
65+
* Start to support type annotation in the code (proper doc-string is still mandatory).
66+
* Prefer the `numexpr` (fallback on `numpy`) function evaluation in favor of the `Cython` path for geometry initialization, less prone to numerical noise.
67+
`Cython` is still preferred for geometry optimization where performance is critical.
68+
69+
- [Bugs] There are several known bugs:
70+
71+
* Regression in pixel-splitting methods when dealing with pixels on the boundary #2736
72+
* `array_from_unit`` and `chiArray` are not consistent #2589
73+
* Uncollectable objects when using PySide6 GUI (PyQt6 is OK) #2523
74+
* pyFAI-calib2 crashes when loading the image (PyQt5 only issue. Wont'fix, please upgrade) #2422
75+
76+
- Supports python 3.10-3.14, 3.14t is untested.
77+
- 1600+ commits, 500+ files modified over 9 months: big baby.
6278
- List of contributors for this release: Gudrun Lotze, Loic Huder, Edgar Gutierrez-Fernandez and Jérôme Kieffer
6379

6480
2025.03 14/03/2025
@@ -74,7 +90,7 @@ Change-log of versions
7490
- Improve the plot generated by the benchmarking tool (Thanks to Jon)
7591
- `MultiGeometry` allows the mixing of different kind of detectors (Thanks ThomasK)
7692
- `WorkerConfig` dataclass, many fixes at several places, Ewoks compatibility.
77-
- `Diffmap` compatiblity with binned images
93+
- `Diffmap` compatibility with binned images
7894
- `Pilx` uses now the dynamic mask to hide hot/defective pixels
7995
- Improvement of the `fake_calibration_image` to provide both `Imin` and `Imax`
8096
- New Lambda 9M detector

0 commit comments

Comments
 (0)