Remove measurements from dataset_config.yaml.

config/dataset_config.yaml

@@ -2,18 +2,4 @@
 datasets:
     HiTS2015: ap_verify_hits2015
     CI-HiTS2015: ap_verify_ci_hits2015
-measurements:
-    timing:
-        apPipe: ap_pipe.ApPipeTime
-        apPipe:ccdProcessor: pipe_tasks.ProcessCcdTime
-        apPipe:ccdProcessor:isr: ip_isr.IsrTime
-        apPipe:ccdProcessor:charImage: pipe_tasks.CharacterizeImageTime
-        apPipe:ccdProcessor:calibrate: pipe_tasks.CalibrateTime
-        apPipe:differencer: pipe_tasks.ImageDifferenceTime
-        apPipe:differencer:astrometer: meas_astrom.AstrometryTime
-        apPipe:differencer:register: pipe_tasks.RegisterImageTime
-        apPipe:differencer:subtract: ip_diffim.ImagePsfMatchTime
-        apPipe:differencer:detection: meas_algorithms.SourceDetectionTime
-        apPipe:differencer:measurement: ip_diffim.DipoleFitTime
-        apPipe:associator: ap_association.AssociationTime
 ...

doc/lsst.ap.verify/configuration.rst

@@ -9,8 +9,6 @@ ap_verify configuration file reference
 This page describes the file-based configuration options used by ``ap_verify``.
 Most users should not need to adjust these settings, but they allow capabilities such as registering new :doc:`datasets<datasets>`.
 
-.. TODO: more generic name? or split up file? (DM-12850)
-
 The ``ap_verify`` configuration file is located at :file:`config/dataset_config.yaml`.
 It consists of a list of dictionaries, each representing specific aspects of the program.
 
@@ -22,22 +20,3 @@ datasets
 The ``datasets`` dictionary maps dataset names (which must be provided on the :command:`ap_verify.py` command line) to GitHub repository names.
 Adding a dataset to the config is necessary for ``ap_verify`` to recognize it; in practice, the entry will be made once by the dataset author and then committed.
 A dataset must still be :doc:`installed<datasets-install>` on the machine before it can be used.
-
-.. _ap-verify-configuration-measurements:
-
-measurements
-============
-
-.. warning::
-
-   The metrics being used by ``ap_verify`` are still being defined.
-   The syntax used to register them will likely change, and may be moved to a dedicated package entirely.
-   This section of the configuration file should be treated as preliminary and subject to change.
-
-The ``measurements`` dictionary contains sub-dictionaries for each kind of metric.
-Currently there is only one:
-
-``timing``
-    A dictionary from tasks to the metrics that time them.
-    Subtasks must be identified by the name the parent task assigns them, and should be prefixed by the parent task name (as in "imageDifference:detection") to avoid ambiguity.
-    Metrics must use the full name following the convention of `lsst.verify.metrics`, as in "meas_algorithms.SourceDetectionTime".

python/lsst/ap/verify/config.py

@@ -54,16 +54,6 @@ def _validate(self):
         except (KeyError, TypeError) as e:
             raise RuntimeError('Invalid config file.') from e
 
-        try:
-            measurementMap = self._allInfo['measurements']
-            if not isinstance(measurementMap, Policy):
-                raise TypeError('`measurements` is not a dictionary')
-            timingMap = measurementMap['timing']
-            if not isinstance(timingMap, Policy):
-                raise TypeError('`measurements.timing` is not a dictionary')
-        except (KeyError, TypeError) as e:
-            raise RuntimeError('Invalid config file.') from e
-
     def __getitem__(self, key):
         return self._allInfo[key]
 

python/lsst/ap/verify/measurements/compute_metrics.py

@@ -44,9 +44,6 @@
 def measureFromMetadata(metadata):
     """Compute all known metrics on Task metadata.
 
-    Metrics and measurement information are registered in the ``ap_verify``
-    configuration file under the ``measurements`` label.
-
     Parameters
     ----------
     metadata : `lsst.daf.base.PropertySet`
@@ -56,12 +53,6 @@ def measureFromMetadata(metadata):
     -------
     measurements : iterable of `lsst.verify.Measurement`
         all the measurements derived from ``metadata``. May be empty.
-
-    Raises
-    ------
-    RuntimeError
-        the ``ap_verify`` configuration file exists, but does not contain the
-        expected data under ``measurements``
     """
     result = []