Skip to content

Candidate fix for #2434#2447

Merged
willend merged 1 commit into
mccode-dev:mainfrom
willend:main
May 8, 2026
Merged

Candidate fix for #2434#2447
willend merged 1 commit into
mccode-dev:mainfrom
willend:main

Conversation

@willend
Copy link
Copy Markdown
Contributor

@willend willend commented May 7, 2026

Free-form text area

Please describe what your PR is adding in terms of features or bugfixes:

This PR includes a simple approach to fixing #2434 composed of 2 elements:

  1. Editing the ‘reserved’ geometry tokens in instrparser.py to include an mcdis prefix
  2. Editing mccode-r.c to patch the geometry printing routines to include this prefix

I have further removed unsused tokens from instrparser.py

———————

Development OS / boundary conditions

Please describe what OS you developed and tested your additions on, and if any special dependencies are required:

———————

PR Checklist for contributing to McStas/McXtrace

For a coherent and useful contribution to McStas/McXtrace, please fill in relevant parts of the checklist:

  • My contribution contains something else

    • Explanation is added in free form text above or below the checklist

———————

@willend
Copy link
Copy Markdown
Contributor Author

willend commented May 7, 2026

This instrument includes component names of box and sphere and parses/renders correctly
Screenshot 2026-05-07 at 22 20 31

@willend willend merged commit 518ed7f into mccode-dev:main May 8, 2026
14 checks passed
willend added a commit to willend/McCode that referenced this pull request May 8, 2026
willend added a commit to willend/McCode that referenced this pull request May 8, 2026
willend added a commit that referenced this pull request May 8, 2026
Consequence-edits after #2447, non mccodelib-parser mcdisplay tools
willend added a commit that referenced this pull request May 12, 2026
Repair of mcdisplay-backends post PR #2447 (for fix of #2434)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant