From dcb5d702319eafc5e278c34523e91c910307b648 Mon Sep 17 00:00:00 2001 From: Nicholas Devenish Date: Mon, 8 Jan 2024 12:02:24 +0000 Subject: [PATCH 1/4] MNT: Remove dials.reciprocal_lattice_viewer from documentation Seeing errors on our CI machine because importing this tries to pull in the whole gltbx stack, which apparently doesn't work on this machine now. --- .../dials_reciprocal_lattice_viewer.rst | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 doc/sphinx/documentation/programs/dials_reciprocal_lattice_viewer.rst diff --git a/doc/sphinx/documentation/programs/dials_reciprocal_lattice_viewer.rst b/doc/sphinx/documentation/programs/dials_reciprocal_lattice_viewer.rst deleted file mode 100644 index f64c1b281b..0000000000 --- a/doc/sphinx/documentation/programs/dials_reciprocal_lattice_viewer.rst +++ /dev/null @@ -1,22 +0,0 @@ -dials.reciprocal_lattice_viewer -=============================== - -Introduction ------------- - -.. python_string:: dials.command_line.reciprocal_lattice_viewer.help_message - -Basic parameters ----------------- - -.. phil:: dials.command_line.reciprocal_lattice_viewer.phil_scope - :expert-level: 0 - :attributes-level: 0 - - -Full parameter definitions --------------------------- - -.. phil:: dials.command_line.reciprocal_lattice_viewer.phil_scope - :expert-level: 2 - :attributes-level: 2 From 4fd2bab8c8101565881d6a9d9b79a55d3b6d79cb Mon Sep 17 00:00:00 2001 From: Nicholas Devenish Date: Mon, 8 Jan 2024 14:53:09 +0000 Subject: [PATCH 2/4] MNT: Remove documentation reference to rlv Document was removed, but index still referenced it. --- doc/sphinx/documentation/programs/index.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sphinx/documentation/programs/index.rst b/doc/sphinx/documentation/programs/index.rst index 37a011f6c8..41180a1090 100644 --- a/doc/sphinx/documentation/programs/index.rst +++ b/doc/sphinx/documentation/programs/index.rst @@ -28,7 +28,6 @@ Utilities: dials_show dials_image_viewer - dials_reciprocal_lattice_viewer dials_generate_mask dials_check_indexing_symmetry dials_search_beam_position From 82957eea3427c60f531022fc92d63604a629e993 Mon Sep 17 00:00:00 2001 From: David Waterman Date: Mon, 8 Jan 2024 16:03:55 +0000 Subject: [PATCH 3/4] dials.reciprocal_lattice_viewer: correctly record beam centre panel for multi-panel detectors (#2572) When loading models, the beam centre's panel must be set back in the control. --- newsfragments/2572.bugfix | 1 + src/dials/util/reciprocal_lattice/viewer.py | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 newsfragments/2572.bugfix diff --git a/newsfragments/2572.bugfix b/newsfragments/2572.bugfix new file mode 100644 index 0000000000..f06dcf477c --- /dev/null +++ b/newsfragments/2572.bugfix @@ -0,0 +1 @@ +``dials.reciprocal_lattice_viewer``: ensure the correct panel for the beam centre is recorded when loading models. diff --git a/src/dials/util/reciprocal_lattice/viewer.py b/src/dials/util/reciprocal_lattice/viewer.py index abd22405ec..f2f3430163 100644 --- a/src/dials/util/reciprocal_lattice/viewer.py +++ b/src/dials/util/reciprocal_lattice/viewer.py @@ -90,6 +90,9 @@ def __init__(self, parent, id, title, size, settings=None, *args, **kwds): def load_models(self, experiments, reflections): Render3d.load_models(self, experiments, reflections) if self.settings.beam_centre is not None: + self.settings_panel.beam_panel_ctrl.SetValue( + self.settings.beam_centre_panel + ) self.settings_panel.beam_fast_ctrl.SetValue(self.settings.beam_centre[0]) self.settings_panel.beam_slow_ctrl.SetValue(self.settings.beam_centre[1]) else: From 07bee6b74f3fd8918ea7baecd4c77d2b15af344d Mon Sep 17 00:00:00 2001 From: Nicholas Devenish Date: Thu, 11 Jan 2024 11:46:58 +0000 Subject: [PATCH 4/4] Pin Gemmi to 0.6.3 (#2578) We have encountered windows issues with Gemmi 0.6.4. --- .conda-envs/linux.txt | 2 +- .conda-envs/macos.txt | 2 +- .conda-envs/windows.txt | 2 +- newsfragments/2578.misc | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 newsfragments/2578.misc diff --git a/.conda-envs/linux.txt b/.conda-envs/linux.txt index 8f251a3ecd..ef7bd6740c 100644 --- a/.conda-envs/linux.txt +++ b/.conda-envs/linux.txt @@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72 conda-forge::docutils conda-forge::eigen conda-forge::future -conda-forge::gemmi>=0.6.3 +conda-forge::gemmi=0.6.3 conda-forge::h5py>=3.1.0 conda-forge::hdf5<1.13 conda-forge::hdf5plugin diff --git a/.conda-envs/macos.txt b/.conda-envs/macos.txt index 1fe1bda26f..e420099a6a 100644 --- a/.conda-envs/macos.txt +++ b/.conda-envs/macos.txt @@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72 conda-forge::docutils conda-forge::eigen conda-forge::future -conda-forge::gemmi>=0.6.3 +conda-forge::gemmi=0.6.3 conda-forge::h5py>=3.1.0 conda-forge::hdf5<1.13 conda-forge::hdf5plugin diff --git a/.conda-envs/windows.txt b/.conda-envs/windows.txt index e86584967f..3872c21356 100644 --- a/.conda-envs/windows.txt +++ b/.conda-envs/windows.txt @@ -9,7 +9,7 @@ conda-forge::dials-data>=2.4.72 conda-forge::docutils conda-forge::eigen conda-forge::future -conda-forge::gemmi>=0.6.3 +conda-forge::gemmi=0.6.3 conda-forge::h5py>=3.1.0 conda-forge::hdf5<1.13 conda-forge::hdf5plugin diff --git a/newsfragments/2578.misc b/newsfragments/2578.misc new file mode 100644 index 0000000000..60e05b3af4 --- /dev/null +++ b/newsfragments/2578.misc @@ -0,0 +1 @@ +Pin Gemmi dependency to 0.6.3 due to windows issues.