update model macro definitions for compiled code #1676
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #1676 +/- ##
==========================================
+ Coverage 79.70% 80.39% +0.69%
==========================================
Files 72 72
Lines 27159 27162 +3
Branches 4588 4588
==========================================
+ Hits 21646 21837 +191
+ Misses 5315 5133 -182
+ Partials 198 192 -6
Continue to review full report at Codecov.
|
DougBurke
changed the title
DougBurke
force-pushed
the
xspec-pre-cleanup
branch
from
d5e26c9
to
8ea0057
Compare
This was referenced Jan 18, 2023
A way of indicating a Python function that uses kwargs has been added to the top-level extension header (KWSEPC). This is then used in the generic model-extension header, replacing the MODSPEC definition. The more-interesting change is in the XSPEC extension header, where again we replace the local MODSPEC definitions a) re-order them by languange support (FORTRAN then C/C++) rather than the somewhat random order before (this is mainly a code style issue) b) remove the table-model specific definitions as they are only used in one place (_xspec.cc) and we can just avoid a lot of complexity in the macro by hard-coding the logic. This will also make removing the pre XSPEC 12.10.1-specific code easier when we get to that PR. (this is the more interesting reason) In a future PR I will update the XSPEC defines from using FCTSPEC to KWSPEC, but that is left for later.
DougBurke
force-pushed
the
xspec-pre-cleanup
branch
from
8ea0057
to
5c98977
Compare
Marie-Terrell
approved these changes
Feb 9, 2023
wmclaugh
approved these changes
Feb 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Re-work the macro definitions used to build the compiled models and use this to clean up the handling of the XSPEC models, in particular table models. There is no functional change.
Details
Note, I have now made this PR depend on #1681 as there are some urgent test updates needed there. This has now been merged, which simplifies this PR.
PR chains that will depend on this:
I have a lot of XSPEC follow-up code and I am trying to break things up so that they are
The change to the include files for the model macros is one of the latter.