Skip to content

Commit

Permalink
Update references to lsst.verify.gen2compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
kfindeisen committed Jan 29, 2019
1 parent f96e121 commit 7999045
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion doc/lsst.ap.verify/command-line-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Required arguments are :option:`--dataset` and :option:`--output`.

**Input metrics config.**

A config file containing a `~lsst.verify.compatibility.MetricsControllerConfig`, which specifies which metrics are measured and sets any options.
A config file containing a `~lsst.verify.gen2compatibility.MetricsControllerConfig`, which specifies which metrics are measured and sets any options.
If this argument is omitted, :file:`config/default_metrics.py` will be used.

.. option:: --metrics-file <filename>
Expand Down
8 changes: 4 additions & 4 deletions python/lsst/ap/verify/measurements/compute_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import copy

from lsst.verify.compatibility import MetricsControllerTask
from lsst.verify.gen2compatibility import MetricsControllerTask
from lsst.ap.pipe import ApPipeTask
from .association import measureNumberNewDiaObjects, \
measureNumberUnassociatedDiaObjects, \
Expand Down Expand Up @@ -77,7 +77,7 @@ def measureFromButlerRepo(metricsConfig, butler, rawDataId):
Parameters
----------
metricsConfig : `str`
A file containing a `~lsst.verify.compatibility.MetricsControllerConfig`.
A file containing a `~lsst.verify.gen2compatibility.MetricsControllerConfig`.
butler : `lsst.daf.persistence.Butler`
A butler opened to the repository to read.
rawDataId : `lsst.daf.persistence.DataId` or `dict`
Expand Down Expand Up @@ -123,8 +123,8 @@ def _runMetricTasks(config, butler, dataId):
Parameters
----------
config : `lsst.verify.compatibility.MetricsControllerConfig`
The config for running `~lsst.verify.compatibility.MetricsControllerTask`.
config : `lsst.verify.gen2compatibility.MetricsControllerConfig`
The config for running `~lsst.verify.gen2compatibility.MetricsControllerTask`.
butler : `lsst.daf.persistence.Butler`
A butler opened to ap_verify's output repository.
dataId : `lsst.daf.persistence.DataId` or `dict`
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/ap/verify/measurements/profiling.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import lsst.pex.config as pexConfig
from lsst.pipe.base import Struct, InputDatasetField
from lsst.verify import Measurement, Name, MetricComputationError
from lsst.verify.compatibility import registerMultiple, MetricTask
from lsst.verify.gen2compatibility import registerMultiple, MetricTask


def measureRuntime(metadata, taskName, metricName):
Expand Down Expand Up @@ -106,7 +106,7 @@ class TimingMetricTask(MetricTask):
args
kwargs
Constructor parameters are the same as for
`lsst.verify.compatibility.MetricTask`.
`lsst.verify.gen2compatibility.MetricTask`.
"""

ConfigClass = TimingMetricConfig
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ap/verify/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
``ap_verify`` module or in the appropriate pipeline step, as appropriate.
"""

# TODO: module deprecated by lsst.verify.compatibility.MetricsControllerTask, remove after DM-16536
# TODO: module deprecated by lsst.verify.gen2compatibility.MetricsControllerTask, remove after DM-16536
__all__ = ["AutoJob", "MetricsParser", "checkSquashReady"]

import argparse
Expand Down
2 changes: 1 addition & 1 deletion tests/test_profiling.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import lsst.afw.image as afwImage
from lsst.ip.isr import FringeTask
from lsst.verify import Measurement, Name, MetricComputationError
from lsst.verify.compatibility.testUtils import MetricTaskTestCase
from lsst.verify.gen2compatibility.testUtils import MetricTaskTestCase

from lsst.ap.verify.measurements.profiling import measureRuntime, TimingMetricTask

Expand Down

0 comments on commit 7999045

Please sign in to comment.