Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update MIRI detector scale params to match current SIAF #456

Merged
merged 1 commit into from
Jun 3, 2021
Merged

update MIRI detector scale params to match current SIAF #456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions webbpsf/webbpsf_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down