Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024.09 #2271

Merged
merged 34 commits into from
Sep 13, 2024
Merged

2024.09 #2271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
68543c9
Update codeql to recent node version
kif Sep 12, 2024
7facc5d
update calibrant notebooks
Sep 12, 2024
32c0fdd
update detector notebooks
Sep 12, 2024
6f02631
update distortion notebook
Sep 12, 2024
6bbe75b
update ellipse notebook
Sep 12, 2024
19590ef
update geometry notebook
Sep 12, 2024
67cca03
update goniometer notebooks
Sep 12, 2024
cce74cb
update inpainting notebook
Sep 12, 2024
8ccfaa2
update introduction notebook
Sep 12, 2024
6787491
update guinier notebook
Sep 12, 2024
e41e5ba
update multigeometry notebook
Sep 12, 2024
7b6c1dc
update recalib notebook
Sep 12, 2024
05be61b
update separation notebooks
Sep 12, 2024
9b9e5af
upgrade Readme
kif Sep 12, 2024
15d1342
release version
kif Sep 12, 2024
6c3efea
update minimum version of python
kif Sep 12, 2024
12e2cf8
Merge remote-tracking branch 'edgar/update_tutorials_2024_09' into 20…
kif Sep 12, 2024
18b1bf6
fix integrator called -> legacy
kif Sep 12, 2024
20a1fa5
update thickdetector notebooks
Sep 12, 2024
2f5c7ed
update variance notebooks
Sep 12, 2024
f78e183
Wrong pixel size sometimes
kif Sep 12, 2024
024145c
update gi, pixelsplit, orientation
Sep 12, 2024
cc788d6
update flatfield notebook
Sep 12, 2024
5c1f84d
re-run tutorials
kif Sep 12, 2024
89d9bbd
Merge remote-tracking branch 'edgar/update_tutorials_2024_09' into 20…
kif Sep 12, 2024
e551521
update changelog
kif Sep 12, 2024
1d918b3
Remove scale from readme
kif Sep 12, 2024
01adae2
Change variable name (pylint did not like it)
kif Sep 12, 2024
4d459a5
typo
kif Sep 12, 2024
dc1a164
Drop python 3.7
kif Sep 12, 2024
294e75a
increment checkout version
kif Sep 13, 2024
fa02753
Use node20
kif Sep 13, 2024
10a76ad
use latest version of the github action
kif Sep 13, 2024
1e815a2
change version of setup-python
kif Sep 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Documentation can be build using this command and Sphinx (installed on your comp
Dependencies
------------

Python 3.7, ... 3.12 are well tested and officially supported.
Python 3.8, ... 3.12 are well tested and officially supported.
For full functionality of pyFAI the following modules need to be installed.

* ``numpy`` - http://www.numpy.org
Expand Down Expand Up @@ -145,7 +145,7 @@ using apt-get these can be installed as::
MacOSX
------

One needs to manually install a recent version of `Python` (>=3.7) prior to installing pyFAI.
One needs to manually install a recent version of `Python` (>=3.8) prior to installing pyFAI.
Apple provides only an outdated version of Python 2.7 which is now incomatible.
If you want to build pyFAI from sources, you will also need `Xcode` which is available from the Apple store.
The compiled extension will use only one core due to the limitation of the compiler.
Expand All @@ -158,7 +158,7 @@ Then install the missing dependencies with `pip`::
Windows
-------

Under Windows, one needs to install `Python` (>=3.7) prior to pyFAI.
Under Windows, one needs to install `Python` (>=3.8) prior to pyFAI.
The Visual Studio C++ compiler is also needed when building from sources.
Then install the missing dependencies with `pip`::

Expand Down
48 changes: 41 additions & 7 deletions doc/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,46 @@
:Author: Jérôme Kieffer
:Date: 21/05/2024
:Date: 12/09/2024
:Keywords: changelog

Change-log of versions
======================

2024.5 21/05/2024
-----------------
2024.09 12/09/2024
------------------
- New tutorials:
+ On flatfield calculation from several detector position (ID31)
+ On dynamic masks when using sigma-clipping (ID15a)
- New feature in pilx: the tool to view diffraction map
+ fix/unfix curves
+ Colors improved
+ motor position can ge registered
- Other new feature:
+ Expose orientation in calib2
+ Extra comments in PONI-file like the calibration file if available
+ implement sigma-clipping in pure cython with hybrid error-model
+ New calibrant (Lysozyme for MX)& integration into calib2
+ Absorption kwarg in sigma-clip was missing
+ Engineering notation when printing pixel size
+ New JSON format for integration configuration (backward compatible)
+ Import CrystFEL geom-file and generate a detector + geometry
+ GIWAXS and sigma-clip impose *no* pixel splitting
+ Sigma-clipping is possible from the GUI and via config files
+ Peakfinding: discard peaks with masked pixels in the local region
- New detector: Jungfrau 1M (ID09)
- Bug fixed:
+ Close HDF5 files ASAP (risk of hitting the max number of file open)
+ Bug in medfilt (empty ensemble)
+ Several bugs fixed in worker (heavily used by ewoks)
+ Correct some tutorials which had typos
+ Orientation of interate2d results *legacy* vs *ng*
+ Compatibility with Numpy2
+ Compatibility with Eiger2+Lima2 multi-threshold files
+ Compatibility with GCC14, discarded some deprecated code
- Validated with Python 3.8-3.12


2024.05 21/05/2024
------------------
- Implemented unweighted average for 2D integration
+ Integration engines now handle the boolean 'weighted_average' to switch to unweighted mean, similar to legacy methods
- Implementation of pilx (pyFAI-diffmap-view command): interactive viewer for pyFAI-diffmap files (thanks Loic Huder)
Expand All @@ -19,16 +53,16 @@ Change-log of versions
- Build system moved from bob to cibuildwheels
+ Windows wheels are build with openmp disabled

2024.2 01/02/2024
-----------------
2024.02 01/02/2024
------------------
- Include grazing-incidence capabilities + tutorial (thanks Edgar)
- Fix segmentation-fault in calib2 application #2047 (thanks Thomas & Edgar)
- Use the dynamic mask to mask-out dead pixels in Eiger images in calib2
- Extend Poisson+azimuthal uncertainties to all Cython integrators (+ non regression tests)
- Support for Python 3.7-3.12 (requires silx v2 for 3.12)

2024.1 18/01/2024
-----------------
2024.01 18/01/2024
------------------
- Possibility to define the detector orientation:
+ It is the position of the origin of the detector at any of the 4 corners of the image
+ Uses the EXIF nomenclature where pyFAI's (default) orientation is tagged *3*
Expand Down
4 changes: 2 additions & 2 deletions doc/source/operations/index.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:Author: Jérôme Kieffer
:Date: 18/01/2023
:Date: 12/09/2024
:Keywords: Installation procedure
:Target: System administrators

Expand All @@ -22,7 +22,7 @@ Dependencies

PyFAI is a Python library which relies on the scientific stack (numpy, scipy, matplotlib)

* Python: version 3.7 or newer (version 3.6 was dropped with 0.21)
* Python: version 3.8 or newer
* NumPy: version 1.12 or newer
* SciPy: version 0.18 or newer
* Matplotlib: verson 2.0 or newer
Expand Down
2 changes: 1 addition & 1 deletion doc/source/operations/macosx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Install Python3:

To install pyFAI on an *Apple* computer you will need a scientific Python3 stack.
MacOSX provides by default Python2.7, you will need to install a recent version
of Python3 (3.7 at least).
of Python3 (3.8 at least).
Those distribution are available as *dmg* images from:
`Python.org <https://www.python.org/downloads/mac-osx/>`_

Expand Down
38 changes: 11 additions & 27 deletions doc/source/usage/tutorial/Calibrant/Calibrant.ipynb

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions doc/source/usage/tutorial/Calibrant/hydrocerussite.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"pyFAI version 2023.9.0-dev0\n"
"pyFAI version 2024.9.0-dev0\n"
]
}
],
Expand Down Expand Up @@ -267,7 +267,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.2"
"version": "3.10.14"
}
},
"nbformat": 4,
Expand Down
12 changes: 6 additions & 6 deletions doc/source/usage/tutorial/Calibrant/make_calibrant.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"using pyFAI version: 2023.9.0-dev0\n",
"using pyFAI version: 2024.9.0-dev0\n",
"\n",
" This is a cell object, able to calculate the volume and d-spacing according to formula from:\n",
"\n",
Expand Down Expand Up @@ -229,8 +229,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"CPU times: user 727 ms, sys: 11.4 ms, total: 739 ms\n",
"Wall time: 738 ms\n",
"CPU times: user 933 ms, sys: 8.38 ms, total: 942 ms\n",
"Wall time: 941 ms\n",
"Number of reflections: 1441\n"
]
}
Expand Down Expand Up @@ -415,8 +415,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"[<function Cell.set_type.<locals>.<lambda> at 0x7fa8208cae80>, <function Cell.set_type.<locals>.<lambda> at 0x7fa8208ca660>, <function Cell.diamond.<locals>.<lambda> at 0x7fa8208caf20>]\n",
"[<function Cell.set_type.<locals>.<lambda> at 0x7fa8208cb2e0>, <function Cell.set_type.<locals>.<lambda> at 0x7fa8208cb060>]\n"
"[<function Cell.set_type.<locals>.<lambda> at 0x7f8a468bee60>, <function Cell.set_type.<locals>.<lambda> at 0x7f8a468bedd0>, <function Cell.diamond.<locals>.<lambda> at 0x7f8a468bf0a0>]\n",
"[<function Cell.set_type.<locals>.<lambda> at 0x7f8a468bf2e0>, <function Cell.set_type.<locals>.<lambda> at 0x7f8a468bef80>]\n"
]
}
],
Expand Down Expand Up @@ -489,7 +489,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.2"
"version": "3.10.14"
}
},
"nbformat": 4,
Expand Down
4 changes: 2 additions & 2 deletions doc/source/usage/tutorial/Calibrant/new_calibrant.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"pyFAI version 2023.9.0-dev0\n"
"pyFAI version 2024.9.0-dev0\n"
]
}
],
Expand Down Expand Up @@ -197,7 +197,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.2"
"version": "3.10.14"
}
},
"nbformat": 4,
Expand Down

Large diffs are not rendered by default.

Loading