Rename StdText to Curated

lsst · Nov 26, 2019 · 53e0fe4 · 53e0fe4
1 parent 5587def
commit 53e0fe4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/config/ingestStdTextCalibs.py → config/ingestCuratedCalibs.py b/config/ingestStdTextCalibs.py → config/ingestCuratedCalibs.py
diff --git a/hsc/SConscript b/hsc/SConscript
@@ -18,7 +18,7 @@ python = "{} python".format(libpathstr)
 
 pipe_tasks_dir = lsst.sconsUtils.env.ProductDir('pipe_tasks')
 data_dir = lsst.sconsUtils.env.ProductDir('obs_subaru_data')
-command = (f"{python} {pipe_tasks_dir}/bin/ingestStdTextCalibs.py hsc/CALIB/ {data_dir}/hsc/defects "+
+command = (f"{python} {pipe_tasks_dir}/bin/ingestCuratedCalibs.py hsc/CALIB/ {data_dir}/hsc/defects "+
             "--calib hsc/CALIB --config clobber=True")
 commandInst = env.Command('CALIB/calibRegistry.sqlite3', [], command)
 env.Depends(commandInst, lsst.sconsUtils.targets["python"])
diff --git a/python/lsst/obs/subaru/gen3/hsc/instrument.py b/python/lsst/obs/subaru/gen3/hsc/instrument.py
@@ -35,7 +35,7 @@
 from lsst.afw.cameraGeom import makeCameraFromPath, CameraConfig
 from lsst.daf.butler import DatasetType, DataCoordinate, FileDataset, DatasetRef
 from lsst.obs.base import Instrument, addUnboundedCalibrationLabel
-from lsst.pipe.tasks.read_stdText_calibs import read_all
+from lsst.pipe.tasks.read_curated_calibs import read_all
 
 from lsst.obs.hsc.hscPupil import HscPupilFactory
 from lsst.obs.hsc.hscFilters import HSC_FILTER_DEFINITIONS

diff --git a/suprimecam/SConscript b/suprimecam/SConscript
@@ -18,7 +18,7 @@ python = "{} python".format(libpathstr)
 
 pipe_tasks_dir = lsst.sconsUtils.env.ProductDir('pipe_tasks')
 data_dir = lsst.sconsUtils.env.ProductDir('obs_subaru_data')
-command = (f"{python} {pipe_tasks_dir}/bin/ingestStdTextCalibs.py suprimecam/CALIB/ {data_dir}/suprimecam/defects "+
+command = (f"{python} {pipe_tasks_dir}/bin/ingestCuratedCalibs.py suprimecam/CALIB/ {data_dir}/suprimecam/defects "+
             "--calib suprimecam/CALIB --config clobber=True")
 commandInst = env.Command('CALIB/calibRegistry.sqlite3', [], command)
 env.Depends(commandInst, lsst.sconsUtils.targets["python"])