Skip to content

Commit 20f6ed9

Browse files
authored
Merge pull request #2264 from mccode-dev/fix-inherit-bug-abs_logger
Fix inherit bug found in Union_abs_logger_nD + 3.6.1 release
2 parents 78308df + bd6fe66 commit 20f6ed9

File tree

19 files changed

+43
-39
lines changed

19 files changed

+43
-39
lines changed

CHANGES_McStas

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
* Modified by: PW February 2025: version 3.5.24
5959
* Modified by: PW April 2025: version 3.5.27
6060
* Modified by: PW June 2025: version 3.5.32
61-
* Modified by: PW December 2025: version 3.6.0
61+
* Modified by: PW December 2025: version 3.6.1
6262
*
63-
* This file is part of McStas 3.6.0, released December 12th 2025.
63+
* This file is part of McStas 3.6.1, released December 12th 2025.
6464
* It gives a 'changes' list from the beginning of the project
6565
*
6666
*******************************************************************************/
@@ -256,7 +256,7 @@
256256
## New Contributors
257257
* @aaronfinke made their first contribution in https://github.com/mccode-dev/McCode/pull/2169
258258

259-
**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.32...v3.6.0
259+
**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.32...v3.6.1
260260

261261

262262
Changes in McStas/McXtrace 3.5.32, June 17th, 2025

CHANGES_McXtrace

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
## New Contributors
208208
* @aaronfinke made their first contribution in https://github.com/mccode-dev/McCode/pull/2169
209209

210-
**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.32...v3.6.0
210+
**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.32...v3.6.1
211211

212212
Changes in McStas/McXtrace 3.5.31, June 17th, 2025
213213
## What's Changed

INSTALL-McStas/Docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Running McStas and McXtrace 3.6.0 in Docker / podman etc.
1+
# Running McStas and McXtrace 3.6.1 in Docker / podman etc.
22

33
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
44

INSTALL-McStas/Linux/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Install McStas 3.6.0 on Linux and Unix.
1+
# Install McStas 3.6.1 on Linux and Unix.
22

33
* We provide Debian packages, RedHat packages, and tar.gz's of "preconfigured" source code.
44

INSTALL-McStas/Linux/debian/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Install McStas 3.6.0 On Debian class systems (including Ubuntu, mint etc.):
1+
## Install McStas 3.6.1 On Debian class systems (including Ubuntu, mint etc.):
22
The packages have been tested to work correctly on Ubuntu 24.04.
33

44
# Add the McCode repository
@@ -29,7 +29,7 @@ mcstas-tools-python-mcplot-pyqtgraph - python-tools-mcplot-pyqtgraph built using
2929
mcstas-tools-python-mcrun - python-tools-mcrun built using CMake
3030
```
3131
The meta-package mcstas-suite-python (or mcstas-suite-python-ng)
32-
allows you to install mcstas 3.6.0 with tools (mcrun/mcplot etc.) by
32+
allows you to install mcstas 3.6.1 with tools (mcrun/mcplot etc.) by
3333
the simple apt-get command
3434
```bash
3535
sudo apt-get install mcstas-suite-python

INSTALL-McStas/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Installation instructions for McStas 3.6.0
1+
# Installation instructions for McStas 3.6.1
22

33
Please consult the individual platform instructions:
44

INSTALL-McStas/Windows/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Installation of McStas 3.6.0 on Windows 64 bit Intel systems (some support for arm64)
1+
# Installation of McStas 3.6.1 on Windows 64 bit Intel systems (some support for arm64)
22
## *IMPORTANT: active internet connection required during installation*
33

44
* Please use either of:
@@ -10,7 +10,7 @@
1010
* Once install has completed, please use the `mcstas-shell` shortcut on the desktop - issue terminal command `mcgui` to start the McStas GUI.
1111
* Option 1 *may* function `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++.
1212
2. **Legacy:**
13-
* install the legacy-style MinGW based [McStas 3.6.0 metapackage](https://download.mcstas.org/mcstas-3.6.0/Windows/McStas-Metapackage-3.6.0-win64.exe)
13+
* 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)
1414
* Option 2 should be fully functional on `arm64` processors.
1515
3. **WSL:**
1616
* 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Installation of McStas 3.6.0 on Windows 64 bit systems - using WSL
1+
# Installation of McStas 3.6.1 on Windows 64 bit systems - using WSL
22
*(WSL is the Windows Subsystem for Linux, aka. bash on Ubuntu on Windows)*
33

44

@@ -11,7 +11,7 @@ available, but we recommend Ubuntu)
1111
* To open it again later, simply issue bash in a terminal or through
1212
the start menu
1313

14-
## Install the McStas 3.6.0 Debian packages
14+
## Install the McStas 3.6.1 Debian packages
1515
* Follow the
1616
[normal Debian installation instructions](../../Linux/debian/README.md)
1717
- essentially a matter of sudo apt-get install mcstas-suite-python

INSTALL-McStas/conda/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Install McStas 3.6.0 through conda-forge (macOS, Linux or Windows host)
1+
# Install McStas 3.6.1 through conda-forge (macOS, Linux or Windows host)
22

3-
* We a set of conda-packages for installing McStas 3.6.0.x through conda
3+
* We a set of conda-packages for installing McStas 3.6.1.x through conda
44

55
## Get yourself a conda / mamba
66
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

INSTALL-McStas/macOS/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Installation of McStas 3.6.0 on macOS
1+
# Installation of McStas 3.6.1 on macOS
22

33
## Supported macOS releases
44
* macOS 11-15 (Big Sur and later, fully supported python tool set. Supported on both Intel and Apple Silicon,
@@ -7,16 +7,16 @@
77
## Steps to perform
88

99
* Download the package:
10-
[McStas 3.6.0 for macOS](https://download.mcstas.org/mcstas-3.6.0/macOS/mcstas-3.6.0-macOS-conda.tar.gz)
10+
[McStas 3.6.1 for macOS](https://download.mcstas.org/mcstas-3.6.1/macOS/mcstas-3.6.1-macOS-conda.tar.gz)
1111
and unpack it (e.g. double-clicking should work).
1212

1313
* Open the relevant folder for your local processor
1414

15-
* Drag the McStas-3.6.0.app to /Applications and right-click + open to start the app:<br/>
15+
* Drag the McStas-3.6.1.app to /Applications and right-click + open to start the app:<br/>
1616
![](screenshots/1_open-mcstas-from-Applications.png?raw=true)
1717

1818
* Depending on your macOS version, security settings may initially prevent the app from opening, example from macOS 15 Sequoia:
19-
- Initial warning that "McStas-3.6.0" was not opened<br/>
19+
- Initial warning that "McStas-3.6.1" was not opened<br/>
2020
![](screenshots/2_mcstas-not-opened.png?raw=true)
2121
- Next, go to System Preferences, Privacy and Security and select to
2222
"Open Anyway"<br/>
@@ -26,9 +26,9 @@
2626
- And finally give your password for installation to proceed<br/>
2727
![](screenshots/5_admin-password.png?raw=true)
2828

29-
* :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.0.app`
29+
* :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`
3030

31-
* McStas 3.6.0 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.
31+
* 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.
3232

3333
* In case you have trouble accessing instrument files in certain areas
3434
of your disk, please give the McStas bundle "Full Disk Access"

0 commit comments

Comments
 (0)