From cfe26691bb68c1109e49df82185a3693547e099e Mon Sep 17 00:00:00 2001 From: Marshall Perrin Date: Thu, 1 Apr 2021 18:43:37 -0400 Subject: [PATCH] update MIRI detector scale params to match current SIAF; no change for other SIs --- webbpsf/webbpsf_core.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/webbpsf/webbpsf_core.py b/webbpsf/webbpsf_core.py index e93b8a3a..419855d7 100644 --- a/webbpsf/webbpsf_core.py +++ b/webbpsf/webbpsf_core.py @@ -1347,8 +1347,9 @@ class MIRI(JWInstrument): def __init__(self): self.auto_pupil = True JWInstrument.__init__(self, "MIRI") - self.pixelscale = 0.1110 # Source: SIAF PRDDEVSOC-D-012, 2016 April - self._rotation = 4.4497 # Source: SIAF PRDOPSSOC-H-014 + self.pixelscale = 0.1108 # MIRI average of X and Y pixel scales. Source: SIAF PRDOPSSOC-031, 2021 April + self._rotation = 4.834 # V3IdlYAngle, Source: SIAF PRDOPSSOC-031 + # This is rotation counterclockwise; when summed with V3PA it will yield the Y axis PA on sky self.options['pupil_shift_x'] = -0.0069 # CV3 on-orbit estimate (RPT028027) + OTIS delta from predicted (037134) self.options['pupil_shift_y'] = -0.0027 @@ -1617,8 +1618,8 @@ class NIRCam(JWInstrument): LONG_WAVELENGTH_MAX = 5.3 * 1e-6 def __init__(self): - self._pixelscale_short = 0.0311 # for short-wavelen channels, SIAF PRDDEVSOC-D-012, 2016 April - self._pixelscale_long = 0.0630 # for long-wavelen channels, SIAF PRDDEVSOC-D-012, 2016 April + self._pixelscale_short = 0.0311 # average over both X and Y for short-wavelen channels, SIAF PRDOPSSOC-031, 2021 April + self._pixelscale_long = 0.0630 # average over both X and Y for long-wavelen channels, SIAF PRDOPSSOC-031, 2021 April self.pixelscale = self._pixelscale_short self.options['pupil_shift_x'] = 0 # Set to 0 since NIRCam FAM corrects for PM shear in flight @@ -2100,9 +2101,10 @@ class NIRSpec(JWInstrument): def __init__(self): JWInstrument.__init__(self, "NIRSpec") - self.pixelscale = 0.1043 # Average over both detectors. SIAF PRDDEVSOC-D-012, 2016 April + self.pixelscale = 0.1043 # Average over both detectors. SIAF PRDOPSSOC-031, 2021 April # Microshutters are 0.2x0.46 but we ignore that here. - self._rotation = 138.4 # Average for both detectors in SIAF PRDOPSSOC-H-014 + self._rotation = 138.4 # Average for both detectors in SIAF PRDOPSSOC-031 + # This is rotation counterclockwise; when summed with V3PA it will yield the Y axis PA on sky self.filter_list.append("IFU") self._IFU_pixelscale = 0.1043 # same. self.monochromatic = 3.0 @@ -2234,7 +2236,7 @@ class NIRISS(JWInstrument): def __init__(self, auto_pupil=True): self.auto_pupil = auto_pupil JWInstrument.__init__(self, "NIRISS") - self.pixelscale = 0.0656 # SIAF PRDDEVSOC-D-012, 2016 April + self.pixelscale = 0.0656 # Average of X and Y scales, SIAF PRDOPSSOC-031, 2021 April self.options['pupil_shift_x'] = 0.0243 # CV3 on-orbit estimate (RPT028027) + OTIS delta from predicted (037134) self.options['pupil_shift_y'] = -0.0141 @@ -2362,7 +2364,7 @@ class FGS(JWInstrument): def __init__(self): JWInstrument.__init__(self, "FGS") - self.pixelscale = 0.0691 # SIAF PRDDEVSOC-D-012, 2016 April + self.pixelscale = 0.0691 # Average of X and Y scales for both detectors, SIAF PRDOPSSOC-031, 2021 April self.options['pupil_shift_x'] = 0.0041 # CV3 on-orbit estimate (RPT028027) + OTIS delta from predicted (037134) self.options['pupil_shift_y'] = -0.0023