Skip to content

Commit

Permalink
Change \ to @ in Doxygen commands
Browse files Browse the repository at this point in the history
in order to avoid Python warnings about unknown escape sequences
  • Loading branch information
r-owen committed May 11, 2018
1 parent 3357b1f commit 06c58ec
Show file tree
Hide file tree
Showing 8 changed files with 685 additions and 685 deletions.
408 changes: 204 additions & 204 deletions python/lsst/pipe/tasks/assembleCoadd.py

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions python/lsst/pipe/tasks/coaddBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
class CoaddBaseConfig(pexConfig.Config):
"""!Configuration parameters for CoaddBaseTask
\anchor CoaddBaseConfig_
@anchor CoaddBaseConfig_
\brief Configuration parameters shared between MakeCoaddTempExp and AssembleCoadd
@brief Configuration parameters shared between MakeCoaddTempExp and AssembleCoadd
"""
coaddName = pexConfig.Field(
doc="Coadd name: typically one of deep or goodSeeing.",
Expand Down Expand Up @@ -106,17 +106,17 @@ def __init__(self, *args, **kwargs):

def selectExposures(self, patchRef, skyInfo=None, selectDataList=[]):
"""!
\brief Select exposures to coadd
@brief Select exposures to coadd
Get the corners of the bbox supplied in skyInfo using \ref afwGeom.Box2D and convert the pixel
positions of the bbox corners to sky coordinates using \ref skyInfo.wcs.pixelToSky. Use the
\ref WcsSelectImagesTask_ "WcsSelectImagesTask" to select exposures that lie inside the patch
Get the corners of the bbox supplied in skyInfo using @ref afwGeom.Box2D and convert the pixel
positions of the bbox corners to sky coordinates using @ref skyInfo.wcs.pixelToSky. Use the
@ref WcsSelectImagesTask_ "WcsSelectImagesTask" to select exposures that lie inside the patch
indicated by the dataRef.
\param[in] patchRef data reference for sky map patch. Must include keys "tract", "patch",
@param[in] patchRef data reference for sky map patch. Must include keys "tract", "patch",
plus the camera-specific filter key (e.g. "filter" or "band")
\param[in] skyInfo geometry for the patch; output from getSkyInfo
\return a list of science exposures to coadd, as butler data references
@param[in] skyInfo geometry for the patch; output from getSkyInfo
@return a list of science exposures to coadd, as butler data references
"""
if skyInfo is None:
skyInfo = self.getSkyInfo(patchRef)
Expand All @@ -126,12 +126,12 @@ def selectExposures(self, patchRef, skyInfo=None, selectDataList=[]):

def getSkyInfo(self, patchRef):
"""!
\brief Use \ref getSkyinfo to return the skyMap, tract and patch information, wcs and the outer bbox
@brief Use @ref getSkyinfo to return the skyMap, tract and patch information, wcs and the outer bbox
of the patch.
\param[in] patchRef data reference for sky map. Must include keys "tract" and "patch"
@param[in] patchRef data reference for sky map. Must include keys "tract" and "patch"
\return pipe_base Struct containing:
@return pipe_base Struct containing:
- skyMap: sky map
- tractInfo: information for chosen tract of sky map
- patchInfo: information about chosen patch of tract
Expand Down Expand Up @@ -220,14 +220,14 @@ def _getMetadataName(self):

def getBadPixelMask(self):
"""!
\brief Convenience method to provide the bitmask from the mask plane names
@brief Convenience method to provide the bitmask from the mask plane names
"""
return afwImage.Mask.getPlaneBitMask(self.config.badMaskPlanes)


class SelectDataIdContainer(pipeBase.DataIdContainer):
"""!
\brief A dataId container for inputs to be selected.
@brief A dataId container for inputs to be selected.
Read the header (including the size and Wcs) for all specified
inputs and pass those along, ultimately for the SelectImagesTask.
Expand All @@ -252,12 +252,12 @@ def makeDataRefList(self, namespace):

def getSkyInfo(coaddName, patchRef):
"""!
\brief Return the SkyMap, tract and patch information, wcs, and outer bbox of the patch to be coadded.
@brief Return the SkyMap, tract and patch information, wcs, and outer bbox of the patch to be coadded.
\param[in] coaddName coadd name; typically one of deep or goodSeeing
\param[in] patchRef data reference for sky map. Must include keys "tract" and "patch"
@param[in] coaddName coadd name; typically one of deep or goodSeeing
@param[in] patchRef data reference for sky map. Must include keys "tract" and "patch"
\return pipe_base Struct containing:
@return pipe_base Struct containing:
- skyMap: sky map
- tractInfo: information for chosen tract of sky map
- patchInfo: information about chosen patch of tract
Expand All @@ -283,7 +283,7 @@ def getSkyInfo(coaddName, patchRef):

def scaleVariance(maskedImage, maskPlanes, log=None):
"""!
\brief Scale the variance in a maskedImage
@brief Scale the variance in a maskedImage
The variance plane in a convolved or warped image (or a coadd derived
from warped images) does not accurately reflect the noise properties of
Expand All @@ -292,7 +292,7 @@ def scaleVariance(maskedImage, maskPlanes, log=None):
the observed variance in the image. This is not perfect (because we're
not tracking the covariance) but it's simple and is often good enough.
\deprecated Use the ScaleVarianceTask instead.
@deprecated Use the ScaleVarianceTask instead.
@param maskedImage MaskedImage to operate on; variance will be scaled
@param maskPlanes List of mask planes for pixels to reject
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/ingest.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ def isBadId(self, info, badIdList):
def expandFiles(self, fileNameList):
"""!Expand a set of filenames and globs, returning a list of filenames
\param fileNameList A list of files and glob patterns
@param fileNameList A list of files and glob patterns
N.b. globs obey Posix semantics, so a pattern that matches nothing is returned unchanged
"""
Expand Down
12 changes: 6 additions & 6 deletions python/lsst/pipe/tasks/interpImage.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ class InterpImageTask(pipeBase.Task):
def _setFallbackValue(self, mi=None):
"""Set the edge fallbackValue for interpolation
\param[in] mi input maksedImage on which to calculate the statistics
@param[in] mi input maksedImage on which to calculate the statistics
Must be provided if fallbackValueType != "USER".
\return fallbackValue The value set/computed based on the fallbackValueType
@return fallbackValue The value set/computed based on the fallbackValueType
and negativeFallbackAllowed config parameters
"""
if self.config.fallbackValueType != 'USER':
Expand Down Expand Up @@ -126,13 +126,13 @@ def run(self, image, planeName=None, fwhmPixels=None, defects=None):
passed in by the caller, or the default defaultFwhm set in
measAlg.GaussianPsfFactory if None).
\param[in,out] image MaskedImage OR Exposure to be interpolated
\param[in] planeName name of mask plane over which to interpolate
@param[in,out] image MaskedImage OR Exposure to be interpolated
@param[in] planeName name of mask plane over which to interpolate
If None, must provide a defects list.
\param[in] fwhmPixels FWHM of core star (pixels)
@param[in] fwhmPixels FWHM of core star (pixels)
If None the default is used, where the default
is set to the exposure psf if available
\param[in] defects List of defects of type measAlg.DefectListT
@param[in] defects List of defects of type measAlg.DefectListT
over which to interpolate.
"""
try:
Expand Down
136 changes: 68 additions & 68 deletions python/lsst/pipe/tasks/measurePsf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,61 +45,61 @@ class MeasurePsfConfig(pexConfig.Config):
doc="Reserve sources from fitting"
)

## \addtogroup LSST_task_documentation
## \{
## \page MeasurePsfTask
## \ref MeasurePsfTask_ "MeasurePsfTask"
## \copybrief MeasurePsfTask
## \}
## @addtogroup LSST_task_documentation
## @{
## @page MeasurePsfTask
## @ref MeasurePsfTask_ "MeasurePsfTask"
## @copybrief MeasurePsfTask
## @}


class MeasurePsfTask(pipeBase.Task):
r"""!
\anchor MeasurePsfTask_
@anchor MeasurePsfTask_
\brief Measure the PSF
@brief Measure the PSF
\section pipe_tasks_measurePsf_Contents Contents
@section pipe_tasks_measurePsf_Contents Contents
- \ref pipe_tasks_measurePsf_Purpose
- \ref pipe_tasks_measurePsf_Initialize
- \ref pipe_tasks_measurePsf_IO
- \ref pipe_tasks_measurePsf_Config
- \ref pipe_tasks_measurePsf_Debug
- \ref pipe_tasks_measurePsf_Example
- @ref pipe_tasks_measurePsf_Purpose
- @ref pipe_tasks_measurePsf_Initialize
- @ref pipe_tasks_measurePsf_IO
- @ref pipe_tasks_measurePsf_Config
- @ref pipe_tasks_measurePsf_Debug
- @ref pipe_tasks_measurePsf_Example
\section pipe_tasks_measurePsf_Purpose Description
@section pipe_tasks_measurePsf_Purpose Description
A task that selects stars from a catalog of sources and uses those to measure the PSF.
The star selector is a subclass of
\ref lsst.meas.algorithms.starSelector.BaseStarSelectorTask "lsst.meas.algorithms.BaseStarSelectorTask"
@ref lsst.meas.algorithms.starSelector.BaseStarSelectorTask "lsst.meas.algorithms.BaseStarSelectorTask"
and the PSF determiner is a sublcass of
\ref lsst.meas.algorithms.psfDeterminer.BasePsfDeterminerTask "lsst.meas.algorithms.BasePsfDeterminerTask"
@ref lsst.meas.algorithms.psfDeterminer.BasePsfDeterminerTask "lsst.meas.algorithms.BasePsfDeterminerTask"
\warning
@warning
There is no establised set of configuration parameters for these algorithms, so once you start modifying
parameters (as we do in \ref pipe_tasks_measurePsf_Example) your code is no longer portable.
parameters (as we do in @ref pipe_tasks_measurePsf_Example) your code is no longer portable.
\section pipe_tasks_measurePsf_Initialize Task initialisation
@section pipe_tasks_measurePsf_Initialize Task initialisation
\copydoc \_\_init\_\_
@copydoc \_\_init\_\_
\section pipe_tasks_measurePsf_IO Invoking the Task
@section pipe_tasks_measurePsf_IO Invoking the Task
\copydoc run
@copydoc run
\section pipe_tasks_measurePsf_Config Configuration parameters
@section pipe_tasks_measurePsf_Config Configuration parameters
See \ref MeasurePsfConfig.
See @ref MeasurePsfConfig.
\section pipe_tasks_measurePsf_Debug Debug variables
@section pipe_tasks_measurePsf_Debug Debug variables
The \link lsst.pipe.base.cmdLineTask.CmdLineTask command line task\endlink interface supports a
flag \c -d to import \b debug.py from your \c PYTHONPATH; see \ref baseDebug for more about \b debug.py files.
The @link lsst.pipe.base.cmdLineTask.CmdLineTask command line task@endlink interface supports a
flag @c -d to import @b debug.py from your @c PYTHONPATH; see @ref baseDebug for more about @b debug.py files.
<DL>
<DT> \c display
<DT> @c display
<DD> If True, display debugging plots
<DT> displayExposure
<DD> display the Exposure + spatialCells
Expand All @@ -117,69 +117,69 @@ class MeasurePsfTask(pipeBase.Task):
Additionally you can enable any debug outputs that your chosen star selector and psf determiner support.
\section pipe_tasks_measurePsf_Example A complete example of using MeasurePsfTask
@section pipe_tasks_measurePsf_Example A complete example of using MeasurePsfTask
This code is in \link measurePsfTask.py\endlink in the examples directory, and can be run as \em e.g.
\code
This code is in @link measurePsfTask.py@endlink in the examples directory, and can be run as @em e.g.
@code
examples/measurePsfTask.py --ds9
\endcode
\dontinclude measurePsfTask.py
@endcode
@dontinclude measurePsfTask.py
The example also runs SourceDetectionTask and SourceMeasurementTask;
see \ref meas_algorithms_measurement_Example for more explanation.
see @ref meas_algorithms_measurement_Example for more explanation.
Import the tasks (there are some other standard imports; read the file to see them all):
\skip SourceDetectionTask
\until MeasurePsfTask
@skip SourceDetectionTask
@until MeasurePsfTask
We need to create the tasks before processing any data as the task constructor
can add an extra column to the schema, but first we need an almost-empty
Schema:
\skipline makeMinimalSchema
@skipline makeMinimalSchema
We can now call the constructors for the tasks we need to find and characterize candidate
PSF stars:
\skip SourceDetectionTask.ConfigClass
\until measureTask
@skip SourceDetectionTask.ConfigClass
@until measureTask
Note that we've chosen a minimal set of measurement plugins: we need the
outputs of \c base_SdssCentroid, \c base_SdssShape and \c base_CircularApertureFlux as
inputs to the PSF measurement algorithm, while \c base_PixelFlags identifies
outputs of @c base_SdssCentroid, @c base_SdssShape and @c base_CircularApertureFlux as
inputs to the PSF measurement algorithm, while @c base_PixelFlags identifies
and flags bad sources (e.g. with pixels too close to the edge) so they can be
removed later.
Now we can create and configure the task that we're interested in:
\skip MeasurePsfTask
\until measurePsfTask
@skip MeasurePsfTask
@until measurePsfTask
We're now ready to process the data (we could loop over multiple exposures/catalogues using the same
task objects). First create the output table:
\skipline afwTable
@skipline afwTable
And process the image:
\skip sources =
\until result
@skip sources =
@until result
We can then unpack and use the results:
\skip psf
\until cellSet
@skip psf
@until cellSet
If you specified \c --ds9 you can see the PSF candidates:
If you specified @c --ds9 you can see the PSF candidates:
\skip display
\until RED
@skip display
@until RED
<HR>
To investigate the \ref pipe_tasks_measurePsf_Debug, put something like
\code{.py}
To investigate the @ref pipe_tasks_measurePsf_Debug, put something like
@code{.py}
import lsstDebug
def DebugInfo(name):
di = lsstDebug.getInfo(name) # N.b. lsstDebug.Info(name) would call us recursively
Expand All @@ -196,22 +196,22 @@ def DebugInfo(name):
return di
lsstDebug.Info = DebugInfo
\endcode
into your debug.py file and run measurePsfTask.py with the \c --debug flag.
@endcode
into your debug.py file and run measurePsfTask.py with the @c --debug flag.
"""
ConfigClass = MeasurePsfConfig
_DefaultName = "measurePsf"

def __init__(self, schema=None, **kwargs):
"""!Create the detection task. Most arguments are simply passed onto pipe.base.Task.
\param schema An lsst::afw::table::Schema used to create the output lsst.afw.table.SourceCatalog
\param **kwargs Keyword arguments passed to lsst.pipe.base.task.Task.__init__.
@param schema An lsst::afw::table::Schema used to create the output lsst.afw.table.SourceCatalog
@param **kwargs Keyword arguments passed to lsst.pipe.base.task.Task.__init__.
If schema is not None, 'calib.psf.candidate' and 'calib.psf.used' fields will be added to
identify which stars were employed in the PSF estimation.
\note This task can add fields to the schema, so any code calling this task must ensure that
@note This task can add fields to the schema, so any code calling this task must ensure that
these fields are indeed present in the input table.
"""

Expand Down Expand Up @@ -240,19 +240,19 @@ def __init__(self, schema=None, **kwargs):
def run(self, exposure, sources, expId=0, matches=None):
"""!Measure the PSF
\param[in,out] exposure Exposure to process; measured PSF will be added.
\param[in,out] sources Measured sources on exposure; flag fields will be set marking
@param[in,out] exposure Exposure to process; measured PSF will be added.
@param[in,out] sources Measured sources on exposure; flag fields will be set marking
stars chosen by the star selector and the PSF determiner if a schema
was passed to the task constructor.
\param[in] expId Exposure id used for generating random seed.
\param[in] matches A list of lsst.afw.table.ReferenceMatch objects
(\em i.e. of lsst.afw.table.Match
with \c first being of type lsst.afw.table.SimpleRecord and \c second
@param[in] expId Exposure id used for generating random seed.
@param[in] matches A list of lsst.afw.table.ReferenceMatch objects
(@em i.e. of lsst.afw.table.Match
with @c first being of type lsst.afw.table.SimpleRecord and @c second
type lsst.afw.table.SourceRecord --- the reference object and detected
object respectively) as returned by \em e.g. the AstrometryTask.
object respectively) as returned by @em e.g. the AstrometryTask.
Used by star selectors that choose to refer to an external catalog.
\return a pipe.base.Struct with fields:
@return a pipe.base.Struct with fields:
- psf: The measured PSF (also set in the input exposure)
- cellSet: an lsst.afw.math.SpatialCellSet containing the PSF candidates
as returned by the psf determiner.
Expand Down

0 comments on commit 06c58ec

Please sign in to comment.