Tickets/DM-6824: Use meas.algorithms.astrometrySourceSelector in measOptimisticB #49
Conversation
| @@ -3,25 +3,20 @@ | |||
| from builtins import object | |||
| import math | |||
|
|
|||
| import numpy as np | |||
|
|
|||
| import lsst.afw.table as afwTable | |||
There was a problem hiding this comment.
Rerun your linter: looks like you no longer need the object or afwTable imports here.
There was a problem hiding this comment.
I guess it still helps to run a linter rather then just relying on the highlighting in sublimetxt. It helps to pay attention huh?
There was a problem hiding this comment.
Sublimetext is what caught it for me. I don't like committing a file with any warning dots at all. You're using SublimeLinter+flake8?
| ) | ||
|
|
||
|
|
There was a problem hiding this comment.
Ah the joy of deleting large blocks of code!
There was a problem hiding this comment.
A yep. I noticed a missing double space in front of the main class so I have added that.
| verbose=debug.verbose, | ||
| ) | ||
|
|
||
| # cull non-good sources | ||
| matches = [] | ||
| # This is a hard coded version of the isGood flag from the old SourceInfo class that used to be | ||
| # part of this class. This is done current as the API for sourceSelector does not currently |
There was a problem hiding this comment.
This block should be lifted into a separate function, to make it easier to replace in the future.
There was a problem hiding this comment.
Added. I also moved this comment into the function.
There was a problem hiding this comment.
Also added another function for loading the schema keys since it wouldn't make sense to put it in the loop to test the isGood flag.
| self.astrom = AstrometryTask(config=astrometryConfig, refObjLoader=refObjLoader) | ||
| self.astrom.log.setLevel(logLevel) | ||
| # Since our sourceSelector is a registry object we have to wait for it to be created |
|
Just pushed new version of matchOptimisticB.py with suggested changes. Adds two new functions for loading the source catalog schema and preforming the isGood test. Also removed afwTable from the imports and cleaned up some lint problems. |
| self.saturatedKey = schema["base_PixelFlags_flag_saturated"].asKey() | ||
|
|
||
| def _isGoodTest(self, source): | ||
| # This is a hard coded version of the isGood flag from the old SourceInfo class that used to be |
There was a problem hiding this comment.
This should be a docstring, not comment.
There was a problem hiding this comment.
I've changed this text to a docstring. We can discuss what changes we can make to BaseSourceSelector to make it play nice with match-lists and other "catalog like" objects next week if you would like.
matchOptimisticBTask now uses sourceSelectors from meas_algorithms instead of the SourceInfo class.
morriscb
force-pushed
the
tickets/DM-6824
branch
from
c8631e1
to
52730fd
Compare
morriscb
changed the title
Replaced SourceInfo in matchOptimisticB.py with a new sourceSelector object from meas_algorithms.