Skip to content

Commit 7fbf298

Browse files
LomholyLomholy
authored
Merge pull request #2082 from mccode-dev/main
Merge newest commit to phonon branch
2 parents 864e117 + 5be8fda commit 7fbf298

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+599
-149
lines changed

‎.github/workflows/mccode-pooch-registries-dispatch.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: McCode Pooch Registries Dispatch
2+
on:
3+
create:
4+
delete:
5+
6+
jobs:
7+
dispatch:
8+
if: github.event.ref_type == 'tag'
9+
name: Dispatch tag
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
repo: ['mccode-dev/mccode-pooch-registries']
14+
timeout-minutes: 5
15+
steps:
16+
- name: Construct creation payload
17+
shell: bash
18+
run: |
19+
echo "${GITHUB_EVENT_NAME}"
20+
REMOVE=$([ "${GITHUB_EVENT_NAME}" == "delete" ] && echo "1" || echo "0" )
21+
echo "REMOVE=${REMOVE}" >> "${GITHUB_ENV}"
22+
echo "TAG=${{ github.event.ref }}" >> "${GITHUB_ENV}"
23+
24+
- name: Repository Dispatch
25+
uses: peter-evans/repository-dispatch@v3
26+
with:
27+
token: ${{ secrets.RECEIVER_TOKEN }}
28+
repository: ${{ matrix.repo }}
29+
event-type: update_tag
30+
client-payload: |-
31+
{
32+
"remove": "${{ env.REMOVE }}",
33+
"tag": "${{ env.TAG }}"
34+
}

‎.github/workflows/mcstas-autobuild.yml‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ on:
33
schedule:
44
- cron: '50 23 * * *' # 23:50 every day
55

6+
push:
7+
tags:
8+
- 'v*'
9+
610
workflow_dispatch:
711
inputs:
812
manual-debugging:
@@ -76,7 +80,11 @@ jobs:
7680
set -u
7781
set -x
7882
cd McCode
79-
export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`
83+
# Check if this is a clear-cut release-tag build:
84+
export REV=`git tag --points-at HEAD`
85+
# Otherwise, pick latest and add _nightly
86+
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
87+
echo Building on $RUNNER_OS with version set to $REV
8088
if [ "$RUNNER_OS" == "macOS" ]; then ./buildscripts/build_macos_mcstas ${REV} && tar cfz mcstas-macOS-conda.tgz mcstas-macOS-arm64/ mcstas-macOS-x86_64/; fi;
8189
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_debs_mcstas ${REV} meta && mv dist mcstas-debian-x86_64 && tar cfz mcstas-debian-x86_64.tgz mcstas-debian-x86_64/; fi
8290
@@ -88,7 +96,11 @@ jobs:
8896
set -u
8997
set -x
9098
cd McCode
91-
export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`
99+
# Check if this is a clear-cut release-tag build:
100+
export REV=`git tag --points-at HEAD`
101+
# Otherwise, pick latest and add _nightly
102+
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
103+
echo Building on $RUNNER_OS with version set to $REV
92104
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_debs_mcstas_arm64 ${REV} meta && mv dist mcstas-debian-arm64 && tar cfz mcstas-debian-arm64.tgz mcstas-debian-arm64/; fi
93105
94106
- name: Cross-Build McStas for windows
@@ -99,7 +111,11 @@ jobs:
99111
set -u
100112
set -x
101113
cd McCode
102-
export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`
114+
# Check if this is a clear-cut release-tag build:
115+
export REV=`git tag --points-at HEAD`
116+
# Otherwise, pick latest and add _nightly
117+
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
118+
echo Cross-compiling for MinGW Windows on $RUNNER_OS with version set to $REV
103119
if [ "$RUNNER_OS" == "Linux" ]; then rm -rf dist; fi
104120
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_windows_mcstas ${REV} meta && mv dist mcstas-mingw64-Windows-x86_64; fi
105121
if [ "$RUNNER_OS" == "Linux" ]; then tar cfz mcstas-Windows-x86_64.tgz mcstas-mingw64-Windows-x86_64/; fi

‎.github/workflows/mcxtrace-autobuild.yml‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ on:
33
schedule:
44
- cron: '50 23 * * *' # 23:50 every day
55

6+
push:
7+
tags:
8+
- 'v*'
9+
610
workflow_dispatch:
711
inputs:
812
manual-debugging:
@@ -76,7 +80,11 @@ jobs:
7680
set -u
7781
set -x
7882
cd McCode
79-
export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`
83+
# Check if this is a clear-cut release-tag build:
84+
export REV=`git tag --points-at HEAD`
85+
# Otherwise, pick latest and add _nightly
86+
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
87+
echo Building on $RUNNER_OS with version set to $REV
8088
if [ "$RUNNER_OS" == "macOS" ]; then ./buildscripts/build_macos_mcxtrace ${REV} && tar cfz mcxtrace-macOS-conda.tgz mcxtrace-macOS-arm64/ mcxtrace-macOS-x86_64/; fi;
8189
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_debs_mcxtrace ${REV} meta && mv dist mcxtrace-debian-x86_64 && tar cfz mcxtrace-debian-x86_64.tgz mcxtrace-debian-x86_64/; fi
8290
@@ -88,7 +96,11 @@ jobs:
8896
set -u
8997
set -x
9098
cd McCode
91-
export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`
99+
# Check if this is a clear-cut release-tag build:
100+
export REV=`git tag --points-at HEAD`
101+
# Otherwise, pick latest and add _nightly
102+
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
103+
echo Building on $RUNNER_OS with version set to $REV
92104
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_debs_mcxtrace_arm64 ${REV} meta && mv dist mcxtrace-debian-arm64 && tar cfz mcxtrace-debian-arm64.tgz mcxtrace-debian-arm64/; fi
93105
94106
- name: Cross-Build McXtrace for windows
@@ -99,7 +111,11 @@ jobs:
99111
set -u
100112
set -x
101113
cd McCode
102-
export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`
114+
# Check if this is a clear-cut release-tag build:
115+
export REV=`git tag --points-at HEAD`
116+
# Otherwise, pick latest and add _nightly
117+
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
118+
echo Cross-compiling for MinGW Windows on $RUNNER_OS with version set to $REV
103119
if [ "$RUNNER_OS" == "Linux" ]; then rm -rf dist; fi
104120
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_windows_mcxtrace ${REV} meta && mv dist mcxtrace-mingw64-Windows-x86_64; fi
105121
if [ "$RUNNER_OS" == "Linux" ]; then tar cfz mcxtrace-Windows-x86_64.tgz mcxtrace-mingw64-Windows-x86_64/; fi

