diff --git a/INSTALL-McStas/Docker/README.md b/INSTALL-McStas/Docker/README.md index 1744489e91..461eefc376 100644 --- a/INSTALL-McStas/Docker/README.md +++ b/INSTALL-McStas/Docker/README.md @@ -1,4 +1,4 @@ -# Running McStas and McXtrace 3.6.1 in Docker / podman etc. +# Running McStas and McXtrace 3.6.5 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 diff --git a/INSTALL-McStas/Linux/README.md b/INSTALL-McStas/Linux/README.md index 7ccb208f1a..8bad952dd1 100644 --- a/INSTALL-McStas/Linux/README.md +++ b/INSTALL-McStas/Linux/README.md @@ -1,4 +1,4 @@ -# Install McStas 3.6.1 on Linux and Unix. +# Install McStas 3.6.5 on Linux and Unix. * We provide Debian packages, RedHat packages, and tar.gz's of "preconfigured" source code. diff --git a/INSTALL-McStas/Linux/debian/README.md b/INSTALL-McStas/Linux/debian/README.md index 4ebf959bca..bafe0d57e0 100644 --- a/INSTALL-McStas/Linux/debian/README.md +++ b/INSTALL-McStas/Linux/debian/README.md @@ -1,4 +1,4 @@ -## Install McStas 3.6.1 On Debian class systems (including Ubuntu, mint etc.): +## Install McStas 3.6.5 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.6.1 with tools (mcrun/mcplot etc.) by +allows you to install mcstas 3.6.5 with tools (mcrun/mcplot etc.) by the simple apt-get command ```bash sudo apt-get install mcstas-suite-python diff --git a/INSTALL-McStas/README.md b/INSTALL-McStas/README.md index c7a4e008a4..480d750e92 100644 --- a/INSTALL-McStas/README.md +++ b/INSTALL-McStas/README.md @@ -1,4 +1,4 @@ -# Installation instructions for McStas 3.6.1 +# Installation instructions for McStas 3.6.5 Please consult the individual platform instructions: diff --git a/INSTALL-McStas/Windows/README.md b/INSTALL-McStas/Windows/README.md index 6c98991429..3fdd73f29d 100644 --- a/INSTALL-McStas/Windows/README.md +++ b/INSTALL-McStas/Windows/README.md @@ -1,4 +1,4 @@ -# Installation of McStas 3.6.1 on Windows 64 bit Intel systems (some support for arm64) +# Installation of McStas 3.6.5 on Windows 64 bit Intel systems (some support for arm64) ## *IMPORTANT: active internet connection required during installation* * Please use either of: @@ -10,7 +10,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.6.1 metapackage](https://download.mcstas.org/mcstas-3.6.1/Windows/McStas-Metapackage-3.6.1-win64.exe) + * install the legacy-style MinGW based [McStas 3.6.5 metapackage](https://download.mcstas.org/mcstas-3.6.5/Windows/McStas-Metapackage-3.6.5-win64.exe) * 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. diff --git a/INSTALL-McStas/Windows/WSL/README.md b/INSTALL-McStas/Windows/WSL/README.md index 863ecc0761..1faab51bdd 100644 --- a/INSTALL-McStas/Windows/WSL/README.md +++ b/INSTALL-McStas/Windows/WSL/README.md @@ -1,4 +1,4 @@ -# Installation of McStas 3.6.1 on Windows 64 bit systems - using WSL +# Installation of McStas 3.6.5 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.6.1 Debian packages +## Install the McStas 3.6.5 Debian packages * Follow the [normal Debian installation instructions](../../Linux/debian/README.md) - essentially a matter of sudo apt-get install mcstas-suite-python diff --git a/INSTALL-McStas/conda/README.md b/INSTALL-McStas/conda/README.md index 3562efa65a..f146be4fa7 100644 --- a/INSTALL-McStas/conda/README.md +++ b/INSTALL-McStas/conda/README.md @@ -1,6 +1,6 @@ -# Install McStas 3.6.1 through conda-forge (macOS, Linux or Windows host) +# Install McStas 3.6.5 through conda-forge (macOS, Linux or Windows host) -* We a set of conda-packages for installing McStas 3.6.1.x through conda +* We a set of conda-packages for installing McStas 3.6.5.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 diff --git a/INSTALL-McStas/macOS/README.md b/INSTALL-McStas/macOS/README.md index 36f244b86b..7441fe0b61 100644 --- a/INSTALL-McStas/macOS/README.md +++ b/INSTALL-McStas/macOS/README.md @@ -1,4 +1,4 @@ -# Installation of McStas 3.6.1 on macOS +# Installation of McStas 3.6.5 on macOS ## Supported macOS releases * macOS 11-15 (Big Sur and later, fully supported python tool set. Supported on both Intel and Apple Silicon, @@ -7,16 +7,16 @@ ## Steps to perform * Download the package: - [McStas 3.6.1 for macOS](https://download.mcstas.org/mcstas-3.6.1/macOS/mcstas-3.6.1-macOS-conda.tar.gz) + [McStas 3.6.5 for macOS](https://download.mcstas.org/mcstas-3.6.5/macOS/mcstas-3.6.5-macOS-conda.tar.gz) and unpack it (e.g. double-clicking should work). * Open the relevant folder for your local processor -* Drag the McStas-3.6.1.app to /Applications and right-click + open to start the app:
+* Drag the McStas-3.6.5.app to /Applications and right-click + open to start the app:
![](screenshots/1_open-mcstas-from-Applications.png?raw=true) * Depending on your macOS version, security settings may initially prevent the app from opening, example from macOS 15 Sequoia: - - Initial warning that "McStas-3.6.1" was not opened
+ - Initial warning that "McStas-3.6.5" was not opened
![](screenshots/2_mcstas-not-opened.png?raw=true) - Next, go to System Preferences, Privacy and Security and select to "Open Anyway"
@@ -26,9 +26,9 @@ - And finally give your password for installation to proceed
![](screenshots/5_admin-password.png?raw=true) -* :warning: In case the last warning still does not allow to open the application, you may issue the following command in a Terminal: `sudo xattr -dr com.apple.quarantine /Applications/McStas-3.6.1.app` +* :warning: In case the last warning still does not allow to open the application, you may issue the following command in a Terminal: `sudo xattr -dr com.apple.quarantine /Applications/McStas-3.6.5.app` -* McStas 3.6.1 macOS app bundless are fully based on conda-forge and will "self-inject" all dependencies on first launch. Please follow any on-screen instructions given. +* McStas 3.6.5 macOS app bundless are fully based on conda-forge and will "self-inject" all dependencies on first launch. Please follow any on-screen instructions given. * In case you have trouble accessing instrument files in certain areas of your disk, please give the McStas bundle "Full Disk Access" diff --git a/INSTALL-McXtrace/Docker/README.md b/INSTALL-McXtrace/Docker/README.md index 1744489e91..461eefc376 100644 --- a/INSTALL-McXtrace/Docker/README.md +++ b/INSTALL-McXtrace/Docker/README.md @@ -1,4 +1,4 @@ -# Running McStas and McXtrace 3.6.1 in Docker / podman etc. +# Running McStas and McXtrace 3.6.5 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 diff --git a/INSTALL-McXtrace/Linux/README.md b/INSTALL-McXtrace/Linux/README.md index 7509cd55d8..5d17c8e5a8 100644 --- a/INSTALL-McXtrace/Linux/README.md +++ b/INSTALL-McXtrace/Linux/README.md @@ -1,4 +1,4 @@ -# Install McXtrace 3.6.1 on Linux and Unix. +# Install McXtrace 3.6.5 on Linux and Unix. * We provide Debian packages, RedHat packages, and tar.gz's of "preconfigured" source code. diff --git a/INSTALL-McXtrace/Linux/debian/README.md b/INSTALL-McXtrace/Linux/debian/README.md index 60717d80b6..fd5175a0f5 100644 --- a/INSTALL-McXtrace/Linux/debian/README.md +++ b/INSTALL-McXtrace/Linux/debian/README.md @@ -1,4 +1,4 @@ -## Install McXtrace 3.6.1 On Debian class systems (including Ubuntu, mint etc.): +## Install McXtrace 3.6.5 On Debian class systems (including Ubuntu, mint etc.): The packages have been tested to work correctly on Ubuntu 24.04. # Add the McCode repository @@ -28,7 +28,7 @@ mcxtrace-tools-python-mxplot-pyqtgraph - python-tools-mxplot-pyqtgraph built usi mcxtrace-tools-python-mxrun - python-tools-mxrun built using CMake ``` The meta-package mcxtrace-suite-python (or mcxtrace-suite-python-ng) -allows you to install mcxtrace 3.6.1 with tools (mcrun/mcplot etc.) by +allows you to install mcxtrace 3.6.5 with tools (mcrun/mcplot etc.) by the simple apt-get command ```bash sudo apt-get install mcxtrace-suite-python diff --git a/INSTALL-McXtrace/README.md b/INSTALL-McXtrace/README.md index 93ea58334c..9ec94da924 100644 --- a/INSTALL-McXtrace/README.md +++ b/INSTALL-McXtrace/README.md @@ -1,4 +1,4 @@ -# Installation instructions for McXtrace 3.6.1 +# Installation instructions for McXtrace 3.6.5 Please consult the individual platform instructions: diff --git a/INSTALL-McXtrace/Windows/README.md b/INSTALL-McXtrace/Windows/README.md index be44692773..c2dd72afd1 100644 --- a/INSTALL-McXtrace/Windows/README.md +++ b/INSTALL-McXtrace/Windows/README.md @@ -1,4 +1,4 @@ -# Installation of McXtrace 3.6.1 on Windows 64 bit Intel systems (some support for arm64) +# Installation of McXtrace 3.6.5 on Windows 64 bit Intel systems (some support for arm64) ## *IMPORTANT: active internet connection required during installation* * Please use either of: @@ -10,7 +10,7 @@ * Once install has completed, please use the `mcxtrace-shell` shortcut on the desktop - issue terminal command `mxgui` to start the McXtrace 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 [McXtrace 3.6.1 metapackage](https://download.mcxtrace.org/mcxtrace-3.6.1/Windows/McXtrace-Metapackage-3.6.1-win64.exe) + * install the legacy-style MinGW based [McXtrace 3.6.5 metapackage](https://download.mcxtrace.org/mcxtrace-3.6.5/Windows/McXtrace-Metapackage-3.6.5-win64.exe) * 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. diff --git a/INSTALL-McXtrace/Windows/WSL/README.md b/INSTALL-McXtrace/Windows/WSL/README.md index b5f630ef01..4411902b7a 100644 --- a/INSTALL-McXtrace/Windows/WSL/README.md +++ b/INSTALL-McXtrace/Windows/WSL/README.md @@ -1,4 +1,4 @@ -# Installation of McXtrace 3.6.1 on Windows 64 bit systems - using WSL +# Installation of McXtrace 3.6.5 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 McXtrace 3.6.1 Debian packages +## Install the McXtrace 3.6.5 Debian packages * Follow the [normal Debian installation instructions](../../Linux/debian/README.md) - essentially a matter of sudo apt-get install mcxtrace-suite-python diff --git a/INSTALL-McXtrace/conda/README.md b/INSTALL-McXtrace/conda/README.md index d18aec34a4..33ad083b36 100644 --- a/INSTALL-McXtrace/conda/README.md +++ b/INSTALL-McXtrace/conda/README.md @@ -1,6 +1,6 @@ -# Install McXtrace 3.6.1 through conda-forge (macOS, Linux or Windows host) +# Install McXtrace 3.6.5 through conda-forge (macOS, Linux or Windows host) -* We a set of conda-packages for installing McXtrace 3.6.1.x through conda +* We a set of conda-packages for installing McXtrace 3.6.5.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 McXtrace users to start from an open-source entry-point such as diff --git a/INSTALL-McXtrace/macOS/README.md b/INSTALL-McXtrace/macOS/README.md index 7b34b6dd8c..4d5a15bb97 100644 --- a/INSTALL-McXtrace/macOS/README.md +++ b/INSTALL-McXtrace/macOS/README.md @@ -1,4 +1,4 @@ -# Installation of McXtrace 3.6.1 on macOS +# Installation of McXtrace 3.6.5 on macOS ## Supported macOS releases * macOS 11-15 (Big Sur and later, fully supported python tool set. Supported on both Intel and Apple Silicon, @@ -7,16 +7,16 @@ ## Steps to perform * Download the package: - [McXtrace 3.6.1 for macOS](https://download.mcxtrace.org/mcxtrace-3.6.1/macOS/mcxtrace-3.6.1-macOS-conda.tar.gz) + [McXtrace 3.6.5 for macOS](https://download.mcxtrace.org/mcxtrace-3.6.5/macOS/mcxtrace-3.6.5-macOS-conda.tar.gz) and unpack it (e.g. double-clicking should work). * Open the relevant folder for your local processor -* Drag the McXtrace-3.6.1.app to /Applications and right-click + open to start the app:
+* Drag the McXtrace-3.6.5.app to /Applications and right-click + open to start the app:
![](screenshots/1_open-mcxtrace-from-Applications.png?raw=true) * Depending on your macOS version, security settings may initially prevent the app from opening, example from macOS 15 Sequoia: - - Initial warning that "McXtrace-3.6.1" was not opened
+ - Initial warning that "McXtrace-3.6.5" was not opened
![](screenshots/2_mcxtrace-not-opened.png?raw=true) - Next, go to System Preferences, Privacy and Security and select to "Open Anyway"
@@ -26,9 +26,9 @@ - And finally give your password for installation to proceed
![](screenshots/5_admin-password.png?raw=true) -* :warning: In case the last warning still does not allow to open the application, you may issue the following command in a Terminal: `sudo xattr -dr com.apple.quarantine /Applications/McXtrace-3.6.1.app` +* :warning: In case the last warning still does not allow to open the application, you may issue the following command in a Terminal: `sudo xattr -dr com.apple.quarantine /Applications/McXtrace-3.6.5.app` -* McXtrace 3.6.1 macOS app bundles are fully based on conda-forge and will "self-inject" all dependencies on first launch. Please follow any on-screen instructions given. +* McXtrace 3.6.5 macOS app bundles are fully based on conda-forge and will "self-inject" all dependencies on first launch. Please follow any on-screen instructions given. * In case you have trouble accessing instrument files in certain areas of your disk, please give the McXtrace bundle "Full Disk Access" diff --git a/docpkg/manuals/mcstas/Component_manual.pdf b/docpkg/manuals/mcstas/Component_manual.pdf index 715de9ce9c..3642399884 100644 Binary files a/docpkg/manuals/mcstas/Component_manual.pdf and b/docpkg/manuals/mcstas/Component_manual.pdf differ diff --git a/docpkg/manuals/mcstas/manual.pdf b/docpkg/manuals/mcstas/manual.pdf index f97d1acafb..52846108db 100644 Binary files a/docpkg/manuals/mcstas/manual.pdf and b/docpkg/manuals/mcstas/manual.pdf differ diff --git a/docpkg/manuals/mcxtrace/Component_manual.pdf b/docpkg/manuals/mcxtrace/Component_manual.pdf index 151939c82c..db530da43c 100644 Binary files a/docpkg/manuals/mcxtrace/Component_manual.pdf and b/docpkg/manuals/mcxtrace/Component_manual.pdf differ diff --git a/docpkg/manuals/mcxtrace/manual.pdf b/docpkg/manuals/mcxtrace/manual.pdf index 81dd2b07c8..d8e5080a1f 100644 Binary files a/docpkg/manuals/mcxtrace/manual.pdf and b/docpkg/manuals/mcxtrace/manual.pdf differ diff --git a/docs/manuals/mcstas/preamble_common.tex b/docs/manuals/mcstas/preamble_common.tex index e9936f55aa..a4b262904e 100644 --- a/docs/manuals/mcstas/preamble_common.tex +++ b/docs/manuals/mcstas/preamble_common.tex @@ -8,8 +8,8 @@ % A few macros: \newcommand{\MCS}{McStas\xspace} \newcommand{\mcs}{\texttt{mcstas}\xspace} -\newcommand{\version}{3.5\xspace} -\newcommand{\reldate}{August, 2024} +\newcommand{\version}{3.6\xspace} +\newcommand{\reldate}{January, 2026} % Unused: % The next rawfonts package one is used in the ``datablad''. diff --git a/docs/manuals/mcxtrace/preamble.tex b/docs/manuals/mcxtrace/preamble.tex index 27582942b5..6bac411a62 100644 --- a/docs/manuals/mcxtrace/preamble.tex +++ b/docs/manuals/mcxtrace/preamble.tex @@ -24,8 +24,8 @@ \newcommand{\MCX}{McXtrace\xspace} \newcommand{\MCS}{McStas\xspace} -\newcommand{\version}{3.5\xspace} -\newcommand{\reldate}{September, 2024\xspace} +\newcommand{\version}{3.6\xspace} +\newcommand{\reldate}{January, 2026\xspace} \newcommand{\Ombold}{\mbox{\boldmath $\Omega$}} \newcommand{\NBIlong}{Niels Bohr Institute, University of Copenhagen, Copenhagen, Denmark.\xspace} diff --git a/docs/manuals/mcxtrace/preamble_comp.tex b/docs/manuals/mcxtrace/preamble_comp.tex index 4a342432f6..85fb570cfd 100644 --- a/docs/manuals/mcxtrace/preamble_comp.tex +++ b/docs/manuals/mcxtrace/preamble_comp.tex @@ -23,8 +23,8 @@ \newcommand{\MCX}{McXtrace\xspace} \newcommand{\MCS}{McStas\xspace} -\newcommand{\version}{3.5\xspace} -\newcommand{\reldate}{September, 2024\xspace} +\newcommand{\version}{3.6\xspace} +\newcommand{\reldate}{January, 2026\xspace} \newcommand{\Ombold}{\mbox{\boldmath $\Omega$}} \newcommand{\NBIlong}{Niels Bohr Institute, Univeristy of Copenhagen, Copenhagen, Denmark.\xspace} diff --git a/support/MacOSX/McCode-conda.app/Contents/MacOS/micromamba-inject.command.in b/support/MacOSX/McCode-conda.app/Contents/MacOS/micromamba-inject.command.in index 0c3fcf6b3a..20f14e2d50 100644 --- a/support/MacOSX/McCode-conda.app/Contents/MacOS/micromamba-inject.command.in +++ b/support/MacOSX/McCode-conda.app/Contents/MacOS/micromamba-inject.command.in @@ -15,7 +15,7 @@ then rm ${BASEDIR}/Contents/Resources/INJECTING exit else - (cd /tmp && curl -L -O https://raw.githubusercontent.com/mccode-dev/McCode/main/@FLAVOR@-environment.yml) + (cd /tmp && curl -L -O https://raw.githubusercontent.com/mccode-dev/McCode/main/@FLAVOR@-environment.yml && sed -i.bak s/@FLAVOR@/@FLAVOR@=@MCCODE_VERSION@/g @FLAVOR@-environment.yml) ret_code1=$? if [ "$ret_code1" != "0" ]; then