Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Refactor] finish switch to real McCode sources #46

Merged
merged 4 commits into from
Apr 12, 2024
Merged

[Refactor] finish switch to real McCode sources #46

merged 4 commits into from
Apr 12, 2024

Conversation

g5t
Copy link
Collaborator

@g5t g5t commented Apr 12, 2024

  • By implementing CMake-like configure_file support for replacing @MCCODE_*@ strings by newly-added configuration keys the remaining dependency on the pre-configured mccode-r.h, mcstas-d.h, and mcxtrace-d.h has been removed.
  • The GitHub based registry files are still outside of the main McCode repository, but they are updated automatically nightly. In the future they may be updated by changes in the McCode repository.
  • Merging this should finally fix This Python module should use the main McStas & McXtrace runtime and component files #30

g5t added 4 commits April 12, 2024 16:45
- By implementing CMake-like configure_file support for replacing
  @MCCODE_*@ strings by newly-added configuration keys the remaining
  dependency on the pre-configured mccode-r.h, mcstas-d.h, and
  mcxtrace-d.h has been removed.
- The GitHub based registry files are still outside of the main McCode
  repository, but they are updated automatically nightly.
  In the future they may be updated by changes in the McCode repository.
@g5t
Copy link
Collaborator Author

g5t commented Apr 12, 2024

One reason to use the upstream sources:
I changed the return type of _getcomp_index from int to long at some point, probably because the index of a component is long valued.
That change was not propagated back to the main repository, so tests here fail when the 'real' sources are used.

@willend Can you confirm whether the component index property is long valued? And, assuming it is, would you accept a PR to change the _getcomp_index return from int to long?

@g5t
Copy link
Collaborator Author

g5t commented Apr 12, 2024

@g5t
Copy link
Collaborator Author

g5t commented Apr 12, 2024

McCode #1597 should track resolution of the type discrepancy. The last commit here may need to be undone as a result.

@g5t g5t merged commit 132fb4f into main Apr 12, 2024
11 checks passed
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.

This Python module should use the main McStas & McXtrace runtime and component files
1 participant