Skip to content

Commit cfb6866

Browse files
authored
Merge pull request #1973 from mccode-dev/pre-3.5.27-doc-touchup
Document new install batches for McStas/McXtrace from conda-forge
2 parents ccb09f1 + a70d269 commit cfb6866

File tree

22 files changed

+275
-83
lines changed

22 files changed

+275
-83
lines changed

CHANGES_McStas

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,78 @@
5555
* Modified by: PW November 2024: version 3.5.12
5656
* Modified by: PW December 2024: version 3.5.16
5757
* Modified by: PW February 2025: version 3.5.24
58+
* Modified by: PW February 2025: version 3.5.24
5859
*
59-
* This file is part of McStas 3.5.24, released February 19th 2025.
60+
* This file is part of McStas 3.5.27, released April 29th 2025.
6061
* It gives a 'changes' list from the beginning of the project
6162
*
6263
*******************************************************************************/
64+
Changes in McStas/McXtrace 3.5.27, April 29th, 2025
65+
## What's Changed
66+
67+
### Common new features and patches for McStas and McXtrace (tools, random numbers etc.)
68+
* Update rootmccode to work with new version of ROOT by @ebknudsen in https://github.com/mccode-dev/McCode/pull/1862
69+
* Add wrapper for mc/mxdisplay-cad on Windows by @willend in https://github.com/mccode-dev/McCode/pull/1888
70+
* Input flag -y / --yes applies all instrument parameter default values by @willend in https://github.com/mccode-dev/McCode/pull/1914
71+
* PowderN and SX fixes: cif2hkl now searches correctly files using Open_File/real path, and sets 'barns=1' by @farhi in https://github.com/mccode-dev/McCode/pull/1952
72+
* Correct implementation to use unit64_t (achieves a correct 64bit RNG also on Windows...) by @willend in https://github.com/mccode-dev/McCode/pull/1955 and https://github.com/mccode-dev/McCode/pull/1966
73+
* Add simple test of KISS RNG across platforms and compilers by @willend in https://github.com/mccode-dev/McCode/pull/1956
74+
* Suppress const char in the cif2hkl fcts by @willend in https://github.com/mccode-dev/McCode/pull/1957
75+
* Use mcpl 2.0 proper on Windows. by @willend in https://github.com/mccode-dev/McCode/pull/1962
76+
77+
### New McStas specific features and patches
78+
* Full adaptation of "spin-component nullification" after "spin up/down measurement" by @willend in https://github.com/mccode-dev/McCode/pull/1886 (see also discussion on [mcstas-users](https://mailman2.mcstas.org/pipermail/mcstas-users/2025q2/001566.html)
79+
* Add component name in "segno" related Exit/Error statement by @willend in https://github.com/mccode-dev/McCode/pull/1895
80+
* Allow further geometries for He3 cell component by @willend in https://github.com/mccode-dev/McCode/pull/1915
81+
* Contributed component Source_custom by @pablogila in https://github.com/mccode-dev/McCode/pull/1911 and https://github.com/mccode-dev/McCode/pull/1946
82+
* Update MCPL_input.comp by @g5t in https://github.com/mccode-dev/McCode/pull/1924
83+
* PowderN: remove a static variable declare from SHARE section by @willend in https://github.com/mccode-dev/McCode/pull/1945
84+
* Comp updates from work on ESS SKADI by @willend in https://github.com/mccode-dev/McCode/pull/1948
85+
* Add COPY SHARE to Diaphragm Slit-alias-comp + add in McXtrace by @willend in https://github.com/mccode-dev/McCode/pull/1950
86+
87+
### New McXtrace specific features and patches
88+
* McXtrace: data: refactor reflec_xraydb.py: refactor by @farhi in https://github.com/mccode-dev/McCode/pull/1897
89+
* McXtrace: work in data/reflec_xraydb script by @farhi in https://github.com/mccode-dev/McCode/pull/1916
90+
* mcxtrace:powderN: Update PowderN.comp: reduce nb of printed warnings by @farhi in https://github.com/mccode-dev/McCode/pull/1919
91+
* McXtrace: Fluorescence handling ala PowderN by @willend in https://github.com/mccode-dev/McCode/pull/1942
92+
* mcxtrace: instrument.y sync from mcstas by @willend in https://github.com/mccode-dev/McCode/pull/1943
93+
* Add Diaphragm Slit-alias-comp in McXtrace by @willend in https://github.com/mccode-dev/McCode/pull/1950
94+
* McXtrace: samples: add Fluo+PowderN component by @farhi in https://github.com/mccode-dev/McCode/pull/1951
95+
* @farhi mcgui tooltip edits from https://github.com/mccode-dev/McCode/pull/1952 by @willend in https://github.com/mccode-dev/McCode/pull/1953
96+
* Mcxtrace fluo sx 1 by @farhi in https://github.com/mccode-dev/McCode/pull/1972
97+
98+
### Platform support and packaging, continuous integration
99+
* A few minor commits for Install (sudo -E) and libgsl dependency. by @farhi in https://github.com/mccode-dev/McCode/pull/1867
100+
* Expand nighty test suite to macOS and Windows by @willend in https://github.com/mccode-dev/McCode/pull/1870
101+
* Fix paths in mcxtrace testsuite script by @willend in https://github.com/mccode-dev/McCode/pull/1871
102+
* Try to run the basic test using mpich on macOS by @willend in https://github.com/mccode-dev/McCode/pull/1873
103+
* Enable mpi for windows in test CI by @willend in https://github.com/mccode-dev/McCode/pull/1875
104+
* Enable MPI, NCrystal and MCPL in windows-test-CI by @willend in https://github.com/mccode-dev/McCode/pull/1876
105+
* Add libnexus-dev on Ubuntu nightly test by @willend in https://github.com/mccode-dev/McCode/pull/1878
106+
* Correct path for mcxtrace nightly testsuite by @willend in https://github.com/mccode-dev/McCode/pull/1879
107+
* Cppcheck hints by @willend in https://github.com/mccode-dev/McCode/pull/1881
108+
* Return to mpich on basictest by @willend in https://github.com/mccode-dev/McCode/pull/1882
109+
* Fix issue 1883 by setting mpirun --mca params by @willend in https://github.com/mccode-dev/McCode/pull/1884
110+
* Return None in mctest if no mccode.sim was written by @willend in https://github.com/mccode-dev/McCode/pull/1885
111+
* MacInstall: add comment on forcing open permission with command by @farhi in https://github.com/mccode-dev/McCode/pull/1890
112+
* First stab at adding basic windows MSVC test by @tkittel in https://github.com/mccode-dev/McCode/pull/1898
113+
* Doc correction for MCPL install-location in Windows legacy by @willend in https://github.com/mccode-dev/McCode/pull/1900
114+
* Restores MPIFLAGS configuration on non-windows platforms. by @willend in https://github.com/mccode-dev/McCode/pull/1904
115+
* Disable macos/openmpi in favour of macos/mpich for now by @willend in https://github.com/mccode-dev/McCode/pull/1906
116+
* Add Windows / arm64 in CI (only msvc and sans MPI for now) by @willend in https://github.com/mccode-dev/McCode/pull/1954
117+
* Suppess various warnings from msvc on Windows: use %li -> %zi in printfs by @willend in https://github.com/mccode-dev/McCode/pull/1958
118+
* Suppress msvc warnings about implicit mkdir() and getpid() by @willend in https://github.com/mccode-dev/McCode/pull/1959
119+
* mcrun and msvc: drop -lm and -o instr.exe by @willend in https://github.com/mccode-dev/McCode/pull/1960
120+
* More warning suppression msvc by @willend in https://github.com/mccode-dev/McCode/pull/1961
121+
* Minor fixes post 3.5.26 by @willend in https://github.com/mccode-dev/McCode/pull/1969
122+
123+
124+
## New Contributors
125+
* @pablogila made their first contribution in https://github.com/mccode-dev/McCode/pull/1911
126+
127+
**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.24...v3.5.27
128+
129+
63130
Changes in McStas/McXtrace 3.5.24, February 19th, 2025
64131
## What's Changed
65132

