Rework measureCrosstalk to have useful debug information. Fix readout…

… bug in isrMock.
lsst · May 28, 2019 · b4234a6 · b4234a6
1 parent 8056d37
commit b4234a6
Show file tree

Hide file tree

Showing 6 changed files with 386 additions and 152 deletions.
diff --git a/python/lsst/ip/isr/crosstalk.py b/python/lsst/ip/isr/crosstalk.py
@@ -63,7 +63,10 @@ class CrosstalkConfig(Config):
     )
     crosstalkValues = ListField(
         dtype=float,
-        doc="Amplifier-indexed crosstalk coefficients to use.",
+        doc=("Amplifier-indexed crosstalk coefficients to use.  This should be arranged as a 1 x nAmp**2 "
+             "list of coefficients, such that when reshaped by crosstalkShape, the result is nAmp x nAmp. "
+             "This matrix should be structured so CT * [amp0 amp1 amp2 ...]^T returns the column "
+             "vector [corr0 corr1 corr2 ...]^T."),
         default=[0.0],
     )
     crosstalkShape = ListField(
@@ -73,7 +76,7 @@ class CrosstalkConfig(Config):
     )
 
     def getCrosstalk(self, detector=None):
-        """Return a 2-D numpy array of crosstalk coefficients of the proper shape.
+        """Return a 2-D numpy array of crosstalk coefficients in the proper shape.
 
         Parameters
         ----------

diff --git a/python/lsst/ip/isr/isrMock.py b/python/lsst/ip/isr/isrMock.py
@@ -24,8 +24,10 @@
 import tempfile
 
 import lsst.geom
-import lsst.afw.image as afwImage
 import lsst.afw.geom as afwGeom
+import lsst.afw.image as afwImage
+import lsst.afw.math as afwMath
+import lsst.afw.table as afwTable
 import lsst.afw.cameraGeom.utils as afwUtils
 import lsst.afw.cameraGeom.testUtils as afwTestUtils
 from lsst.meas.algorithms import Defects
@@ -251,6 +253,11 @@ class IsrMock(pipeBase.Task):
     ConfigClass = IsrMockConfig
     _DefaultName = "isrMock"
 
+    XFLIP = {afwTable.LL: False, afwTable.LR: True,
+             afwTable.UL: False, afwTable.UR: True}
+    YFLIP = {afwTable.LL: False, afwTable.LR: False,
+             afwTable.UL: True, afwTable.UR: True}
+
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.rng = np.random.RandomState(self.config.rngSeed)
@@ -443,14 +450,18 @@ def makeImage(self):
                                                self.config.darkTime / self.config.gain))
 
         if self.config.doAddCrosstalk is True:
+
             for idxS, ampS in enumerate(exposure.getDetector()):
                 for idxT, ampT in enumerate(exposure.getDetector()):
-                    if self.config.isTrimmed is True:
-                        ampDataS = exposure.image[ampS.getBBox()]
-                        ampDataT = exposure.image[ampT.getBBox()]
-                    else:
-                        ampDataS = exposure.image[ampS.getRawDataBBox()]
-                        ampDataT = exposure.image[ampT.getRawDataBBox()]
+                    ampDataS = exposure.image[ampS.getBBox() if self.config.isTrimmed
+                                              else ampS.getRawDataBBox()]
+                    ampDataT = exposure.image[ampT.getBBox() if self.config.isTrimmed
+                                              else ampT.getRawDataBBox()]
+                    ampDataS = afwMath.flipImage(ampDataS,
+                                                 (self.XFLIP[ampS.getReadoutCorner()] ^
+                                                  self.XFLIP[ampT.getReadoutCorner()]),
+                                                 (self.YFLIP[ampS.getReadoutCorner()] ^
+                                                  self.YFLIP[ampT.getReadoutCorner()]))
                     self.amplifierAddCT(ampDataS, ampDataT, self.crosstalkCoeffs[idxT][idxS])
 
         for amp in exposure.getDetector():

diff --git a/python/lsst/ip/isr/isrTask.py b/python/lsst/ip/isr/isrTask.py
@@ -52,6 +52,7 @@
 from .straylight import StrayLightTask
 from .vignette import VignetteTask
 
+
 __all__ = ["IsrTask", "IsrTaskConfig", "RunIsrTask", "RunIsrConfig"]
 
 
@@ -414,7 +415,7 @@ class IsrTaskConfig(pexConfig.Config):
     doCrosstalkBeforeAssemble = pexConfig.Field(
         dtype=bool,
         doc="Apply crosstalk correction before CCD assembly, and before trimming?",
-        default=True,
+        default=False,
     )
     crosstalk = pexConfig.ConfigurableField(
         target=CrosstalkTask,