Merge branch 'tickets/DM-23651'

lsst · Apr 21, 2020 · 68ee177 · 68ee177
2 parents 4abb71f + 5371192
commit 68ee177
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/config/hsc/isr.py b/config/hsc/isr.py
@@ -115,8 +115,6 @@
 
 config.doNanInterpAfterFlat = False
 
-config.doAddDistortionModel = True
-
 config.doMeasureBackground = True
 
 config.doCameraSpecificMasking = False

diff --git a/config/makeBrighterFatterKernel.py b/config/makeBrighterFatterKernel.py
@@ -30,7 +30,6 @@
                                             -157.0e-6, -151.0e-6, -137.0e-6, 0.0e-6]
 
 # Added by Merlin:
-config.isr.doAddDistortionModel = False
 config.isr.doUseOpticsTransmission = False
 config.isr.doUseFilterTransmission = False
 config.isr.doUseSensorTransmission = False
@@ -42,6 +41,6 @@
 config.isrForbiddenSteps = ['doApplyGains', 'normalizeGains',  # additional for this obs_package
                             'doStrayLight', 'doTweakFlat',  # additional for this obs_package
                             'doApplyGains', 'normalizeGains', 'doFlat', 'doFringe',  # remainder are defaults
-                            'doAddDistortionModel', 'doBrighterFatter', 'doUseOpticsTransmission',
+                            'doBrighterFatter', 'doUseOpticsTransmission',
                             'doUseFilterTransmission', 'doUseSensorTransmission',
                             'doUseAtmosphereTransmission', 'doStrayLight', 'doTweakFlat']
diff --git a/config/suprimecam-mit/isr.py b/config/suprimecam-mit/isr.py
@@ -135,8 +135,6 @@
 
 config.doNanInterpAfterFlat = False
 
-config.doAddDistortionModel = True
-
 config.doMeasureBackground = False
 
 config.doCameraSpecificMasking = True

diff --git a/config/suprimecam/isr.py b/config/suprimecam/isr.py
@@ -135,8 +135,6 @@
 
 config.doNanInterpAfterFlat = False
 
-config.doAddDistortionModel = True
-
 config.doMeasureBackground = False
 
 config.doCameraSpecificMasking = True