CHANGES_McXtrace

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,72 @@
1515
*
1616
* Documentation: CHANGES_McXtrace
1717
*************************************************************************/
18+
Changes in McStas/McXtrace 3.5.27, April 29th, 2025
19+
## What's Changed
20+
21+
### Common new features and patches for McStas and McXtrace (tools, random numbers etc.)
22+
* Update rootmccode to work with new version of ROOT by @ebknudsen in https://github.com/mccode-dev/McCode/pull/1862
23+
* Add wrapper for mc/mxdisplay-cad on Windows by @willend in https://github.com/mccode-dev/McCode/pull/1888
24+
* Input flag -y / --yes applies all instrument parameter default values by @willend in https://github.com/mccode-dev/McCode/pull/1914
25+
* PowderN and SX fixes: cif2hkl now searches correctly files using Open_File/real path, and sets 'barns=1' by @farhi in https://github.com/mccode-dev/McCode/pull/1952
26+
* Correct implementation to use unit64_t (achieves a correct 64bit RNG also on Windows...) by @willend in https://github.com/mccode-dev/McCode/pull/1955 and https://github.com/mccode-dev/McCode/pull/1966
27+
* Add simple test of KISS RNG across platforms and compilers by @willend in https://github.com/mccode-dev/McCode/pull/1956
28+
* Suppress const char in the cif2hkl fcts by @willend in https://github.com/mccode-dev/McCode/pull/1957
29+
* Use mcpl 2.0 proper on Windows. by @willend in https://github.com/mccode-dev/McCode/pull/1962
30+
31+
### New McStas specific features and patches
32+
* Full adaptation of "spin-component nullification" after "spin up/down measurement" by @willend in https://github.com/mccode-dev/McCode/pull/1886 (see also discussion on [mcstas-users](https://mailman2.mcstas.org/pipermail/mcstas-users/2025q2/001566.html)
33+
* Add component name in "segno" related Exit/Error statement by @willend in https://github.com/mccode-dev/McCode/pull/1895
34+
* Allow further geometries for He3 cell component by @willend in https://github.com/mccode-dev/McCode/pull/1915
35+
* Contributed component Source_custom by @pablogila in https://github.com/mccode-dev/McCode/pull/1911 and https://github.com/mccode-dev/McCode/pull/1946
36+
* Update MCPL_input.comp by @g5t in https://github.com/mccode-dev/McCode/pull/1924
37+
* PowderN: remove a static variable declare from SHARE section by @willend in https://github.com/mccode-dev/McCode/pull/1945
38+
* Comp updates from work on ESS SKADI by @willend in https://github.com/mccode-dev/McCode/pull/1948
39+
* Add COPY SHARE to Diaphragm Slit-alias-comp + add in McXtrace by @willend in https://github.com/mccode-dev/McCode/pull/1950
40+
41+
### New McXtrace specific features and patches
42+
* McXtrace: data: refactor reflec_xraydb.py: refactor by @farhi in https://github.com/mccode-dev/McCode/pull/1897
43+
* McXtrace: work in data/reflec_xraydb script by @farhi in https://github.com/mccode-dev/McCode/pull/1916
44+
* mcxtrace:powderN: Update PowderN.comp: reduce nb of printed warnings by @farhi in https://github.com/mccode-dev/McCode/pull/1919
45+
* McXtrace: Fluorescence handling ala PowderN by @willend in https://github.com/mccode-dev/McCode/pull/1942
46+
* mcxtrace: instrument.y sync from mcstas by @willend in https://github.com/mccode-dev/McCode/pull/1943
47+
* Add Diaphragm Slit-alias-comp in McXtrace by @willend in https://github.com/mccode-dev/McCode/pull/1950
48+
* McXtrace: samples: add Fluo+PowderN component by @farhi in https://github.com/mccode-dev/McCode/pull/1951
49+
* @farhi mcgui tooltip edits from https://github.com/mccode-dev/McCode/pull/1952 by @willend in https://github.com/mccode-dev/McCode/pull/1953
50+
* Mcxtrace fluo sx 1 by @farhi in https://github.com/mccode-dev/McCode/pull/1972
51+
52+
### Platform support and packaging, continuous integration
53+
* A few minor commits for Install (sudo -E) and libgsl dependency. by @farhi in https://github.com/mccode-dev/McCode/pull/1867
54+
* Expand nighty test suite to macOS and Windows by @willend in https://github.com/mccode-dev/McCode/pull/1870
55+
* Fix paths in mcxtrace testsuite script by @willend in https://github.com/mccode-dev/McCode/pull/1871
56+
* Try to run the basic test using mpich on macOS by @willend in https://github.com/mccode-dev/McCode/pull/1873
57+
* Enable mpi for windows in test CI by @willend in https://github.com/mccode-dev/McCode/pull/1875
58+
* Enable MPI, NCrystal and MCPL in windows-test-CI by @willend in https://github.com/mccode-dev/McCode/pull/1876
59+
* Add libnexus-dev on Ubuntu nightly test by @willend in https://github.com/mccode-dev/McCode/pull/1878
60+
* Correct path for mcxtrace nightly testsuite by @willend in https://github.com/mccode-dev/McCode/pull/1879
61+
* Cppcheck hints by @willend in https://github.com/mccode-dev/McCode/pull/1881
62+
* Return to mpich on basictest by @willend in https://github.com/mccode-dev/McCode/pull/1882
63+
* Fix issue 1883 by setting mpirun --mca params by @willend in https://github.com/mccode-dev/McCode/pull/1884
64+
* Return None in mctest if no mccode.sim was written by @willend in https://github.com/mccode-dev/McCode/pull/1885
65+
* MacInstall: add comment on forcing open permission with command by @farhi in https://github.com/mccode-dev/McCode/pull/1890
66+
* First stab at adding basic windows MSVC test by @tkittel in https://github.com/mccode-dev/McCode/pull/1898
67+
* Doc correction for MCPL install-location in Windows legacy by @willend in https://github.com/mccode-dev/McCode/pull/1900
68+
* Restores MPIFLAGS configuration on non-windows platforms. by @willend in https://github.com/mccode-dev/McCode/pull/1904
69+
* Disable macos/openmpi in favour of macos/mpich for now by @willend in https://github.com/mccode-dev/McCode/pull/1906
70+
* Add Windows / arm64 in CI (only msvc and sans MPI for now) by @willend in https://github.com/mccode-dev/McCode/pull/1954
71+
* Suppess various warnings from msvc on Windows: use %li -> %zi in printfs by @willend in https://github.com/mccode-dev/McCode/pull/1958
72+
* Suppress msvc warnings about implicit mkdir() and getpid() by @willend in https://github.com/mccode-dev/McCode/pull/1959
73+
* mcrun and msvc: drop -lm and -o instr.exe by @willend in https://github.com/mccode-dev/McCode/pull/1960
74+
* More warning suppression msvc by @willend in https://github.com/mccode-dev/McCode/pull/1961
75+
* Minor fixes post 3.5.26 by @willend in https://github.com/mccode-dev/McCode/pull/1969
76+
77+
78+
## New Contributors
79+
* @pablogila made their first contribution in https://github.com/mccode-dev/McCode/pull/1911
80+
81+
**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.24...v3.5.27
82+
83+
1884
Changes in McStas/McXtrace 3.5.24, February 19th, 2025
1985
## What's Changed
2086

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.5.24 in Docker / podman etc.
1+
# Running McStas and McXtrace 3.5.27 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.5.24 on Linux and Unix.
1+
# Install McStas 3.5.27 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.5.24 On Debian class systems (including Ubuntu, mint etc.):
1+
## Install McStas 3.5.27 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.5.24 with tools (mcrun/mcplot etc.) by
32+
allows you to install mcstas 3.5.27 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.5.24
1+
# Installation instructions for McStas 3.5.27
22

