Tickets/dm 2961 - psfex port #1
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
Changed <foo>Exception to <foo>Error
The code is now using gsl solvers in the psf package
This interferes with a variable defined in a proper name space afw::table
psfex.Context variables must be explicitly be cast to a bool from an int (0,1). This is most likely due to a new version of swig with more explicit requirements. Removed the afwCG cast, as this is no longer present in the lsst code base, all calls to getDetector now return the proper type
Previously values->getAsString would return a std::string variable, and c_str a pointer to that variable, which would get assigned to argval. The string object had no guaranteed lifetime in this context. GCC was keeping the string in some kind of buffer so the error was not being caught. Clang was reusing the memory location so argval[0] was changed to the value of varval[1] when the loop continued. This fix insures the strings have a lifetime long enough that psf-readprefs can copy them into its memory.
Updated the unit test to use a larger radius. Cleaned up unneeded code inherited from HSC
Updated the table file to reflect the code that was moved from meas_algorithms to meas_base
| } | ||
| install(){ | ||
| scons opt=3 install prefix=$PREFIX version=$VERSION | ||
| } |
There was a problem hiding this comment.
These shouldn't be necessary -- you should be able to completely remove the eupspkg.cfg.sh file; eupspkg already knows how to build LSST packages that use scons.
There was a problem hiding this comment.
Removed. I figured out it would not be necessary after the fact of creating it, but just had not gone back and removed it. I was playing around with different opt levels and debug for a while.
| @@ -256,7 +256,8 @@ def determinePsf(self, exposure, psfCandidateList, metadata=None, flagKey=None): | |||
|
|
|||
| context = psfex.Context(prefs.getContextName(), prefs.getContextGroup(), | |||
| prefs.getGroupDeg(), | |||
| psfex.Context.REMOVEHIDDEN if False else psfex.Context.KEEPHIDDEN) | |||
| bool(psfex.Context.REMOVEHIDDEN if False | |||
| else psfex.Context.KEEPHIDDEN)) | |||
There was a problem hiding this comment.
Two comments:
- I think the original was more readable (when everything was on a single line). It's good practice to keep the ternary operator
ifalways all on one line; use a regularifif it can't fit. - Is this a manual debugging switch (
if Falsewill always eval to False, of course)?
Because the lifetime of an object must be ensured, store it in a vector. Added comments to this effect
There is now not a separate float library export, both single and double precision are exported via fifth
natelust
force-pushed
the
tickets/DM-2961
branch
from
6af2aef
to
6ff9fc8
Compare
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.
No description provided.