Merge pull request #219 from lsst/tickets/DM-34340

DM-34340:Adapt to daf_butler API changes.
lsst · Nov 22, 2023 · ee0cc65 · ee0cc65
2 parents df35531 + 832558f
commit ee0cc65
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/python/lsst/cp/pipe/cpCombine.py b/python/lsst/cp/pipe/cpCombine.py
@@ -228,7 +228,7 @@ def __init__(self, **kwargs):
     def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)
 
-        dimensions = [expHandle.dataId.byName() for expHandle in inputRefs.inputExpHandles]
+        dimensions = [dict(expHandle.dataId.required) for expHandle in inputRefs.inputExpHandles]
         inputs["inputDims"] = dimensions
 
         outputs = self.run(**inputs)

diff --git a/python/lsst/cp/pipe/cpFlatNormTask.py b/python/lsst/cp/pipe/cpFlatNormTask.py
@@ -192,7 +192,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
 
         # Use the dimensions of the inputs for generating
         # output scales.
-        dimensions = [exp.dataId.byName() for exp in inputRefs.inputMDs]
+        dimensions = [dict(exp.dataId.required) for exp in inputRefs.inputMDs]
         inputs['inputDims'] = dimensions
 
         outputs = self.run(**inputs)

diff --git a/python/lsst/cp/pipe/deferredCharge.py b/python/lsst/cp/pipe/deferredCharge.py
@@ -126,7 +126,7 @@ def __init__(self, **kwargs):
     def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)
 
-        dimensions = [exp.dataId.byName() for exp in inputRefs.inputMeasurements]
+        dimensions = [dict(exp.dataId.required) for exp in inputRefs.inputMeasurements]
         inputs['inputDims'] = dimensions
 
         outputs = self.run(**inputs)

diff --git a/python/lsst/cp/pipe/linearity.py b/python/lsst/cp/pipe/linearity.py
@@ -263,7 +263,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)
 
         # Use the dimensions to set calib/provenance information.
-        inputs['inputDims'] = inputRefs.inputPtc.dataId.byName()
+        inputs['inputDims'] = dict(inputRefs.inputPtc.dataId.required)
 
         outputs = self.run(**inputs)
         butlerQC.put(outputs, outputRefs)

diff --git a/python/lsst/cp/pipe/makeBrighterFatterKernel.py b/python/lsst/cp/pipe/makeBrighterFatterKernel.py
@@ -159,7 +159,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)
 
         # Use the dimensions to set calib/provenance information.
-        inputs['inputDims'] = inputRefs.inputPtc.dataId.byName()
+        inputs['inputDims'] = dict(inputRefs.inputPtc.dataId.required)
 
         outputs = self.run(**inputs)
         butlerQC.put(outputs, outputRefs)

diff --git a/python/lsst/cp/pipe/measureCrosstalk.py b/python/lsst/cp/pipe/measureCrosstalk.py
@@ -433,8 +433,8 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)
 
         # Use the dimensions to set calib/provenance information.
-        inputs['inputDims'] = [exp.dataId.byName() for exp in inputRefs.inputRatios]
-        inputs['outputDims'] = outputRefs.outputCrosstalk.dataId.byName()
+        inputs['inputDims'] = [dict(exp.dataId.required) for exp in inputRefs.inputRatios]
+        inputs['outputDims'] = dict(outputRefs.outputCrosstalk.dataId.required)
 
         outputs = self.run(**inputs)
         butlerQC.put(outputs, outputRefs)

diff --git a/python/lsst/cp/pipe/pdCorrection.py b/python/lsst/cp/pipe/pdCorrection.py
@@ -95,7 +95,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)
 
         # Use the dimensions to set calib/provenance information.
-        inputs['inputDims'] = inputRefs.inputPtc[0].dataId.byName()
+        inputs['inputDims'] = dict(inputRefs.inputPtc[0].dataId.required)
 
         # Need to generate a joint list of detectors present in both
         # inputPtc and inputLinearizer.  We do this here because the