Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL-McStas/Docker/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion INSTALL-McStas/Linux/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McStas/Linux/debian/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion INSTALL-McStas/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Installation instructions for McStas 3.6.1
# Installation instructions for McStas 3.6.5

Please consult the individual platform instructions:

Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McStas/Windows/README.md
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McStas/Windows/WSL/README.md
Original file line number Diff line number Diff line change
@@ -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)*


Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McStas/conda/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions INSTALL-McStas/macOS/README.md
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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:<br/>
* Drag the McStas-3.6.5.app to /Applications and right-click + open to start the app:<br/>
![](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<br/>
- Initial warning that "McStas-3.6.5" was not opened<br/>
![](screenshots/2_mcstas-not-opened.png?raw=true)
- Next, go to System Preferences, Privacy and Security and select to
"Open Anyway"<br/>
Expand All @@ -26,9 +26,9 @@
- And finally give your password for installation to proceed<br/>
![](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"
Expand Down
2 changes: 1 addition & 1 deletion INSTALL-McXtrace/Docker/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion INSTALL-McXtrace/Linux/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McXtrace/Linux/debian/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion INSTALL-McXtrace/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Installation instructions for McXtrace 3.6.1
# Installation instructions for McXtrace 3.6.5

Please consult the individual platform instructions:

Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McXtrace/Windows/README.md
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McXtrace/Windows/WSL/README.md
Original file line number Diff line number Diff line change
@@ -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)*


Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions INSTALL-McXtrace/conda/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions INSTALL-McXtrace/macOS/README.md
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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:<br/>
* Drag the McXtrace-3.6.5.app to /Applications and right-click + open to start the app:<br/>
![](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<br/>
- Initial warning that "McXtrace-3.6.5" was not opened<br/>
![](screenshots/2_mcxtrace-not-opened.png?raw=true)
- Next, go to System Preferences, Privacy and Security and select to
"Open Anyway"<br/>
Expand All @@ -26,9 +26,9 @@
- And finally give your password for installation to proceed<br/>
![](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"
Expand Down
Binary file modified docpkg/manuals/mcstas/Component_manual.pdf
Binary file not shown.
Binary file modified docpkg/manuals/mcstas/manual.pdf
Binary file not shown.
Binary file modified docpkg/manuals/mcxtrace/Component_manual.pdf
Binary file not shown.
Binary file modified docpkg/manuals/mcxtrace/manual.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/manuals/mcstas/preamble_common.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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''.
Expand Down
4 changes: 2 additions & 2 deletions docs/manuals/mcxtrace/preamble.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions docs/manuals/mcxtrace/preamble_comp.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/@[email protected])
(cd /tmp && curl -L -O https://raw.githubusercontent.com/mccode-dev/McCode/main/@[email protected] && sed -i.bak s/@FLAVOR@/@FLAVOR@=@MCCODE_VERSION@/g @[email protected])
ret_code1=$?
if [ "$ret_code1" != "0" ];
then
Expand Down