Skip to content

if clause around self.get_bar_offset because MIRI has no bar #19

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

Closed
aggle wants to merge 1 commit into from
Closed

if clause around self.get_bar_offset because MIRI has no bar #19

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
43 changes: 23 additions & 20 deletions webbpsf_ext/webbpsf_ext_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4599,28 +4599,31 @@ def _coeff_mod_wfe_mask(self, coord_vals, coord_frame, siaf_ap=None):

# Information for bar offsetting (in arcsec)
siaf_ap = self.siaf_ap if siaf_ap is None else siaf_ap
if (siaf_ap.AperName != self.siaf_ap.AperName):
apname = siaf_ap.AperName
if ('_F1' in apname) or ('_F2' in apname) or ('_F3' in apname) or ('_F4' in apname):
filter = apname.split('_')[-1]
narrow = False
do_bar = True
elif 'NARROW' in apname:
filter = None
narrow = True
do_bar = True
else:
do_bar = False
if 'MIRI' in siaf_ap.AperName:
bar_offset = 0
else:
if (siaf_ap.AperName != self.siaf_ap.AperName):
apname = siaf_ap.AperName
if ('_F1' in apname) or ('_F2' in apname) or ('_F3' in apname) or ('_F4' in apname):
filter = apname.split('_')[-1]
narrow = False
do_bar = True
elif 'NARROW' in apname:
filter = None
narrow = True
do_bar = True
else:
do_bar = False

# Add in any bar offset
if do_bar:
bar_offset = self.get_bar_offset(filter=filter, narrow=narrow, ignore_options=True)
bar_offset = 0 if bar_offset is None else bar_offset
# Add in any bar offset
if do_bar:
bar_offset = self.get_bar_offset(filter=filter, narrow=narrow, ignore_options=True)
bar_offset = 0 if bar_offset is None else bar_offset
else:
bar_offset = 0
else:
bar_offset = 0
else:
bar_offset = self.get_bar_offset(ignore_options=True)
bar_offset = 0 if bar_offset is None else bar_offset
bar_offset = self.get_bar_offset(ignore_options=True)
bar_offset = 0 if bar_offset is None else bar_offset

# Coord values are set, but no coefficients supplied
if (coord_vals is not None) and (cf_fit is None):
Expand Down