Use paramio to access parameter information #815
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
We can now access all the parameter information we need with paramio (even if a bit messy), so switch to that rather than manually parsing the parameter files. The results aren't identical, but should be "semantically" - e.g. numeric values are not guaranteed to have the same textual form but should have the samve value (e.g. 0.5e-4 vs 5e-5 and 1.0 vs 1).
These changes **shold only** be textual and not provide a semantic difference (e.g. 1.0 vs 1), but we need to check this assumption out.
DougBurke
commented
Oct 13, 2023
| @@ -2760,7 +2760,7 @@ def make_tool(toolname): | |||
|
|
|||
| parinfo['csmooth'] = { | |||
| 'istool': True, | |||
| 'req': [ParValue("infile","f","input file name",None),ParValue("sclmap","f","image of user-supplied map of smoothing scales",None),ParValue("outfile","f","output file name",None),ParValue("outsigfile","f","output significance image",'.'),ParValue("outsclfile","f","output scales [kernel sizes] image",'.'),ParSet("conmeth","s","Convolution method.",'fft',["slide","fft"]),ParSet("conkerneltype","s","Convolution kernel type.",'gauss',["gauss","tophat"]),ParValue("sigmin","r","minimal significance, S/N ratio",4),ParRange("sigmax","r","maximal significance, S/N ratio",5,")sigmin",None),ParValue("sclmin","r","initial (minimal) smoothing scale [pixel]",None),ParRange("sclmax","r","maximal smoothing scale [pixel]",None,")sclmin",None),ParSet("sclmode","s","compute smoothing scales or user user-supplied map",'compute',["compute","user"])], | |||
| 'req': [ParValue("infile","f","input file name",None),ParValue("sclmap","f","image of user-supplied map of smoothing scales",None),ParValue("outfile","f","output file name",None),ParValue("outsigfile","f","output significance image",'.'),ParValue("outsclfile","f","output scales [kernel sizes] image",'.'),ParSet("conmeth","s","Convolution method.",'fft',["slide","fft"]),ParSet("conkerneltype","s","Convolution kernel type.",'gauss',["gauss","tophat"]),ParValue("sigmin","r","minimal significance, S/N ratio",4),ParRange("sigmax","r","maximal significance, S/N ratio",5,4,None),ParValue("sclmin","r","initial (minimal) smoothing scale [pixel]",None),ParRange("sclmax","r","maximal smoothing scale [pixel]",None,"INDEF",None),ParSet("sclmode","s","compute smoothing scales or user user-supplied map",'compute',["compute","user"])], | |||
There was a problem hiding this comment.
OOh. This one is an interesting change (thanks to the GH view it makes it more obvious what has changed). So sigmax.p_min returns the actual value (after following through the parameter redirection).
Hmmmm.
Merged
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.
Fix #780
Unfortunately
paramiois a bit-too chatty when it hits an error (like a parameter not having a min, max, or prompt value), and this is handled at the C layer which meanscontextlib.redirect_stderrcan not be used. I forget now how to manually change the stderr channel in such a way to get this to work, so we are stuck with./mk_runtool.pygenerating a lot of messages likeand so hiding any useful information.
I claim that the
runtoolmodule this creates is semantically the same as the previous version, but there are textual differences for the floating point values - in particular the minimum and maximum ranges. You see changes like1.0->1and0.5e-4->5e-5.