Merge pull request #313 from lsst/tickets/DM-42982

DM-42982: IsrTask.defineEffectivePtc warns in all(?) cases
lsst · Mar 6, 2024 · 8c67aea · 8c67aea
2 parents 5923ed5 + b1c999f
commit 8c67aea
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/python/lsst/ip/isr/isrTask.py b/python/lsst/ip/isr/isrTask.py
@@ -23,6 +23,7 @@
 
 import math
 import numpy
+import numbers
 
 import lsst.geom
 import lsst.afw.image as afwImage
@@ -1860,7 +1861,7 @@ def defineEffectivePtc(self, ptcDataset, detector, bfGains, overScans, metadata)
                     noise = overscanResults.residualSigma[0]
             elif self.config.usePtcReadNoise:
                 # Try then with the PTC noise.
-                noise = ptcDataset.noise[amp.getName()]
+                noise = ptcDataset.noise[ampName]
                 noiseProvenanceString = "ptc"
                 self.log.debug("Using noise from Photon Transfer Curve.")
             else:
@@ -1881,6 +1882,19 @@ def defineEffectivePtc(self, ptcDataset, detector, bfGains, overScans, metadata)
                                  ampName, gain, patchedGain)
                 gain = patchedGain
 
+            # PTC Turnoff:
+            # Copy it over from the input PTC if it's positive. If it's a nan
+            # set it to a high value.
+            if ptcDataset is not None:
+                ptcTurnoff = ptcDataset.ptcTurnoff[ampName]
+            else:
+                ptcTurnoff = 2e19
+
+            if (isinstance(ptcTurnoff, numbers.Real) and ptcTurnoff > 0):
+                effectivePtc.ptcTurnoff[ampName] = ptcTurnoff
+            elif math.isnan(ptcTurnoff):
+                effectivePtc.ptcTurnoff[ampName] = 2e19
+
             effectivePtc.gain[ampName] = gain
             effectivePtc.noise[ampName] = noise
             # Make sure noise,turnoff, and gain make sense