Merge pull request #2072 from mccode-dev/prep-for-3.5.30

PR for mostly CHANGELOG stuff 3.5.30

Author: willend

CHANGES_McStas

@@ -56,11 +56,89 @@
 * Modified by: PW December 2024: version 3.5.16
 * Modified by: PW February 2025: version 3.5.24
 * Modified by: PW February 2025: version 3.5.24
+* Modified by: PW April 2025: version 3.5.27
+* Modified by: PW June 2025: version 3.5.30
 *
-* This file is part of McStas 3.5.27, released April 29th 2025.
+* This file is part of McStas 3.5.30, released April 29th 2025.
 * It gives a 'changes' list from the beginning of the project
 *
 *******************************************************************************/
+Changes in McStas/McXtrace 3.5.30, June 16th, 2025
+## What's Changed
+### Common changes to McStas and McXtrace
+* Deployment, platforms and CI
+  * Important fix to ensure use of  -c conda-forge -c nodefaults only by @willend in https://github.com/mccode-dev/McCode/pull/1976
+  * MCPL is available for Windows on conda... by @willend in https://github.com/mccode-dev/McCode/pull/1978
+  * Let "autobuild" CI scripts create arm64 debs for mccode.org by @willend in https://github.com/mccode-dev/McCode/pull/1981
+  * Updated installation docs for Windows / conda by @willend in https://github.com/mccode-dev/McCode/pull/1984, https://github.com/mccode-dev/McCode/pull/1985, https://github.com/mccode-dev/McCode/pull/1986
+  * Partial workaround for openmpi v5 crashes on macOS by @willend in https://github.com/mccode-dev/McCode/pull/1996
+  * Install mcpl via pip in nightlies by @willend in https://github.com/mccode-dev/McCode/pull/1997
+  * Update mcstas-testsuite.yml by @willend in https://github.com/mccode-dev/McCode/pull/1998
+  * Suffix details by @willend in https://github.com/mccode-dev/McCode/pull/1999
+* Tools:
+  * mcgui/mxgui: show current instrument name in dialogues by @farhi in https://github.com/mccode-dev/McCode/pull/1989
+  * VSCode McStas/McXtrace grammar extension
+    * Update vs code extension by @Lomholy in https://github.com/mccode-dev/McCode/pull/1975
+    * Small updates to editor, as well as updated installation information by @Lomholy in https://github.com/mccode-dev/McCode/pull/1977
+    * LaTeX math (formulae etc) for mcdoc %Description headers by @willend in https://github.com/mccode-dev/McCode/pull/2054
+* Code generator/Grammar: McStas/McXtrace, c and .py code generators defined from common set of files in mccode/src
+  * Unify grammar take2 by @willend in https://github.com/mccode-dev/McCode/pull/2008
+  * Unify instr y c py: unify our code generators for C and Python by @farhi in https://github.com/mccode-dev/McCode/pull/2009
+  * Grammar multiple comp copy extend by @farhi in https://github.com/mccode-dev/McCode/pull/2012 (-> `INHERIT`)
+  * NEW `INHERIT` keyword in the component grammar: Allows to mix and match component sections from multiple components to achieve new functionality. For an example, see 
+    * FluoPowder in McXtrace 
+    * https://github.com/mccode-dev/McCode/blob/main/doc/GRAMMAR/ADR-records/ADR_20250612_INHERIT_COMP.md 
+    * Edits by @farhi and @willend in https://github.com/mccode-dev/McCode/pull/2062
+    * Add ADR (Architectural Design Record) doc folder for proposed, accepted, rejected, deprecated, superseded changes of McCode GRAMMAR by @willend in https://github.com/mccode-dev/McCode/pull/2064
+    * Put in place folder for grammar documentation by @willend in https://github.com/mccode-dev/McCode/pull/2070
+
+* New CLI default for mcstas / mcxtrace: --trace is on
+  * This allows any compiled instrument to run with --trace=0 by @willend in https://github.com/mccode-dev/McCode/pull/2010 and https://github.com/mccode-dev/McCode/pull/2023
+* Libs and runtime
+  * Add Open_File in header (used from e.g. PowderN) by @willend in https://github.com/mccode-dev/McCode/pull/2014
+  * Wrap cabs in OpenACC settings by @willend in https://github.com/mccode-dev/McCode/pull/2016
+  * Swap default trace behaviour to 'enabled' by @willend in https://github.com/mccode-dev/McCode/pull/2023
+  * cif2hkl: update to solve F^2 for Xrays using latest CrysFML by @farhi in https://github.com/mccode-dev/McCode/pull/2021
+  * Openacc minor rectifications by @willend in https://github.com/mccode-dev/McCode/pull/2027
+* Components
+  * Sync MCPL components McStas <-> McXtrace for MCPL 2.2.0 support by @willend in https://github.com/mccode-dev/McCode/pull/2019
+  * Update MCPL components for MCPL 2.2.0 features (including stat:sum). by @tkittel in https://github.com/mccode-dev/McCode/pull/2046
+
+### McStas specific:
+* Source_custom
+  * Fixed minor typo in docs by @pablogila in https://github.com/mccode-dev/McCode/pull/1980
+  * Fixed pulse normalisation for all values of n by @pablogila in https://github.com/mccode-dev/McCode/pull/2024
+  * Simplified redundant code for the peak integral calculation by @pablogila in https://github.com/mccode-dev/McCode/pull/2025
+* Single_crystal: comments by @tweber-ill in https://github.com/mccode-dev/McCode/pull/1991
+* Resolution sample/monitor
+  * Reso: Updates by @tweber-ill in https://github.com/mccode-dev/McCode/pull/1992
+  * Add infrastructure to save calculated resolution/covariance matrices … by @willend in https://github.com/mccode-dev/McCode/pull/1993
+  * Sync Res_monitor <-> TOFRes_monitor by @willend in https://github.com/mccode-dev/McCode/pull/1995
+* Add mcresplot to debian metapackage by @willend in https://github.com/mccode-dev/McCode/pull/2022
+* Monitor_nD pixel id and buffer fix by @mads-bertelsen in https://github.com/mccode-dev/McCode/pull/2002
+* Add mcresplot to debian metapackage by @willend in https://github.com/mccode-dev/McCode/pull/2022
+* Add exit attenuation to Incoherent.comp for finite order scattering by @Lomholy in https://github.com/mccode-dev/McCode/pull/2042
+* Updates to Monochromator_bent from @Lomholy by @willend in https://github.com/mccode-dev/McCode/pull/2059 and https://github.com/mccode-dev/McCode/pull/2058
+
+### McXtrace specific:
+* McXtrace fluorescence:
+  * McXtrace: fix header doc in fluo sample (powder and SX) by @farhi in https://github.com/mccode-dev/McCode/pull/1974
+  * McXtrace fluo fix pow 0 by @farhi in https://github.com/mccode-dev/McCode/pull/1979
+  * McXtrace fluo fix 2 by @farhi in https://github.com/mccode-dev/McCode/pull/1988
+  * McXtrace fluo fix : fix in powder select - use gaussian line shape by @farhi in https://github.com/mccode-dev/McCode/pull/1994
+  * McXtrace: samples: fluo: add M-lines via XrayLib Kissel CSb calls by @farhi in https://github.com/mccode-dev/McCode/pull/2004
+  * McXtrace: samples: fluo: fix again the Fluo share by @farhi in https://github.com/mccode-dev/McCode/pull/2005
+  * McXtrace add fluo mcdisplay by @farhi in https://github.com/mccode-dev/McCode/pull/2015
+  * McXtrace fluo add detector 0 by @farhi in https://github.com/mccode-dev/McCode/pull/2029
+* Fix compilation of McXtrace Test_PowderN instr by @willend in https://github.com/mccode-dev/McCode/pull/2000
+* McXtrace various example instrument updates by @farhi in 
+  * https://github.com/mccode-dev/McCode/pull/2033, https://github.com/mccode-dev/McCode/pull/2034, https://github.com/mccode-dev/McCode/pull/2045, https://github.com/mccode-dev/McCode/pull/2048, https://github.com/mccode-dev/McCode/pull/2051, https://github.com/mccode-dev/McCode/pull/2056, https://github.com/mccode-dev/McCode/pull/2057
+* cif2hkl: update to solve F^2 for Xrays using latest CrysFML by @farhi in https://github.com/mccode-dev/McCode/pull/2021
+* McXtrace: add SWING BL at SOLEIL by @farhi in https://github.com/mccode-dev/McCode/pull/2036
+
+**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.27...v3.5.30
+
+
 Changes in McStas/McXtrace 3.5.27, April 29th, 2025
 ## What's Changed
 

