DM-27168: Phase out use of FilterProperty #326
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
kfindeisen
requested changes
Nov 10, 2020
Comment on lines
-141
to
-153
| # This can fail if the filter is no longer available in the | ||
| # Singleton | ||
| try: | ||
| filterProperty = inMemoryDataset.getFilterProperty() | ||
| except LookupError: | ||
| pass | ||
| else: | ||
| properties = {} | ||
| properties["lambdaEff"] = filterProperty.getLambdaEff() | ||
| properties["lambdaMax"] = filterProperty.getLambdaMax() | ||
| properties["lambdaMin"] = filterProperty.getLambdaMin() | ||
| filter["properties"] = properties | ||
|
|
There was a problem hiding this comment.
I don't think it's safe to remove this code yet. If somebody does still need FilterProperty (e.g., third-party code), this change to the persistence format will break things.
There was a problem hiding this comment.
I think this can be removed. I only use canonicalName from the YAML on read. It was in the YAML file as a record of what the state of the singleton was when it was written out but it's not used anywhere.
tests/test_filters.py
Outdated
Comment on lines
40
to
44
| self.assertEqual(lsst.afw.image.Filter('abc').getFilterProperty().getLambdaEff(), 123) | ||
| self.assertEqual(lsst.afw.image.Filter('def').getFilterProperty().getLambdaEff(), 456) | ||
| self.filters1.defineFilters() # this should not change anything | ||
| self.assertEqual(lsst.afw.image.Filter('abc').getFilterProperty().getLambdaEff(), 123) | ||
| self.assertEqual(lsst.afw.image.Filter('def').getFilterProperty().getLambdaEff(), 456) |
There was a problem hiding this comment.
I think this test should stay for as long as FilterDefinition contains filter wavelengths (i.e., until DM-27177). Same with the two tests below.
czwa
force-pushed
the
tickets/DM-27168
branch
from
5d245ad
to
ccfea89
Compare
kfindeisen
approved these changes
Nov 12, 2020
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.
End usage of FilterProperty, as per RFC-730.