Tickets/dm 1218 #8
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
This guarantees that BasePlugin instances have the attributes set there without having to assume anything about their subclasses.
| @@ -106,7 +107,7 @@ def run(display=False): | |||
| xy = s.getCentroid() | |||
| ds9.dot('+', *xy, ctype=ds9.CYAN if s.get("flags_negative") else ds9.GREEN, frame=frame) | |||
| ds9.dot(s.getShape(), *xy, ctype=ds9.RED, frame=frame) | |||
| ds9.dot('o', *xy, size=config.plugins["base_SincFlux"].radius2, ctype=ds9.YELLOW, frame=frame) | |||
| ds9.dot('o', *xy, size=config.plugins["base_CircularApertureFlux"].radii[0], ctype=ds9.YELLOW, frame=frame) | |||
There was a problem hiding this comment.
This line is too long per the coding standards.
This removes some code duplication at the expense of a bit of opaque argument-forwarding. It'll become more important shortly, as the now-shared code is about to grow.
This changes aperture flux outputs to look more like an array-of-structs rather than a struct of array, e.g. "base_CircularApertureFlux_[0,1,2]_flux" instead of "base_CircularApertureFlux_flux_[0,1,2]". This makes it its field suffixes compatible with the slot mechanism.
Now that it can participate in slots, CircularApertureFlux can do everything NaiveFlux and SincFlux once did, so there's no need for all that code duplication and boilerplate.
A "using" declaration to un-shadow the multiple overloads of measure() doesn't appear to work with Swig, so we move those methods to protected to make Swig continue to call throught the base class interface, which works fine.
mjuric
force-pushed
the
tickets/DM-1218
branch
from
13e2f8c
to
9dd3f51
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.