CHANGES_McXtrace

@@ -15,6 +15,82 @@
 *
 * Documentation: CHANGES_McXtrace
 *************************************************************************/
+Changes in McStas/McXtrace 3.5.30, June 16th, 2025
+## What's Changed
+### Common changes to McStas and McXtrace
+* Deployment, platforms and CI
+  * Important fix to ensure use of  -c conda-forge -c nodefaults only by @willend in https://github.com/mccode-dev/McCode/pull/1976
+  * MCPL is available for Windows on conda... by @willend in https://github.com/mccode-dev/McCode/pull/1978
+  * Let "autobuild" CI scripts create arm64 debs for mccode.org by @willend in https://github.com/mccode-dev/McCode/pull/1981
+  * Updated installation docs for Windows / conda by @willend in https://github.com/mccode-dev/McCode/pull/1984, https://github.com/mccode-dev/McCode/pull/1985, https://github.com/mccode-dev/McCode/pull/1986
+  * Partial workaround for openmpi v5 crashes on macOS by @willend in https://github.com/mccode-dev/McCode/pull/1996
+  * Install mcpl via pip in nightlies by @willend in https://github.com/mccode-dev/McCode/pull/1997
+  * Update mcstas-testsuite.yml by @willend in https://github.com/mccode-dev/McCode/pull/1998
+  * Suffix details by @willend in https://github.com/mccode-dev/McCode/pull/1999
+* Tools:
+  * mcgui/mxgui: show current instrument name in dialogues by @farhi in https://github.com/mccode-dev/McCode/pull/1989
+  * VSCode McStas/McXtrace grammar extension
+    * Update vs code extension by @Lomholy in https://github.com/mccode-dev/McCode/pull/1975
+    * Small updates to editor, as well as updated installation information by @Lomholy in https://github.com/mccode-dev/McCode/pull/1977
+    * LaTeX math (formulae etc) for mcdoc %Description headers by @willend in https://github.com/mccode-dev/McCode/pull/2054
+* Code generator/Grammar: McStas/McXtrace, c and .py code generators defined from common set of files in mccode/src
+  * Unify grammar take2 by @willend in https://github.com/mccode-dev/McCode/pull/2008
+  * Unify instr y c py: unify our code generators for C and Python by @farhi in https://github.com/mccode-dev/McCode/pull/2009
+  * Grammar multiple comp copy extend by @farhi in https://github.com/mccode-dev/McCode/pull/2012 (-> `INHERIT`)
+  * NEW `INHERIT` keyword in the component grammar: Allows to mix and match component sections from multiple components to achieve new functionality. For an example, see 
+    * FluoPowder in McXtrace 
+    * https://github.com/mccode-dev/McCode/blob/main/doc/GRAMMAR/ADR-records/ADR_20250612_INHERIT_COMP.md 
+    * Edits by @farhi and @willend in https://github.com/mccode-dev/McCode/pull/2062
+    * Add ADR (Architectural Design Record) doc folder for proposed, accepted, rejected, deprecated, superseded changes of McCode GRAMMAR by @willend in https://github.com/mccode-dev/McCode/pull/2064
+    * Put in place folder for grammar documentation by @willend in https://github.com/mccode-dev/McCode/pull/2070
+
+* New CLI default for mcstas / mcxtrace: --trace is on
+  * This allows any compiled instrument to run with --trace=0 by @willend in https://github.com/mccode-dev/McCode/pull/2010 and https://github.com/mccode-dev/McCode/pull/2023
+* Libs and runtime
+  * Add Open_File in header (used from e.g. PowderN) by @willend in https://github.com/mccode-dev/McCode/pull/2014
+  * Wrap cabs in OpenACC settings by @willend in https://github.com/mccode-dev/McCode/pull/2016
+  * Swap default trace behaviour to 'enabled' by @willend in https://github.com/mccode-dev/McCode/pull/2023
+  * cif2hkl: update to solve F^2 for Xrays using latest CrysFML by @farhi in https://github.com/mccode-dev/McCode/pull/2021
+  * Openacc minor rectifications by @willend in https://github.com/mccode-dev/McCode/pull/2027
+* Components
+  * Sync MCPL components McStas <-> McXtrace for MCPL 2.2.0 support by @willend in https://github.com/mccode-dev/McCode/pull/2019
+  * Update MCPL components for MCPL 2.2.0 features (including stat:sum). by @tkittel in https://github.com/mccode-dev/McCode/pull/2046
+
+### McStas specific:
+* Source_custom
+  * Fixed minor typo in docs by @pablogila in https://github.com/mccode-dev/McCode/pull/1980
+  * Fixed pulse normalisation for all values of n by @pablogila in https://github.com/mccode-dev/McCode/pull/2024
+  * Simplified redundant code for the peak integral calculation by @pablogila in https://github.com/mccode-dev/McCode/pull/2025
+* Single_crystal: comments by @tweber-ill in https://github.com/mccode-dev/McCode/pull/1991
+* Resolution sample/monitor
+  * Reso: Updates by @tweber-ill in https://github.com/mccode-dev/McCode/pull/1992
+  * Add infrastructure to save calculated resolution/covariance matrices … by @willend in https://github.com/mccode-dev/McCode/pull/1993
+  * Sync Res_monitor <-> TOFRes_monitor by @willend in https://github.com/mccode-dev/McCode/pull/1995
+* Add mcresplot to debian metapackage by @willend in https://github.com/mccode-dev/McCode/pull/2022
+* Monitor_nD pixel id and buffer fix by @mads-bertelsen in https://github.com/mccode-dev/McCode/pull/2002
+* Add mcresplot to debian metapackage by @willend in https://github.com/mccode-dev/McCode/pull/2022
+* Add exit attenuation to Incoherent.comp for finite order scattering by @Lomholy in https://github.com/mccode-dev/McCode/pull/2042
+* Updates to Monochromator_bent from @Lomholy by @willend in https://github.com/mccode-dev/McCode/pull/2059 and https://github.com/mccode-dev/McCode/pull/2058
+
+### McXtrace specific:
+* McXtrace fluorescence:
+  * McXtrace: fix header doc in fluo sample (powder and SX) by @farhi in https://github.com/mccode-dev/McCode/pull/1974
+  * McXtrace fluo fix pow 0 by @farhi in https://github.com/mccode-dev/McCode/pull/1979
+  * McXtrace fluo fix 2 by @farhi in https://github.com/mccode-dev/McCode/pull/1988
+  * McXtrace fluo fix : fix in powder select - use gaussian line shape by @farhi in https://github.com/mccode-dev/McCode/pull/1994
+  * McXtrace: samples: fluo: add M-lines via XrayLib Kissel CSb calls by @farhi in https://github.com/mccode-dev/McCode/pull/2004
+  * McXtrace: samples: fluo: fix again the Fluo share by @farhi in https://github.com/mccode-dev/McCode/pull/2005
+  * McXtrace add fluo mcdisplay by @farhi in https://github.com/mccode-dev/McCode/pull/2015
+  * McXtrace fluo add detector 0 by @farhi in https://github.com/mccode-dev/McCode/pull/2029
+* Fix compilation of McXtrace Test_PowderN instr by @willend in https://github.com/mccode-dev/McCode/pull/2000
+* McXtrace various example instrument updates by @farhi in 
+  * https://github.com/mccode-dev/McCode/pull/2033, https://github.com/mccode-dev/McCode/pull/2034, https://github.com/mccode-dev/McCode/pull/2045, https://github.com/mccode-dev/McCode/pull/2048, https://github.com/mccode-dev/McCode/pull/2051, https://github.com/mccode-dev/McCode/pull/2056, https://github.com/mccode-dev/McCode/pull/2057
+* cif2hkl: update to solve F^2 for Xrays using latest CrysFML by @farhi in https://github.com/mccode-dev/McCode/pull/2021
+* McXtrace: add SWING BL at SOLEIL by @farhi in https://github.com/mccode-dev/McCode/pull/2036
+
+**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.27...v3.5.30
+
+
 Changes in McStas/McXtrace 3.5.27, April 29th, 2025
 ## What's Changed
 

