Cherrypick changes for 6.16.1 (#41752)

Co-authored-by: Mohammed Almakki <44416400+MohamedAlmaki@users.noreply.github.com>
Co-authored-by: andy-bridger <andy.bridger@stfc.ac.uk>

Author: 3 people

docs/source/concepts/TextureAnalysis.rst

@@ -564,7 +564,7 @@ If using a standard grouping, no ``grouping_filepath`` or ``prm_filepath`` is re
       bank_focus_dir = os.path.join(root_dir, "Focus", "CombinedFiles")
 
       # get grouping directory name
-      calib_info = CalibrationInfo(group = GROUP(grouping))
+      calib_info = CalibrationInfo(group = GROUP(grouping), instrument = instr)
       if groupingfile_path:
          calib_info.set_grouping_file(groupingfile_path)
       elif prm_path:
@@ -646,7 +646,7 @@ Additionally to fitting the peak, the table will also contain a numerical integr
    # find and load peaks
 
    # get grouping directory name
-   calib_info = CalibrationInfo(group = GROUP(grouping))
+   calib_info = CalibrationInfo(group = GROUP(grouping), instrument = instr)
    if groupingfile_path:
       calib_info.set_grouping_file(groupingfile_path)
    elif prm_path:

docs/source/release/index.rst

@@ -13,6 +13,7 @@ Release Notes
 
 .. plot:: release/versions.py
 
+* v6.16.1 - 2026-07-02 - :doc:`release notes <v6.16.1/index>` - `github tag <https://github.com/mantidproject/mantid/releases/tag/v6.16.1>`__
 * v6.16.0 - 2026-06-25 - :doc:`release notes <v6.16.0/index>` - `github tag <https://github.com/mantidproject/mantid/releases/tag/v6.16.0>`__
 * v6.15.0 - 2026-02-23 - :doc:`release notes <v6.15.0/index>` - `github tag <https://github.com/mantidproject/mantid/releases/tag/v6.15.0>`__
 * v6.14.0 - 2025-10-23 - :doc:`release notes <v6.14.0/index>` - `github tag <https://github.com/mantidproject/mantid/releases/tag/v6.14.0>`__

docs/source/release/v6.16.1/index.rst

@@ -0,0 +1,35 @@
+.. _v6.16.1:
+
+===========================
+Mantid 6.16.1 Release Notes
+===========================
+
+This is a patch release that corrects some significant issues since :ref:`version 6.16.0 <v6.16.0>`.
+
+The changes are:
+
+- Fix empty Instrument View in Windows standalone
+- Fix crash in `TextureUtils` for RaggedWorkspaces
+
+Citation
+--------
+
+Please cite any usage of Mantid as follows:
+
+- *Mantid 6.16.1: Manipulation and Analysis Toolkit for Instrument Data.; Mantid Project*.
+  `doi: 10.5286/Software/Mantid6.16.1 <http://dx.doi.org/10.5286/Software/Mantid6.16.1>`_
+
+- Arnold, O. et al. *Mantid-Data Analysis and Visualization Package for Neutron Scattering and mu-SR Experiments.* Nuclear Instruments
+  and Methods in Physics Research Section A: Accelerators, Spectrometers, Detectors and Associated Equipment 764 (2014): 156-166
+  `doi: 10.1016/j.nima.2014.07.029 <https://doi.org/10.1016/j.nima.2014.07.029>`_
+  (`download bibtex <https://raw.githubusercontent.com/mantidproject/mantid/master/docs/source/mantid.bib>`_)
+
+Changes in this version
+-----------------------
+
+* `41744 <https://github.com/mantidproject/mantid/pull/41744>`_ Fix empty Instrument View in Windows standalone
+* `41732 <https://github.com/mantidproject/mantid/pull/41732>`_ Fix crash in `TextureUtils` for RaggedWorkspaces
+
+.. _download page: http://download.mantidproject.org
+
+.. _GitHub release page: https://github.com/mantidproject/mantid/releases/tag/v6.16.1

installers/conda/win/create_package.sh

@@ -173,6 +173,16 @@ find $COPY_DIR -name *.pyc -delete
 # Delete extra DLLs
 rm -rf $COPY_DIR/bin/api-ms-win*.dll
 rm -rf $COPY_DIR/bin/libclang.dll
+# Remove Mesa's opengl32.dll (from mesalib, pulled in transitively by vtk-base
+# >=9.6 via viskores). Next to MantidWorkbench.exe it shadows the system OpenGL
+# driver and produces a black Instrument View. opengl32sw.dll (Qt's software
+# fallback) is kept. See https://github.com/mantidproject/mantid/issues/41735
+rm -f $COPY_DIR/bin/opengl32.dll
+# Drop the rest of the Mesa stack - orphaned once opengl32.dll is gone.
+rm -f $COPY_DIR/bin/libgallium_wgl.dll
+rm -f $COPY_DIR/bin/vulkan_dzn.dll
+rm -f $COPY_DIR/bin/vulkan_lvp.dll
+rm -f $COPY_DIR/bin/spirv_to_dxil.dll
 
 # Now package using NSIS
 echo "Packaging package via NSIS"

scripts/Engineering/common/instrument_config.py

@@ -54,6 +54,7 @@ def __new__(self, value, banks):
 # if a new instrument is added, add its config key to this list and group to groups (used for tests)
 SUPPORTED_INSTRUMENTS = ("ENGINX", "IMAT")
 GROUPS = (ENGINX_GROUP, IMAT_GROUP)
+PSEUDONYMS = {"ENGIN-X": "ENGINX"}
 
 
 @dataclass(frozen=True)
@@ -227,6 +228,7 @@ def get_instr_config(instrument: Optional[str]) -> Optional[InstrumentConfig]:
     if instrument is None:
         return None
     key = instrument.upper()
+    key = PSEUDONYMS.get(key, key)
     if key not in CONFIGS:
         raise RuntimeError(f"No instrument config registered for instrument='{instrument}'")
     return CONFIGS[key]

scripts/Engineering/texture/TextureUtils.py

@@ -9,7 +9,7 @@
 from Engineering.texture.correction.correction_model import TextureCorrectionModel
 from Engineering.texture.polefigure.polefigure_model import TextureProjection
 from mantid.simpleapi import SaveNexus, logger, CreateEmptyTableWorkspace, Fit
-from mantid.simpleapi import ConvertUnits, Rebunch, Rebin, SumSpectra, AppendSpectra, CloneWorkspace, CropWorkspace, Load
+from mantid.simpleapi import ConvertUnits, Rebunch, Rebin, SumSpectra, AppendSpectra, CloneWorkspace, CropWorkspaceRagged, Load
 from pathlib import Path
 from Engineering.EnginX import EnginX
 from Engineering.IMAT import IMAT
@@ -288,18 +288,17 @@ def validate_abs_corr_inputs(
 
 
 def crop_and_rebin(ws, out_ws, lower, upper, rebin_params):
-    CropWorkspace(ws, lower, upper, OutputWorkspace="__tmp_peak_window")
+    CropWorkspaceRagged(ws, lower, upper, OutputWorkspace="__tmp_peak_window")
     Rebin("__tmp_peak_window", rebin_params, OutputWorkspace=out_ws)
 
 
 def _get_max_bin(ws):
-    xdat = ws.extractX()
-    return np.diff(xdat, axis=1).max()
+    return max(np.diff(ws.readX(i)).max() for i in range(ws.getNumberHistograms()))
 
 
 def crop_wss_and_combine(wss, peak, lower, upper, output):
     cropped_rebinned_wss = [f"rebin_ws_{peak}_0"]
-    peak_window_ws = CropWorkspace(wss[0], lower, upper, OutputWorkspace="__peak_window_crop")
+    peak_window_ws = CropWorkspaceRagged(wss[0], lower, upper, OutputWorkspace="__peak_window_crop")
     rebin_params = (lower, _get_max_bin(peak_window_ws), upper)
     Rebin("__peak_window_crop", rebin_params, OutputWorkspace=f"rebin_ws_{peak}_0")
     CloneWorkspace(InputWorkspace=f"rebin_ws_{peak}_0", OutputWorkspace=f"rebin_ws_{peak}")
@@ -663,7 +662,6 @@ def fit_all_peaks(
     # we will then fix the amount this can change in the individual fits
 
     x0_lims, all_cropped_rebinned_wss = fit_initial_summed_spectra(wss, peaks, peak_window, fit_kwargs.copy(), peak_func_name)
-
     for iws, wsname in enumerate(wss):
         # notice user how far through the fitting they are (useful if any fits fail)
         logger.notice(f"Fitting Workspace: {wsname} ({iws + 1}/{len(wss)})")

scripts/test/Engineering/texture/test_TextureUtils.py

@@ -327,7 +327,7 @@ def test_tie_bkg(self):
         self.assertEqual(bg0["A0"], 2.0)
 
     @patch(f"{texture_utils_path}.Rebin")
-    @patch(f"{texture_utils_path}.CropWorkspace")
+    @patch(f"{texture_utils_path}.CropWorkspaceRagged")
     def test_crop_and_rebin(self, mock_crop, mock_rebin):
         # inputs
         ws = "ws1"
@@ -346,7 +346,7 @@ def test_crop_and_rebin(self, mock_crop, mock_rebin):
     @patch(f"{texture_utils_path}.CloneWorkspace")
     @patch(f"{texture_utils_path}.Rebin")
     @patch(f"{texture_utils_path}._get_max_bin")
-    @patch(f"{texture_utils_path}.CropWorkspace")
+    @patch(f"{texture_utils_path}.CropWorkspaceRagged")
     @patch(f"{texture_utils_path}.crop_and_rebin")
     def test_crop_wss_and_combine(self, mock_crop_and_rebin, mock_crop, mock_max_bin, mock_rebin, mock_clone, mock_append, mock_sum):
         # inputs