fixup! Detector: add crosstalk matrix

lsst · Aug 24, 2017 · e9e7827 · e9e7827
1 parent 2350101
commit e9e7827
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/python/lsst/afw/cameraGeom/cameraConfig.py b/python/lsst/afw/cameraGeom/cameraConfig.py
@@ -57,7 +57,10 @@ def getCrosstalk(self, numAmps):
         """Return a 2-D numpy array of crosstalk coefficients of the proper shape"""
         if not self.crosstalk:
             return None
-        return np.array(self.crosstalk, dtype=np.float32).reshape((numAmps, numAmps))
+        try:
+            return np.array(self.crosstalk, dtype=np.float32).reshape((numAmps, numAmps))
+        except:
+            raise RuntimeError("Cannot reshape 'crosstalk' coefficients to square matrix")
 
 
 class CameraConfig(pexConfig.Config):

diff --git a/tests/test_detector.py b/tests/test_detector.py
@@ -99,9 +99,11 @@ def addBadCameraSys(dw):
                           np.array([1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0], dtype=np.float32),  # 1D
                           ):
             self.assertRaises(TypeError, DetectorWrapper, crosstalk=crosstalk)
-        # This breaks in the Detector ctor: wrong shape
+        # These break in the Detector ctor: wrong shape
         self.assertRaises(lsst.pex.exceptions.InvalidParameterError,
                           DetectorWrapper, crosstalk=np.array([[1.0, 2.0], [3.0, 4.0]]))
+        self.assertRaises(lsst.pex.exceptions.InvalidParameterError,
+                          DetectorWrapper, crosstalk=np.array([[1.0, 2.0], [3.0, 4.0], [5.0, 6.0]]))
 
     def testTransform(self):
         """Test the transform method