INSTALL-McStas/Docker/README.md

@@ -1,4 +1,4 @@
-# Running McStas and McXtrace 3.5.27 in Docker / podman etc.
+# Running McStas and McXtrace 3.5.30 in Docker / podman etc.
 
 The container definition is available at [here](https://github.com/willend/jupyter-remote-desktop-proxy/tree/mcstas-mcxtrace-3.5) and is further on dockerhub under docker.io/mccode/mcstas-mcxtrace
 

INSTALL-McStas/Linux/README.md

@@ -1,4 +1,4 @@
-# Install McStas 3.5.27 on Linux and Unix.
+# Install McStas 3.5.30 on Linux and Unix.
 
 * We provide Debian packages, RedHat packages, and tar.gz's of "preconfigured" source code.
 

INSTALL-McStas/Linux/debian/README.md

@@ -1,4 +1,4 @@
-## Install McStas 3.5.27 On Debian class systems (including Ubuntu, mint etc.):
+## Install McStas 3.5.30 On Debian class systems (including Ubuntu, mint etc.):
 The packages have been tested to work correctly on Ubuntu 24.04.
 
 # Add the McCode repository
@@ -29,7 +29,7 @@ mcstas-tools-python-mcplot-pyqtgraph - python-tools-mcplot-pyqtgraph built using
 mcstas-tools-python-mcrun - python-tools-mcrun built using CMake
 ```
 The meta-package mcstas-suite-python (or mcstas-suite-python-ng)
-allows you to install mcstas 3.5.27 with tools (mcrun/mcplot etc.) by
+allows you to install mcstas 3.5.30 with tools (mcrun/mcplot etc.) by
 the simple apt-get command
 ```bash
 sudo apt-get install mcstas-suite-python

INSTALL-McStas/README.md

@@ -1,4 +1,4 @@
-# Installation instructions for McStas 3.5.27
+# Installation instructions for McStas 3.5.30
 
 Please consult the individual platform instructions:
 

INSTALL-McStas/Windows/README.md

@@ -1,4 +1,4 @@
-# Installation of McStas 3.5.27 on Windows 64 bit Intel systems (some support for arm64)
+# Installation of McStas 3.5.30 on Windows 64 bit Intel systems (some support for arm64)
 ## *IMPORTANT: active internet connection required during installation*
 
 * Please use either of:
@@ -8,7 +8,7 @@
     * Once install has completed, please use the `mcstas-shell` shortcut on the desktop - issue terminal command `mcgui` to start the McStas GUI. 
     * Option 1 *may* function `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++.
   2. **Legacy:**
-    * install the legacy-style MinGW based [McStas 3.5.27 metapackage](https://download.mcstas.org/mcstas-3.5.27/Windows/McStas-Metapackage-3.5.27-win64.exe) - now includes MCPL. 
+    * install the legacy-style MinGW based [McStas 3.5.30 metapackage](https://download.mcstas.org/mcstas-3.5.30/Windows/McStas-Metapackage-3.5.30-win64.exe) - now includes MCPL. 
     * Option 2 should be fully functional on `arm64` processors.
   3. **WSL:**
     * Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. 

INSTALL-McStas/Windows/WSL/README.md

@@ -1,4 +1,4 @@
-# Installation of McStas 3.5.27 on Windows 64 bit systems - using WSL
+# Installation of McStas 3.5.30 on Windows 64 bit systems - using WSL
 *(WSL is the Windows Subsystem for Linux, aka. bash on Ubuntu on Windows)*
 
 
@@ -11,7 +11,7 @@ available, but we recommend Ubuntu)
 * To open it again later, simply issue bash in a terminal or through
 the start menu
 
-## Install the McStas 3.5.27 Debian packages
+## Install the McStas 3.5.30 Debian packages
 * Follow the
   [normal Debian installation instructions](../../Linux/debian/README.md)
   - essentially a matter of sudo apt-get install mcstas-suite-python

INSTALL-McStas/conda/README.md

@@ -1,6 +1,6 @@
-# Install McStas 3.5.27 through conda-forge (macOS, Linux or Windows host)
+# Install McStas 3.5.30 through conda-forge (macOS, Linux or Windows host)
 
-* We a set of conda-packages for installing McStas 3.5.27.x through conda
+* We a set of conda-packages for installing McStas 3.5.30.x through conda
 
 ## Get yourself a conda / mamba
 Due to the complex [licensing situation](https://discuss.scientific-python.org/t/response-to-anaconda-switch-to-paid-plans/1395) with the commercial Anaconda ecosystem, we clearly recommend McStas users to start from an open-source entry-point such as