Skip to content

BUG: Fix is_nrs_msaspec_flatlamp and remove redundant if-else in gs_position_acq #9389

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

Merged
merged 1 commit into from
Apr 10, 2025
Merged

BUG: Fix is_nrs_msaspec_flatlamp and remove redundant if-else in gs_position_acq #9389

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion jwst/lib/exposure_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
`True` if it is.
"""
lamp_mode = datamodel.meta.instrument.lamp_mode.lower()
return lamp_mode == "msaspec" and is_nrs_flatlamp()
return lamp_mode == "msaspec" and is_nrs_flatlamp(datamodel)

Check warning on line 224 in jwst/lib/exposure_types.py

View check run for this annotation

Codecov / codecov/patch

jwst/lib/exposure_types.py#L224 

Added line #L224 was not covered by tests


def is_nrs_autoflat(datamodel):
Expand Down
8 changes: 2 additions & 6 deletions jwst/lib/set_telescope_pointing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2962,12 +2962,8 @@ def gs_position_acq(mnemonics_to_read, mnemonics, exp_type="fgs_acq1"): # noqa:
)

# Setup parameters depending on ACQ1 vs ACQ2
if exp_type == "fgs_acq1":
subarray = valid[FGS_ACQ_WINDOW_INDEX[exp_type]]
posg_slice = FGS_ACQ_SLICES[exp_type]
else:
subarray = valid[FGS_ACQ_WINDOW_INDEX[exp_type]]
posg_slice = FGS_ACQ_SLICES[exp_type]
subarray = valid[FGS_ACQ_WINDOW_INDEX[exp_type]]
posg_slice = FGS_ACQ_SLICES[exp_type]

position = (
np.average(valid["IFGS_ACQ_XPOSG"][posg_slice]),
Expand Down