diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 688118ed..361cc323 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -11,14 +11,14 @@ jobs: strategy: fail-fast: true matrix: - platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-14] + platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-15] env: CIBW_SKIP: 'pp*' CIBW_ARCHS: 'auto64' CIBW_MANYLINUX_X86_64_IMAGE: 'manylinux_2_28' CIBW_PROJECT_REQUIRES_PYTHON: '>=3.10' CIBW_TEST_REQUIRES: 'pytest' - MACOSX_DEPLOYMENT_TARGET: '14.0' + MACOSX_DEPLOYMENT_TARGET: '15.0' defaults: run: shell: bash -l {0} @@ -44,7 +44,7 @@ jobs: echo "export LDFLAGS=\"$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp\"" >> ~/.bashrc source ~/.bashrc - name: Install OMP (MacOS M1) - if: matrix.platform == 'macos-14' + if: matrix.platform == 'macos-15' run: | brew install llvm@20 libomp echo "export CC=/opt/homebrew/opt/llvm@20/bin/clang" >> ~/.bashrc diff --git a/cpp/RAT b/cpp/RAT index 7b7c3fff..3b2f8f56 160000 --- a/cpp/RAT +++ b/cpp/RAT @@ -1 +1 @@ -Subproject commit 7b7c3fff87926585e7e432ddac1983b4ca1c80a9 +Subproject commit 3b2f8f5679e7f5de820deb7fb971622492c8c818 diff --git a/pyproject.toml b/pyproject.toml index 01ac054e..8c96cd31 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = 'setuptools.build_meta' [project] name = "ratapi" -version = "1.0.1.dev0" +version = "1.0.1.dev1" description = "Python extension for the Reflectivity Analysis Toolbox (RAT)" readme = "README.md" requires-python = ">=3.10" diff --git a/ratapi/utils/plotting.py b/ratapi/utils/plotting.py index 476beeb2..0041098d 100644 --- a/ratapi/utils/plotting.py +++ b/ratapi/utils/plotting.py @@ -142,7 +142,8 @@ def plot_ref_sld_helper( A value between 0 and 100 that controls the spacing between the reflectivity plots for each of the contrasts animated : bool, default: False Controls whether the animated property of foreground plot elements should be set. - + align_profile : bool, default: False + Controls whether the profiles should be aligned. """ preserve_zoom = False @@ -588,10 +589,9 @@ def update_foreground(self, data): offset = 0 for i in range(len(data.contrastNames)): - for _ in range(int(data.dataPresent[i]) + 1): - self.figure.axes[0].lines[offset].set_data(plot_data["ref"][i][0], plot_data["ref"][i][1]) - self.figure.axes[0].draw_artist(self.figure.axes[0].lines[offset]) - offset += 1 + self.figure.axes[0].lines[offset].set_data(plot_data["ref"][i][0], plot_data["ref"][i][1]) + self.figure.axes[0].draw_artist(self.figure.axes[0].lines[offset]) + offset += 2 if data.dataPresent[i] else 1 i = 0 for j in range(len(plot_data["sld"])):