33
Please consult the individual platform instructions:
44

INSTALL-McStas/Windows/README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Installation of McStas 3.5.24 on Windows 64 bit systems
1+
# Installation of McStas 3.5.27 on Windows 64 bit Intel systems
2+
## *IMPORTANT: active internet connection required during installation*
23

3-
* Please install the [McStas 3.5.24 metapackage](https://download.mcstas.org/mcstas-3.5.24/Windows/McStas-Metapackage-3.5.24-win64.exe)
4-
* To enable use of MCPL with McStas 3.5.24 on Windows, please:
5-
1) Grant yourself write permission to `c:\mcstas-3.5.24\miniconda3`
6-
2) Locate and run the executable `mcstas-mcpl-NSIS64-3.5.24-mingw64.exe` from the [single-packages folder](https://download.mcstas.org/mcstas-3.5.24/Windows/single-packages)
7-
3) During installation, please specify `c:\mcstas-3.5.24\miniconda3` as installation directory
8-
4) After installation, place the mcpl-related `.bat` files from the [extras folder](https://download.mcstas.org/mcstas-3.5.24/Windows/extras) folder in `c:\mcstas-3.5.24\miniconda3\bin`
9-
10-
11-
* An alternative to installing this cross-compiled verison is to follow the instructions
12-
posted under [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Debian binaries there
13-
* Or use [conda-forge](../conda/README.md)
4+
* Please either of:
5+
1. **Recommended:**
6+
* Install [Visual Studio including c/c++ support](https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-170#download-and-install-the-tools) (Any version of Visual Studio itself should do. Please install at minumum "Desktop development with c++" selecting VS2019 build tools. You can also use newer VS2022 build tools, but VS2019 must be present also.
7+
* Use the [mcstas-conda](mcstas-conda.bat) batch script to install the latest mcstas from `conda-forge`
8+
2. **Legacy:**
9+
* 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. Option 2 is also functional on `arm64` processors.
10+
3. **WSL:**
11+
* Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. Option 3 is also functional on `arm64` processors.
12+
13+
If you are `conda-forge` knowledgable already, you may also simply install a new environment as explained in [conda-forge](../conda/README.md)
1414

1515
## Internet access required:
1616
* If you are behind a proxy server, please use the commands

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.5.24 on Windows 64 bit systems - using WSL
1+
# Installation of McStas 3.5.27 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.5.24 Debian packages
14+
## Install the McStas 3.5.27 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
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
@mkdir %USERPROFILE%\AppData\Roaming\micromamba
2+
@cd %USERPROFILE%\AppData\Roaming\micromamba
3+
@echo Downloading latest micromamba
4+
@set URL=https://github.com/mamba-org/micromamba-releases/releases/latest/download/micromamba-win-64
5+
@curl -L -o micromamba.exe %URL%
6+
@echo Requesting init of micromamba on the shell
7+
@.\micromamba.exe shell init --shell cmd.exe
8+
@.\micromamba.exe shell hook -s cmd.exe
9+
@.\micromamba config append channels conda-forge
10+
@.\micromamba config set channel_priority strict
11+
@echo Checking for existing mcstas environment
12+
@.\micromamba env list > tmpfile
13+
@setlocal
14+
15+
@set FOUND=N
16+
@for /f %%i in ('@findstr mcstas tmpfile') do (
17+
@echo Found existing environment called %%i!
18+
@set FOUND=Y
19+
)
20+
21+
@if /I %FOUND%==N goto INSTALL
22+
23+
:CHOICE
24+
@choice /C YN /M "Press Y to remove mcstas env or N to Cancel."
25+
@if '%ERRORLEVEL%'=='1' goto REMOVE
26+
@if '%ERRORLEVEL%'=='2' goto END
27+
28+
:REMOVE
29+
@echo Removing mcstas env
30+
@.\micromamba env remove -n mcstas -y
31+
32+
:INSTALL
33+
@echo Starting installation of McStas and dependencies
34+
@.\micromamba.exe create -n mcstas mcstas -y
35+
36+
@echo Creating desktop shortcut to new environment
37+
38+
@echo start %USERPROFILE%\AppData\Roaming\mamba\condabin\micromamba activate mcstas > %USERPROFILE%\Desktop\mcstas-shell-conda.bat
39+
40+
:END
41+
@echo End of script
42+
@pause
43+
@endlocal

0 commit comments

Comments
 (0)