Merge branch 'tickets/DM-7915'

Rename daf_butlerUtils to obs_base Tickets/dm 7915 #17
lsst · Oct 10, 2016 · b38dfa0 · b38dfa0
2 parents a4e4ce6 + 9ad2d4b
commit b38dfa0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/python/lsst/obs/cfht/makeMegacamRawVisitInfo.py b/python/lsst/obs/cfht/makeMegacamRawVisitInfo.py
@@ -24,7 +24,7 @@
 from __future__ import print_function
 
 from lsst.afw.coord import Coord, IcrsCoord, Observatory, Weather
-from lsst.daf.butlerUtils import MakeRawVisitInfo
+from lsst.obs.base import MakeRawVisitInfo
 
 __all__ = ["MakeMegacamRawVisitInfo"]
 

diff --git a/python/lsst/obs/cfht/megacamMapper.py b/python/lsst/obs/cfht/megacamMapper.py
@@ -28,7 +28,7 @@
 import lsst.afw.image as afwImage
 import lsst.afw.image.utils as afwImageUtils
 
-from lsst.daf.butlerUtils import CameraMapper, exposureFromImage
+from lsst.obs.base import CameraMapper, exposureFromImage
 import lsst.pex.policy as pexPolicy
 from .makeMegacamRawVisitInfo import MakeMegacamRawVisitInfo
 

diff --git a/ups/obs_cfht.table b/ups/obs_cfht.table
@@ -1,5 +1,5 @@
 setupRequired(daf_persistence)
-setupRequired(daf_butlerUtils)
+setupRequired(obs_base)
 setupRequired(meas_algorithms)
 setupRequired(pipe_tasks)