lsst · r-owen · May 23, 2016 · May 19, 2016 · May 19, 2016
diff --git a/bin.src/genCameraRepository.py b/bin.src/genCameraRepository.py
diff --git a/hsc/camera/0_00.fits b/hsc/camera/0_00.fits
diff --git a/hsc/camera/0_01.fits b/hsc/camera/0_01.fits
diff --git a/hsc/camera/0_02.fits b/hsc/camera/0_02.fits
diff --git a/hsc/camera/0_03.fits b/hsc/camera/0_03.fits
diff --git a/hsc/camera/0_04.fits b/hsc/camera/0_04.fits
diff --git a/hsc/camera/0_05.fits b/hsc/camera/0_05.fits
diff --git a/hsc/camera/0_06.fits b/hsc/camera/0_06.fits
diff --git a/hsc/camera/0_07.fits b/hsc/camera/0_07.fits
diff --git a/hsc/camera/0_08.fits b/hsc/camera/0_08.fits
diff --git a/hsc/camera/0_09.fits b/hsc/camera/0_09.fits
diff --git a/hsc/camera/0_10.fits b/hsc/camera/0_10.fits
diff --git a/hsc/camera/0_11.fits b/hsc/camera/0_11.fits
diff --git a/hsc/camera/0_12.fits b/hsc/camera/0_12.fits
diff --git a/hsc/camera/0_13.fits b/hsc/camera/0_13.fits
diff --git a/hsc/camera/0_14.fits b/hsc/camera/0_14.fits
diff --git a/hsc/camera/0_15.fits b/hsc/camera/0_15.fits
diff --git a/hsc/camera/0_16.fits b/hsc/camera/0_16.fits
diff --git a/hsc/camera/0_17.fits b/hsc/camera/0_17.fits
diff --git a/hsc/camera/0_18.fits b/hsc/camera/0_18.fits
diff --git a/hsc/camera/0_19.fits b/hsc/camera/0_19.fits
diff --git a/hsc/camera/0_20.fits b/hsc/camera/0_20.fits
diff --git a/hsc/camera/0_21.fits b/hsc/camera/0_21.fits
diff --git a/hsc/camera/0_22.fits b/hsc/camera/0_22.fits
diff --git a/hsc/camera/0_23.fits b/hsc/camera/0_23.fits
diff --git a/hsc/camera/0_24.fits b/hsc/camera/0_24.fits
diff --git a/hsc/camera/0_25.fits b/hsc/camera/0_25.fits
diff --git a/hsc/camera/0_26.fits b/hsc/camera/0_26.fits
diff --git a/hsc/camera/0_27.fits b/hsc/camera/0_27.fits
diff --git a/hsc/camera/0_28.fits b/hsc/camera/0_28.fits
diff --git a/hsc/camera/0_29.fits b/hsc/camera/0_29.fits
diff --git a/hsc/camera/0_30.fits b/hsc/camera/0_30.fits
diff --git a/hsc/camera/0_31.fits b/hsc/camera/0_31.fits
diff --git a/hsc/camera/0_32.fits b/hsc/camera/0_32.fits
diff --git a/hsc/camera/0_33.fits b/hsc/camera/0_33.fits
diff --git a/hsc/camera/0_34.fits b/hsc/camera/0_34.fits
diff --git a/hsc/camera/0_35.fits b/hsc/camera/0_35.fits
diff --git a/hsc/camera/0_36.fits b/hsc/camera/0_36.fits
diff --git a/hsc/camera/0_37.fits b/hsc/camera/0_37.fits
diff --git a/hsc/camera/0_38.fits b/hsc/camera/0_38.fits
diff --git a/hsc/camera/0_39.fits b/hsc/camera/0_39.fits
diff --git a/hsc/camera/0_40.fits b/hsc/camera/0_40.fits
diff --git a/hsc/camera/0_41.fits b/hsc/camera/0_41.fits
diff --git a/hsc/camera/0_42.fits b/hsc/camera/0_42.fits
diff --git a/hsc/camera/0_43.fits b/hsc/camera/0_43.fits
diff --git a/hsc/camera/0_44.fits b/hsc/camera/0_44.fits
diff --git a/hsc/camera/0_45.fits b/hsc/camera/0_45.fits
diff --git a/hsc/camera/0_46.fits b/hsc/camera/0_46.fits
diff --git a/hsc/camera/0_47.fits b/hsc/camera/0_47.fits
diff --git a/hsc/camera/0_48.fits b/hsc/camera/0_48.fits
diff --git a/hsc/camera/0_51.fits b/hsc/camera/0_51.fits
diff --git a/hsc/camera/0_52.fits b/hsc/camera/0_52.fits
diff --git a/hsc/camera/0_53.fits b/hsc/camera/0_53.fits
diff --git a/hsc/camera/0_54.fits b/hsc/camera/0_54.fits
diff --git a/hsc/camera/0_55.fits b/hsc/camera/0_55.fits
diff --git a/hsc/camera/0_56.fits b/hsc/camera/0_56.fits
diff --git a/hsc/camera/0_57.fits b/hsc/camera/0_57.fits
diff --git a/hsc/camera/1_00.fits b/hsc/camera/1_00.fits
diff --git a/hsc/camera/1_01.fits b/hsc/camera/1_01.fits
diff --git a/hsc/camera/1_02.fits b/hsc/camera/1_02.fits
diff --git a/hsc/camera/1_03.fits b/hsc/camera/1_03.fits
diff --git a/hsc/camera/1_04.fits b/hsc/camera/1_04.fits
diff --git a/hsc/camera/1_05.fits b/hsc/camera/1_05.fits
diff --git a/hsc/camera/1_06.fits b/hsc/camera/1_06.fits
diff --git a/hsc/camera/1_07.fits b/hsc/camera/1_07.fits
diff --git a/hsc/camera/1_08.fits b/hsc/camera/1_08.fits
diff --git a/hsc/camera/1_09.fits b/hsc/camera/1_09.fits
diff --git a/hsc/camera/1_10.fits b/hsc/camera/1_10.fits
diff --git a/hsc/camera/1_11.fits b/hsc/camera/1_11.fits
diff --git a/hsc/camera/1_12.fits b/hsc/camera/1_12.fits
diff --git a/hsc/camera/1_13.fits b/hsc/camera/1_13.fits
diff --git a/hsc/camera/1_14.fits b/hsc/camera/1_14.fits
diff --git a/hsc/camera/1_15.fits b/hsc/camera/1_15.fits
diff --git a/hsc/camera/1_16.fits b/hsc/camera/1_16.fits
diff --git a/hsc/camera/1_17.fits b/hsc/camera/1_17.fits
diff --git a/hsc/camera/1_18.fits b/hsc/camera/1_18.fits
diff --git a/hsc/camera/1_19.fits b/hsc/camera/1_19.fits
diff --git a/hsc/camera/1_20.fits b/hsc/camera/1_20.fits
diff --git a/hsc/camera/1_21.fits b/hsc/camera/1_21.fits
diff --git a/hsc/camera/1_22.fits b/hsc/camera/1_22.fits
diff --git a/hsc/camera/1_23.fits b/hsc/camera/1_23.fits
diff --git a/hsc/camera/1_24.fits b/hsc/camera/1_24.fits
diff --git a/hsc/camera/1_25.fits b/hsc/camera/1_25.fits
diff --git a/hsc/camera/1_26.fits b/hsc/camera/1_26.fits
diff --git a/hsc/camera/1_27.fits b/hsc/camera/1_27.fits
diff --git a/hsc/camera/1_28.fits b/hsc/camera/1_28.fits
diff --git a/hsc/camera/1_29.fits b/hsc/camera/1_29.fits
diff --git a/hsc/camera/1_30.fits b/hsc/camera/1_30.fits
diff --git a/hsc/camera/1_31.fits b/hsc/camera/1_31.fits
diff --git a/hsc/camera/1_32.fits b/hsc/camera/1_32.fits
diff --git a/hsc/camera/1_33.fits b/hsc/camera/1_33.fits
diff --git a/hsc/camera/1_34.fits b/hsc/camera/1_34.fits
diff --git a/hsc/camera/1_35.fits b/hsc/camera/1_35.fits
diff --git a/hsc/camera/1_36.fits b/hsc/camera/1_36.fits
diff --git a/hsc/camera/1_37.fits b/hsc/camera/1_37.fits
diff --git a/hsc/camera/1_38.fits b/hsc/camera/1_38.fits
diff --git a/hsc/camera/1_39.fits b/hsc/camera/1_39.fits
diff --git a/hsc/camera/1_40.fits b/hsc/camera/1_40.fits
diff --git a/hsc/camera/1_41.fits b/hsc/camera/1_41.fits
diff --git a/hsc/camera/1_42.fits b/hsc/camera/1_42.fits
diff --git a/hsc/camera/1_43.fits b/hsc/camera/1_43.fits
diff --git a/hsc/camera/1_44.fits b/hsc/camera/1_44.fits
diff --git a/hsc/camera/1_45.fits b/hsc/camera/1_45.fits
diff --git a/hsc/camera/1_46.fits b/hsc/camera/1_46.fits
diff --git a/hsc/camera/1_47.fits b/hsc/camera/1_47.fits
diff --git a/hsc/camera/1_48.fits b/hsc/camera/1_48.fits
diff --git a/hsc/camera/1_51.fits b/hsc/camera/1_51.fits
diff --git a/hsc/camera/1_52.fits b/hsc/camera/1_52.fits
diff --git a/hsc/camera/1_53.fits b/hsc/camera/1_53.fits
diff --git a/hsc/camera/1_54.fits b/hsc/camera/1_54.fits
diff --git a/hsc/camera/1_55.fits b/hsc/camera/1_55.fits
diff --git a/hsc/camera/1_56.fits b/hsc/camera/1_56.fits
diff --git a/hsc/camera/1_57.fits b/hsc/camera/1_57.fits
diff --git a/hsc/hsc_geom.paf b/hsc/hsc_geom.paf
diff --git a/hsc/hsc_geom.paf.back0509 b/hsc/hsc_geom.paf.back0509
diff --git a/python/lsst/obs/subaru/isr.py b/python/lsst/obs/subaru/isr.py
@@ -104,7 +104,8 @@ class SubaruIsrConfig(IsrTask.ConfigClass):
     )
     doLinearize = pexConfig.Field(
         dtype = bool,
-        doc = "Correct for nonlinearity of the detector's response (ignored if coefficients are 0.0)",
+        doc = "Correct for nonlinearity of the detector's response and set suspect level " \
+                "(ignored if coefficients are 0.0)",
         default = True,
     )
     doApplyGains = pexConfig.Field(
@@ -544,14 +545,13 @@ def linearize(self, exposure):
         for amp in ccd:
             linearityCoefficient = amp.getLinearityCoeffs()[0]
             linearityThreshold = amp.getLinearityCoeffs()[1]
-            linearityMaxCorrectable = amp.getLinearityCoeffs()[2]
+            linearityMaxCorrectable = amp.getSuspectLevel()
             linearityType = amp.getLinearityType()
 
             ampImage = afwImage.MaskedImageF(exposure.getMaskedImage(), amp.getBBox(),
                                                  afwImage.PARENT)
 
-            imageTypeMax = 65535        # should be a method on the image
-            setSuspectPixels = linearityMaxCorrectable < imageTypeMax # there might be some
+            setSuspectPixels = not math.isnan(linearityMaxCorrectable)
 
             if not setSuspectPixels and linearityCoefficient == 0.0:
                 continue                # nothing to do

diff --git a/suprimecam/Full_Suprimecam_MIT_geom.paf b/suprimecam/Full_Suprimecam_MIT_geom.paf