‎CHANGES_McStas‎

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,90 @@
5656
* Modified by: PW December 2024: version 3.5.16
5757
* Modified by: PW February 2025: version 3.5.24
5858
* Modified by: PW February 2025: version 3.5.24
59+
* Modified by: PW April 2025: version 3.5.27
60+
* Modified by: PW June 2025: version 3.5.32
5961
*
60-
* This file is part of McStas 3.5.27, released April 29th 2025.
62+
* This file is part of McStas 3.5.32, released April 29th 2025.
6163
* It gives a 'changes' list from the beginning of the project
6264
*
6365
*******************************************************************************/
66+
Changes in McStas/McXtrace 3.5.32, June 17th, 2025
67+
## What's Changed
68+
### Common changes to McStas and McXtrace
69+
* Deployment, platforms and CI
70+
* Important fix to ensure use of -c conda-forge -c nodefaults only by @willend in https://github.com/mccode-dev/McCode/pull/1976
71+
* MCPL is available for Windows on conda... by @willend in https://github.com/mccode-dev/McCode/pull/1978
72+
* Let "autobuild" CI scripts create arm64 debs for mccode.org by @willend in https://github.com/mccode-dev/McCode/pull/1981
73+
* 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
74+
* Partial workaround for openmpi v5 crashes on macOS by @willend in https://github.com/mccode-dev/McCode/pull/1996
75+
* Install mcpl via pip in nightlies by @willend in https://github.com/mccode-dev/McCode/pull/1997
76+
* Update mcstas-testsuite.yml by @willend in https://github.com/mccode-dev/McCode/pull/1998
77+
* Suffix details by @willend in https://github.com/mccode-dev/McCode/pull/1999
78+
* Tools:
79+
* mcgui/mxgui: show current instrument name in dialogues by @farhi in https://github.com/mccode-dev/McCode/pull/1989
80+
* VSCode McStas/McXtrace grammar extension
81+
* Update vs code extension by @Lomholy in https://github.com/mccode-dev/McCode/pull/1975
82+
* Small updates to editor, as well as updated installation information by @Lomholy in https://github.com/mccode-dev/McCode/pull/1977
83+
* LaTeX math (formulae etc) for mcdoc %Description headers by @willend in https://github.com/mccode-dev/McCode/pull/2054
84+
* Code generator/Grammar: McStas/McXtrace, c and .py code generators defined from common set of files in mccode/src
85+
* Unify grammar take2 by @willend in https://github.com/mccode-dev/McCode/pull/2008
86+
* Unify instr y c py: unify our code generators for C and Python by @farhi in https://github.com/mccode-dev/McCode/pull/2009
87+
* Grammar multiple comp copy extend by @farhi in https://github.com/mccode-dev/McCode/pull/2012 (-> `INHERIT`)
88+
* 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
89+
* FluoPowder in McXtrace
90+
* https://github.com/mccode-dev/McCode/blob/main/doc/GRAMMAR/ADR-records/ADR_20250612_INHERIT_COMP.md
91+
* Edits by @farhi and @willend in https://github.com/mccode-dev/McCode/pull/2062
92+
* 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
93+
* Put in place folder for grammar documentation by @willend in https://github.com/mccode-dev/McCode/pull/2070
94+
* The McStas/McXtrace code generators have a new commandline switch --version-num to print the version number only.
95+
96+
* New CLI default for mcstas / mcxtrace: --trace is on
97+
* 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
98+
* Libs and runtime
99+
* Add Open_File in header (used from e.g. PowderN) by @willend in https://github.com/mccode-dev/McCode/pull/2014
100+
* Wrap cabs in OpenACC settings by @willend in https://github.com/mccode-dev/McCode/pull/2016
101+
* Swap default trace behaviour to 'enabled' by @willend in https://github.com/mccode-dev/McCode/pull/2023
102+
* cif2hkl: update to solve F^2 for Xrays using latest CrysFML by @farhi in https://github.com/mccode-dev/McCode/pull/2021
103+
* Openacc minor rectifications by @willend in https://github.com/mccode-dev/McCode/pull/2027
104+
* Components
105+
* Sync MCPL components McStas <-> McXtrace for MCPL 2.2.0 support by @willend in https://github.com/mccode-dev/McCode/pull/2019
106+
* Update MCPL components for MCPL 2.2.0 features (including stat:sum). by @tkittel in https://github.com/mccode-dev/McCode/pull/2046
107+
108+
### McStas specific:
109+
* Source_custom
110+
* Fixed minor typo in docs by @pablogila in https://github.com/mccode-dev/McCode/pull/1980
111+
* Fixed pulse normalisation for all values of n by @pablogila in https://github.com/mccode-dev/McCode/pull/2024
112+
* Simplified redundant code for the peak integral calculation by @pablogila in https://github.com/mccode-dev/McCode/pull/2025
113+
* Single_crystal: comments by @tweber-ill in https://github.com/mccode-dev/McCode/pull/1991
114+
* Resolution sample/monitor
115+
* Reso: Updates by @tweber-ill in https://github.com/mccode-dev/McCode/pull/1992
116+
* Add infrastructure to save calculated resolution/covariance matrices … by @willend in https://github.com/mccode-dev/McCode/pull/1993
117+
* Sync Res_monitor <-> TOFRes_monitor by @willend in https://github.com/mccode-dev/McCode/pull/1995
118+
* Add mcresplot to debian metapackage by @willend in https://github.com/mccode-dev/McCode/pull/2022
119+
* Monitor_nD pixel id and buffer fix by @mads-bertelsen in https://github.com/mccode-dev/McCode/pull/2002
120+
* Add mcresplot to debian metapackage by @willend in https://github.com/mccode-dev/McCode/pull/2022
121+
* Add exit attenuation to Incoherent.comp for finite order scattering by @Lomholy in https://github.com/mccode-dev/McCode/pull/2042
122+
* 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
123+
124+
### McXtrace specific:
125+
* McXtrace fluorescence:
126+
* McXtrace: fix header doc in fluo sample (powder and SX) by @farhi in https://github.com/mccode-dev/McCode/pull/1974
127+
* McXtrace fluo fix pow 0 by @farhi in https://github.com/mccode-dev/McCode/pull/1979
128+
* McXtrace fluo fix 2 by @farhi in https://github.com/mccode-dev/McCode/pull/1988
129+
* McXtrace fluo fix : fix in powder select - use gaussian line shape by @farhi in https://github.com/mccode-dev/McCode/pull/1994
130+
* McXtrace: samples: fluo: add M-lines via XrayLib Kissel CSb calls by @farhi in https://github.com/mccode-dev/McCode/pull/2004
131+
* McXtrace: samples: fluo: fix again the Fluo share by @farhi in https://github.com/mccode-dev/McCode/pull/2005
132+
* McXtrace add fluo mcdisplay by @farhi in https://github.com/mccode-dev/McCode/pull/2015
133+
* McXtrace fluo add detector 0 by @farhi in https://github.com/mccode-dev/McCode/pull/2029
134+
* Fix compilation of McXtrace Test_PowderN instr by @willend in https://github.com/mccode-dev/McCode/pull/2000
135+
* McXtrace various example instrument updates by @farhi in
136+
* 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
137+
* cif2hkl: update to solve F^2 for Xrays using latest CrysFML by @farhi in https://github.com/mccode-dev/McCode/pull/2021
138+
* McXtrace: add SWING BL at SOLEIL by @farhi in https://github.com/mccode-dev/McCode/pull/2036
139+
140+
**Full Changelog**: https://github.com/mccode-dev/McCode/compare/v3.5.27...v3.5.32
141+
142+
64143
Changes in McStas/McXtrace 3.5.27, April 29th, 2025
65144
## What's Changed
66145

0 commit comments

Comments
 (0)