obs_metadata renamed to astro_metadata_translator

lsst · Oct 19, 2018 · 8fc40ab · 8fc40ab
1 parent 4d19d28
commit 8fc40ab
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/python/lsst/daf/butler/gen2convert/walker.py b/python/lsst/daf/butler/gen2convert/walker.py
@@ -28,7 +28,7 @@
 # register YAML loader for repositoryCfg.yaml files.
 import lsst.daf.persistence.repositoryCfg   # noqa F401
 
-from lsst.obs.metadata import ObservationInfo
+from astro_metadata_translator import ObservationInfo
 from lsst.afw.image import readMetadata
 from lsst.log import Log
 from lsst.utils import doImport
@@ -328,14 +328,14 @@ def skyMapRoots(self):
 
     @property
     def obsInfo(self):
-        """All unique `lsst.obs.metadata.ObservationInfo` objects and
+        """All unique `astro_metadata_translator.ObservationInfo` objects and
         visit-filter associations found in any repository (`dict`, nested).
 
         This is a nested dictionary, with mapper class names as outer keys and
         the inner keys a tuple of mapper-specific data ID values determined
         from configuration.  Values are a tuple of
-        (`lsst.obs.metadata.ObservationInfo`, `str)`, with the latter a Gen2
-        filter name.
+        (`astro_metadata_translator.ObservationInfo`, `str)`, with the latter
+        a Gen2 filter name.
         """
         return self._obsInfo
 

diff --git a/python/lsst/daf/butler/gen2convert/writer.py b/python/lsst/daf/butler/gen2convert/writer.py
@@ -64,10 +64,10 @@ class ConversionWriter:
         values, usually obtained from the `skyMapRoots` attribute of a
         `ConversionWalker`.
     obsInfo: dict
-        A nested dictionary of `lsst.obs.metadata.ObservationInfo` objects,
-         with MapperClass names as outer keys and tuples of camera-dependent
-         Gen2 visit/exposure dentifiers as inner keys.  Usually obtained from
-        `ConversionWalker.obsInfo`.
+        A nested dictionary of `astro_metadata_translator.ObservationInfo`
+        objects, with MapperClass names as outer keys and tuples of
+        camera-dependent Gen2 visit/exposure dentifiers as inner keys.
+        Usually obtained from `ConversionWalker.obsInfo`.
     """
 
     @classmethod

diff --git a/python/lsst/daf/butler/instrument.py b/python/lsst/daf/butler/instrument.py
@@ -79,15 +79,15 @@ def _addSensors(self, registry):
 
 def makeExposureEntryFromObsInfo(dataId, obsInfo):
     """Construct an Exposure DataUnit entry from
-    `lsst.obs.metadata.ObservationInfo`.
+    `astro_metadata_translator.ObservationInfo`.
 
     Parameters
     ----------
     dataId : `dict`
         Dictionary of DataUnit primary/foreign key values for Exposure
         ("camera", "exposure", optionally "visit" and "physical_filter").
-    obsInfo : `lsst.obs.metadata.ObservationInfo`
-        A `~lsst.obs.metadata.ObservationInfo` object corresponding to the
+    obsInfo : `astro_metadata_translator.ObservationInfo`
+        A `~astro_metadata_translator.ObservationInfo` object corresponding to the
         Exposure.
 
     Returns
@@ -107,15 +107,15 @@ def makeExposureEntryFromObsInfo(dataId, obsInfo):
 
 def makeVisitEntryFromObsInfo(dataId, obsInfo):
     """Construct a Visit DataUnit entry from
-    `lsst.obs.metadata.ObservationInfo`.
+    `astro_metadata_translator.ObservationInfo`.
 
     Parameters
     ----------
     dataId : `dict`
         Dictionary of DataUnit primary/foreign key values for Visit ("camera",
         "visit", optionally "physical_filter").
-    obsInfo : `lsst.obs.metadata.ObservationInfo`
-        A `~lsst.obs.metadata.ObservationInfo` object corresponding to the
+    obsInfo : `astro_metadata_translator.ObservationInfo`
+        A `~astro_metadata_translator.ObservationInfo` object corresponding to the
         Visit.
 
     Returns

diff --git a/ups/daf_butler.table b/ups/daf_butler.table
@@ -4,7 +4,7 @@ setupRequired(numpy)
 setupRequired(scons)
 setupRequired(sconsUtils)
 setupRequired(utils)
-setupRequired(obs_metadata)
+setupRequired(astro_metadata_translator)
 
 setupRequired(daf_persistence)
 setupRequired(afw)