Use common metadata handler.

Be pedantic on updateMetadata to avoid issues with ingest.
lsst · Oct 6, 2020 · 044087b · 044087b
1 parent fe4d62f
commit 044087b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/python/lsst/cp/pipe/linearity.py b/python/lsst/cp/pipe/linearity.py
@@ -238,6 +238,7 @@ def run(self, inputPtc, camera, inputDims):
                     linearityFit = [tableIndex, 0]
                     tableIndex += 1
             elif self.config.linearityType in ['Spline']:
+                # See discussion in `lsst.ip.isr.linearize.py` before modifying.
                 numPerBin, binEdges = np.histogram(linearOrdinate, bins=self.config.fitOrder)
                 with np.errstate(invalid="ignore"):
                     values = np.histogram(linearOrdinate, bins=self.config.fitOrder,
@@ -293,9 +294,10 @@ def run(self, inputPtc, camera, inputDims):
             self.debugFit('solution', inputOrdinate[fluxMask], linearOrdinate,
                           linearizeModel[fluxMask], None, ampName)
 
-        linearizer.hasLinearity=True
+        linearizer.hasLinearity = True
         linearizer.validate()
-        linearizer.updateMetadata(setDate=True)
+        linearizer.updateMetadata(camera=camera, detector=detector, filterName='NONE')
+        linearizer.updateMetadata(setDate=True, setCalibId=True)
         provenance = IsrProvenance(calibType='linearizer')
 
         return pipeBase.Struct(

diff --git a/tests/test_ptc.py b/tests/test_ptc.py
@@ -39,6 +39,11 @@
 from lsst.cp.pipe.utils import (funcPolynomial, makeMockFlats)
 
 
+class FakeCamera(list):
+    def getName(self):
+        return "FakeCam"
+
+
 class MeasurePhotonTransferCurveTaskTestCase(lsst.utils.tests.TestCase):
     """A test case for the PTC task."""
 
@@ -183,13 +188,13 @@ def ptcFitAndCheckPtc(self, order=None, fitType='', doTableArray=False, doFitBoo
             localDataset = task.fitPtc(localDataset, ptcFitType=fitType)
             # linDataset: Dictionary of `lsst.cp.pipe.ptc.LinearityResidualsAndLinearizersDataset`
             linDataset = task.linearity.run(localDataset,
-                                            camera=[self.flatExp1.getDetector()],
+                                            camera=FakeCamera([self.flatExp1.getDetector()]),
                                             inputDims={'detector': 0})
             linDataset = linDataset.outputLinearizer
         else:
             localDataset = task.fitPtc(localDataset, ptcFitType=fitType)
             linDataset = task.linearity.run(localDataset,
-                                            camera=[self.flatExp1.getDetector()],
+                                            camera=FakeCamera([self.flatExp1.getDetector()]),
                                             inputDims={'detector': 0})
             linDataset = linDataset.outputLinearizer