Add linearity support for ISR

Add linearizer argument to CfhtIsrTask. Update genCameraRepository.py to set linearity type to "None" and regenerate the amp info catalogs.
lsst · Jun 4, 2016 · af7389c · af7389c
1 parent abdb9b9
commit af7389c
Show file tree

Hide file tree

Showing 38 changed files with 49 additions and 46 deletions.
diff --git a/bin/genCameraRepository.py b/bin/genCameraRepository.py
@@ -19,7 +19,7 @@
 import lsst.afw.table as afwTable
 import lsst.afw.geom as afwGeom
 from lsst.afw.cameraGeom import SCIENCE, FOCAL_PLANE, PUPIL, CameraConfig, DetectorConfig,\
-                                makeCameraFromCatalogs
+                                makeCameraFromCatalogs, NullLinearityType
 from lsst.obs.cfht import MegacamMapper
 
 PIXELSIZE = 0.0135 #mm/pix
@@ -251,7 +251,7 @@ def addAmp(ampCatalog, amp, eparams):
     record.setSaturation(eparams['saturation'])
     record.setSuspectLevel(float("nan"))  # SUSPECT level unknown
     #The files do not have any linearity information
-    record.setLinearityType('Proportional')
+    record.setLinearityType(NullLinearityType)
     record.setLinearityCoeffs([1.,])
     record.setHasRawInfo(True)
     record.setRawFlipX(False)

diff --git a/megacam/camera/ccd00.fits b/megacam/camera/ccd00.fits
diff --git a/megacam/camera/ccd01.fits b/megacam/camera/ccd01.fits
diff --git a/megacam/camera/ccd02.fits b/megacam/camera/ccd02.fits
diff --git a/megacam/camera/ccd03.fits b/megacam/camera/ccd03.fits
diff --git a/megacam/camera/ccd04.fits b/megacam/camera/ccd04.fits
diff --git a/megacam/camera/ccd05.fits b/megacam/camera/ccd05.fits
diff --git a/megacam/camera/ccd06.fits b/megacam/camera/ccd06.fits
diff --git a/megacam/camera/ccd07.fits b/megacam/camera/ccd07.fits
diff --git a/megacam/camera/ccd08.fits b/megacam/camera/ccd08.fits
diff --git a/megacam/camera/ccd09.fits b/megacam/camera/ccd09.fits
diff --git a/megacam/camera/ccd10.fits b/megacam/camera/ccd10.fits
diff --git a/megacam/camera/ccd11.fits b/megacam/camera/ccd11.fits
diff --git a/megacam/camera/ccd12.fits b/megacam/camera/ccd12.fits
diff --git a/megacam/camera/ccd13.fits b/megacam/camera/ccd13.fits
diff --git a/megacam/camera/ccd14.fits b/megacam/camera/ccd14.fits
diff --git a/megacam/camera/ccd15.fits b/megacam/camera/ccd15.fits
diff --git a/megacam/camera/ccd16.fits b/megacam/camera/ccd16.fits
diff --git a/megacam/camera/ccd17.fits b/megacam/camera/ccd17.fits
diff --git a/megacam/camera/ccd18.fits b/megacam/camera/ccd18.fits
diff --git a/megacam/camera/ccd19.fits b/megacam/camera/ccd19.fits
diff --git a/megacam/camera/ccd20.fits b/megacam/camera/ccd20.fits
diff --git a/megacam/camera/ccd21.fits b/megacam/camera/ccd21.fits
diff --git a/megacam/camera/ccd22.fits b/megacam/camera/ccd22.fits
diff --git a/megacam/camera/ccd23.fits b/megacam/camera/ccd23.fits
diff --git a/megacam/camera/ccd24.fits b/megacam/camera/ccd24.fits
diff --git a/megacam/camera/ccd25.fits b/megacam/camera/ccd25.fits
diff --git a/megacam/camera/ccd26.fits b/megacam/camera/ccd26.fits
diff --git a/megacam/camera/ccd27.fits b/megacam/camera/ccd27.fits
diff --git a/megacam/camera/ccd28.fits b/megacam/camera/ccd28.fits
diff --git a/megacam/camera/ccd29.fits b/megacam/camera/ccd29.fits
diff --git a/megacam/camera/ccd30.fits b/megacam/camera/ccd30.fits
diff --git a/megacam/camera/ccd31.fits b/megacam/camera/ccd31.fits
diff --git a/megacam/camera/ccd32.fits b/megacam/camera/ccd32.fits
diff --git a/megacam/camera/ccd33.fits b/megacam/camera/ccd33.fits
diff --git a/megacam/camera/ccd34.fits b/megacam/camera/ccd34.fits
diff --git a/megacam/camera/ccd35.fits b/megacam/camera/ccd35.fits
diff --git a/python/lsst/obs/cfht/cfhtIsrTask.py b/python/lsst/obs/cfht/cfhtIsrTask.py
@@ -16,7 +16,8 @@ def setDefaults(self):
 class CfhtIsrTask(IsrTask) :
     ConfigClass = CfhtIsrTaskConfig
 
-    def run(self, ccdExposure, bias=None, dark=None,  flat=None, defects=None, fringes=None, bfKernel=None):
+    def run(self, ccdExposure, bias=None, linearizer=None, dark=None, flat=None, defects=None,
+            fringes=None, bfKernel=None):
         """Perform instrument signature removal on an exposure
         
         Steps include:
@@ -27,6 +28,7 @@ def run(self, ccdExposure, bias=None, dark=None,  flat=None, defects=None, fring
 
         @param[in] ccdExposure  -- lsst.afw.image.exposure of detector data
         @param[in] bias -- exposure of bias frame
+        @param[in] linearizer -- linearizing functor; a subclass of lsst.ip.isr.LinearizeBase
         @param[in] dark -- exposure of dark frame
         @param[in] flat -- exposure of flatfield
         @param[in] defects -- list of detects
@@ -84,6 +86,7 @@ def run(self, ccdExposure, bias=None, dark=None,  flat=None, defects=None, fring
         return IsrTask.run(self,
             ccdExposure = ccdExposure,
             bias = bias,
+            linearizer = linearizer,
             dark = dark,
             flat = flat,
             defects = defects,