Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-21155: Change to new ingest name #234

Merged
merged 3 commits into from
Nov 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion hsc/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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/ingestDefects.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"])
4 changes: 2 additions & 2 deletions python/lsst/obs/subaru/gen3/hsc/instrument.py
Original file line number Diff line number Diff line change
Expand Up @@ -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_defects import read_all_defects
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
Expand Down Expand Up @@ -229,7 +229,7 @@ def writeCuratedCalibrations(self, butler):
butler.registry.registerDatasetType(datasetType)
defectPath = os.path.join(getPackageDir("obs_subaru_data"), "hsc", "defects")
camera = self.getCamera()
defectsDict = read_all_defects(defectPath, camera)
defectsDict = read_all(defectPath, camera)[0] # This method returns a dict plus the calib type
endOfTime = '20380119T031407'
dimensionRecords = []
datasetRecords = []
Expand Down
2 changes: 1 addition & 1 deletion suprimecam/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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/ingestDefects.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"])