Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-4692: Refactor ProcessCcdTask and sub-tasks #7

Merged
merged 3 commits into from
Mar 8, 2016
Merged

DM-4692: Refactor ProcessCcdTask and sub-tasks #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcae528
Added _build* and doc/xml to .gitignore
r-owen Jan 23, 2016
a48a972
Standardized DiaCatalogSourceSelector
r-owen Jan 23, 2016
01d4c0b
Added usesMatches class variable to DiaCatalogSourceSelector
r-owen Jan 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
_build*
*.dylib
.sconsign.dblite
config.log
Expand All @@ -14,6 +15,7 @@ doc/html
doc/*.tag
doc/*.inc
doc/doxygen.conf
doc/xml
tests/.tests
version.py
examples/maskedKernel
Expand Down
19 changes: 8 additions & 11 deletions python/lsst/ip/diffim/diaCatalogSourceSelector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def __call__(self, source):

class DiaCatalogSourceSelector(object):
ConfigClass = DiaCatalogSourceSelectorConfig
usesMatches = True # selectStars uses (requires) its matches argument
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two spaces before hash.


def __init__(self, config=None):
"""Construct a source selector that uses a reference catalog
Expand All @@ -104,27 +105,23 @@ def __init__(self, config=None):
self.log = pexLog.Log(pexLog.Log.getDefaultLog(),
'lsst.ip.diffim.DiaCatalogSourceSelector', pexLog.Log.INFO)

def selectSources(self, exposure, sources, matches=None):
def selectSources(self, exposure, sourceCat, matches=None):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is unnecessary and just generates churn.

"""Return a list of Sources for Kernel candidates

@param[in] exposure: the exposure containing the sources
@param[in] sources: a source list containing sources that may be candidates
@param[in] matches: a match vector as produced by meas_astrom; not optional
(passing None just allows us to handle the exception better here
than in calling code)
@param[in] exposure the exposure containing the sources
@param[in] sourceCat catalog of sources that may be stars (an lsst.afw.table.SourceCatalog)
@param[in] matches a match vector as produced by meas_astrom; required
(defaults to None to match the StarSelector API and improve error handling)

@return kernelCandidateSourceList: a list of sources to be used as kernel candidates

"""
import lsstDebug
display = lsstDebug.Info(__name__).display
displayExposure = lsstDebug.Info(__name__).displayExposure
pauseAtEnd = lsstDebug.Info(__name__).pauseAtEnd

if matches is None:
raise RuntimeError(
"Cannot use catalog source selector without running astrometry."
)
raise RuntimeError("DiaCatalogSourceSelector requires matches")

mi = exposure.getMaskedImage()

Expand All @@ -134,7 +131,7 @@ def selectSources(self, exposure, sources, matches=None):
#
# Look for flags in each Source
#
isGoodSource = CheckSource(sources, self.config.fluxLim, self.config.fluxMax, self.config.badPixelFlags)
isGoodSource = CheckSource(sourceCat, self.config.fluxLim, self.config.fluxMax, self.config.badPixelFlags)

#
# Go through and find all the acceptable candidates in the catalogue
Expand Down