Skip to content

Generate nircam fix ii : Electric Boogaloo #375

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
wants to merge 11 commits into from
Closed

Generate nircam fix ii : Electric Boogaloo #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
95628f9
Merge pull request #358 from mfixstsci/release-0.24.0
Witchblade101 Nov 25, 2024
41cd1c9
Merge branch 'spacetelescope:main' into nrc-update-jwstsiaf-284
Witchblade101 Feb 10, 2025
ad639e9
Added updated files from Paul Bennet for JWSTSIAF-284
Witchblade101 Feb 10, 2025
e3f6288
Merge pull request #363 from Witchblade101/nrc-update-jwstsiaf-284
Witchblade101 Apr 24, 2025
e689f4f
Merge branch 'spacetelescope:siaf-updates' into siaf-updates
pbennet May 6, 2025
0ede02f
Added DHS apertures
pbennet May 6, 2025
ce25986
Merge pull request #371 from pbennet/siaf-updates
Witchblade101 May 6, 2025
926f282
Updated SW DHS apertures.
pbennet May 12, 2025
0490d0a
Merge pull request #372 from pbennet/siaf-updates
Witchblade101 May 12, 2025
8f1e911
Replaced new instances of find() with numpy.ndarray.item()
Witchblade101 May 20, 2025
c33683b
Merge branch 'main' into generate_nircam_fix_ii
Witchblade101 Jul 2, 2025
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
210 changes: 142 additions & 68 deletions generate/generate_nircam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,13 @@
)
wedge_offsets = Table.read(wedge_file, format="ascii.basic", delimiter=",")

dhs_file = os.path.join(
JWST_SOURCE_DATA_ROOT,
instrument,
"{}_siaf_dhs_offsets.txt".format(instrument.lower()),
)
dhs_offsets = Table.read(dhs_file, format="ascii.basic", delimiter=",")

grism_file = os.path.join(
JWST_SOURCE_DATA_ROOT,
instrument,
Expand Down Expand Up @@ -173,7 +180,7 @@
dependency_type = siaf_aperture_definitions["dependency_type"][index]

if parent_apertures is not None:
if dependency_type in ["default", "wedge", "dhspil_wedge"]:
if dependency_type in ["default", "wedge", "dhspil_wedge", "DHS"]:
aperture._parent_apertures = parent_apertures
parent_aperture = aperture_dict[aperture._parent_apertures]

Expand All @@ -198,14 +205,23 @@

if dependency_type != "default":
sca_name = aperture.AperName[0:5]


if dependency_type == "DHS":
v2_offset = numpy.ndarray.item(
dhs_offsets["v2_offset"][dhs_offsets["name"] == sca_name])
v3_offset = numpy.ndarray.item(
dhs_offsets["v3_offset"][dhs_offsets["name"] == sca_name])
aperture.V2Ref += v2_offset
aperture.V3Ref += v3_offset

if dependency_type == "wedge":
if (sca_name == "NRCA5") and (
("MASK335R" in aperture.AperName)
or ("MASK430R" in aperture.AperName)
):
# see https://jira.stsci.edu/browse/JWSTSIAF-77
sca_name += "335R430R"

v2_offset = np.ndarray.item(
wedge_offsets["v2_offset"][wedge_offsets["name"] == sca_name]
)
Expand Down Expand Up @@ -528,73 +544,130 @@
if create_jira_plots:
# # make figures for JSOCOPS-164-165-166 Jira ticket
selected_aperture_names = [
["NRCALL"]
["NRCALL_DHS_F322W2"]
+ [
"NRC{}{}_FULL".format(mod, sca)
for mod in ["A", "B"]
for sca in ["1", "2", "3", "4", "5"]
],
[
"NRCA{}_{}".format(sca, subarray)
for sca in ["1", "2", "3", "4", "5"]
for subarray in ["FULL", "SUB160", "SUB320", "SUB640"]
],
[
"NRCB{}_{}".format(sca, subarray)
for sca in ["1", "2", "3", "4", "5"]
for subarray in ["FULL", "SUB160", "SUB320", "SUB640"]
],
[
"NRCB{}_{}".format(sca, subarray)
for sca in ["1", "5"]
for subarray in ["FULLP", "SUB64P", "SUB160P", "SUB400P"]
],
[
"NRCA{}_FULL_WEDGE_RND".format(sca)
for sca in ["1", "2", "3", "4", "5"]
],
[
"NRCA{}_FULL_WEDGE_BAR".format(sca)
for sca in ["1", "2", "3", "4", "5"]
],
[
"NRCA2_MASK210R",
"NRCA5_MASK210R",
"NRCA2_TAMASK210R",
"NRCA2_FSTAMASK210R",
],
[
"NRCA5_MASK335R",
"NRCA2_MASK335R",
"NRCA5_TAMASK335R",
"NRCA5_FSTAMASK335R",
],
[
"NRCA5_MASK430R",
"NRCA2_MASK430R",
"NRCA5_TAMASK430R",
"NRCA5_FSTAMASK430R",
],
[
"NRCA5_400X256_MASKLWB",
"NRCA4_400X256_MASKLWB",
"NRCA5_TAMASKLWB",
"NRCA5_TAMASKLWBL",
"NRCA5_FSTAMASKLWB",
"NRCA5_400X256_MASKLWB_NARROW",
"NRCA5_400X256_MASKLWB_F444W",
"NRCA5_400X256_MASKLWB_F250M",
],
[
"NRCA4_MASKSWB",
"NRCA5_MASKSWB",
"NRCA4_TAMASKSWB",
"NRCA4_TAMASKSWBS",
"NRCA4_FSTAMASKSWB",
"NRCA4_MASKSWB_NARROW",
"NRCA4_MASKSWB_F212N",
"NRCA4_MASKSWB_F182M",
],
"NRCA5_41STRIPE1_DHS_F322W2"
]
+ [
"NRCA5_82STRIPE2_DHS_F322W2"
]
+ [
"NRCA5_164STRIPE4_DHS_F322W2"
]
+ [
"NRCA5_260STRIPE4_DHS_F322W2"
]
+ [
"NRCA4_41STRIPE1_DHS_F322W2"
]
+ [
"NRCA4_82STRIPE2_DHS_F322W2"
]
+ [
"NRCA4_164STRIPE4_DHS_F322W2"
]
+ [
"NRCA4_260STRIPE4_DHS_F322W2"
]
+ [
"NRCA2_41STRIPE1_DHS_F322W2"
]
+ [
"NRCA2_82STRIPE2_DHS_F322W2"
]
+ [
"NRCA2_164STRIPE4_DHS_F322W2"
]
+ [
"NRCA2_260STRIPE4_DHS_F322W2"
]
+ [
"NRCA1_41STRIPE1_DHS_F322W2"
]
+ [
"NRCA1_82STRIPE2_DHS_F322W2"
]
+ [
"NRCA1_164STRIPE4_DHS_F322W2"
]
+ [
"NRCA1_260STRIPE4_DHS_F322W2"
]
+ [
"NRCA3_41STRIPE1_DHS_F322W2"
]
+ [
"NRCA3_82STRIPE2_DHS_F322W2"
]
+ [
"NRCA3_164STRIPE4_DHS_F322W2"
]
+ [
"NRCA3_260STRIPE4_DHS_F322W2"
]
,
["NRCALL_DHS_F444W"]
+ [
"NRCA5_41STRIPE1_DHS_F444W"
]
+ [
"NRCA5_82STRIPE2_DHS_F444W"
]
+ [
"NRCA5_164STRIPE4_DHS_F444W"
]
+ [
"NRCA5_260STRIPE4_DHS_F444W"
]
+ [
"NRCA4_41STRIPE1_DHS_F444W"
]
+ [
"NRCA4_82STRIPE2_DHS_F444W"
]
+ [
"NRCA4_164STRIPE4_DHS_F444W"
]
+ [
"NRCA4_260STRIPE4_DHS_F444W"
]
+ [
"NRCA2_41STRIPE1_DHS_F444W"
]
+ [
"NRCA2_82STRIPE2_DHS_F444W"
]
+ [
"NRCA2_164STRIPE4_DHS_F444W"
]
+ [
"NRCA2_260STRIPE4_DHS_F444W"
]
+ [
"NRCA1_41STRIPE1_DHS_F444W"
]
+ [
"NRCA1_82STRIPE2_DHS_F444W"
]
+ [
"NRCA1_164STRIPE4_DHS_F444W"
]
+ [
"NRCA1_260STRIPE4_DHS_F444W"
]
+ [
"NRCA3_41STRIPE1_DHS_F444W"
]
+ [
"NRCA3_82STRIPE2_DHS_F444W"
]
+ [
"NRCA3_164STRIPE4_DHS_F444W"
]
+ [
"NRCA3_260STRIPE4_DHS_F444W"
]

]

for selected_aperture_name in selected_aperture_names:
Expand All @@ -605,6 +678,7 @@
tags=tags,
selected_aperture_name=selected_aperture_name,
mark_ref=True,
ylimits=(-499,-491),
filename_appendix=selected_aperture_name[0],
label=True,
)
Expand Down
55 changes: 45 additions & 10 deletions pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,16 +183,51 @@
# Grism Time Series, DHS (Module-A)
NRCA5_TADHSTS32 , SUBARRAY , 863.5 , 1031.5 , 32 , 32 , 16.5 , 16.5 , NRCA5_FULL , default
NRCA5_TADHSTS32_F405N , SUBARRAY , 863.43 , 1031.85 , 32 , 32 , 16.5 , 16.5 , NRCA5_FULL , default
NRCA5_TADHSTS_SCI_F322W2 , ROI , 468.0 , 1046.5 , 32 , 32 , 16.0 , 16.5 , NRCA5_FULL , default
NRCA5_TADHSTS_SCI_F444W , ROI , 1191.0 , 1046.5 , 32 , 32 , 16.0 , 16.5 , NRCA5_FULL , default
NRCA5_40STRIPE1_DHS_F322W2 , SUBARRAY , 468.0 , 1024.5 , 2048 , 36 , 1581.0 , 18.5 , NRCA5_FULL , default
NRCA5_80STRIPE2_DHS_F322W2 , SUBARRAY , 468.0 , 1024.5 , 2048 , 38 , 1581.0 , 19.5 , NRCA5_FULL , default
NRCA5_160STRIPE4_DHS_F322W2 , SUBARRAY , 468.0 , 1024.5 , 2048 , 39 , 1581.0 , 20.5 , NRCA5_FULL , default
NRCA5_256STRIPE4_DHS_F322W2 , SUBARRAY , 468.0 , 1024.5 , 2048 , 63 , 1581.0 , 32.5 , NRCA5_FULL , default
NRCA5_40STRIPE1_DHS_F444W , SUBARRAY , 1191.0 , 1024.5 , 2048 , 36 , 858.0 , 18.5 , NRCA5_FULL , default
NRCA5_80STRIPE2_DHS_F444W , SUBARRAY , 1191.0 , 1024.5 , 2048 , 38 , 858.0 , 19.5 , NRCA5_FULL , default
NRCA5_160STRIPE4_DHS_F444W , SUBARRAY , 1191.0 , 1024.5 , 2048 , 39 , 858.0 , 20.5 , NRCA5_FULL , default
NRCA5_256STRIPE4_DHS_F444W , SUBARRAY , 1191.0 , 1024.5 , 2048 , 63 , 858.0 , 32.5 , NRCA5_FULL , default
NRCA5_TADHSTS_SCI_F322W2 , ROI , 465.0 , 1015.7 , 32 , 32 , 16.0 , 16.5 , NRCA5_FULL , default
NRCA5_TADHSTS_SCI_F444W , ROI , 1187.0 , 1011.7 , 32 , 32 , 16.0 , 16.5 , NRCA5_FULL , default
NRCA5_41STRIPE1_DHS_F444W , SUBARRAY , 1187.0 , 993.7 , 2048 , 40 , 862.0 , 20.5 , NRCA5_FULL , default
NRCA5_82STRIPE2_DHS_F444W , SUBARRAY , 1187.0 , 993.7 , 2048 , 40 , 862.0 , 20.5 , NRCA5_FULL , default
NRCA5_164STRIPE4_DHS_F444W , SUBARRAY , 1187.0 , 993.7 , 2048 , 40 , 862.0 , 20.5 , NRCA5_FULL , default
NRCA5_260STRIPE4_DHS_F444W , SUBARRAY , 1187.0 , 993.7 , 2048 , 64 , 862.0 , 32.5 , NRCA5_FULL , default
NRCA4_41STRIPE1_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA4_FULL , DHS
NRCA4_82STRIPE2_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA4_FULL , DHS
NRCA4_164STRIPE4_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA4_FULL , DHS
NRCA4_260STRIPE4_DHS_F444W , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA4_FULL , DHS
NRCA2_41STRIPE1_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA2_FULL , DHS
NRCA2_82STRIPE2_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA2_FULL , DHS
NRCA2_164STRIPE4_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA2_FULL , DHS
NRCA2_260STRIPE4_DHS_F444W , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA2_FULL , DHS
NRCA1_41STRIPE1_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA1_FULL , DHS
NRCA1_82STRIPE2_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA1_FULL , DHS
NRCA1_164STRIPE4_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA1_FULL , DHS
NRCA1_260STRIPE4_DHS_F444W , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA1_FULL , DHS
NRCA3_41STRIPE1_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA3_FULL , DHS
NRCA3_82STRIPE2_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA3_FULL , DHS
NRCA3_164STRIPE4_DHS_F444W , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA3_FULL , DHS
NRCA3_260STRIPE4_DHS_F444W , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA3_FULL , DHS
NRCA5_41STRIPE1_DHS_F322W2 , SUBARRAY , 465.0 , 993.7 , 2048 , 40 , 1584.0 , 20.5 , NRCA5_FULL , default
NRCA5_82STRIPE2_DHS_F322W2 , SUBARRAY , 465.0 , 993.7 , 2048 , 40 , 1584.0 , 20.5 , NRCA5_FULL , default
NRCA5_164STRIPE4_DHS_F322W2 , SUBARRAY , 465.0 , 993.7 , 2048 , 40 , 1584.0 , 20.5 , NRCA5_FULL , default
NRCA5_260STRIPE4_DHS_F322W2 , SUBARRAY , 465.0 , 993.7 , 2048 , 64 , 1584.0 , 32.5 , NRCA5_FULL , default
NRCA4_41STRIPE1_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA4_FULL , DHS
NRCA4_82STRIPE2_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA4_FULL , DHS
NRCA4_164STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA4_FULL , DHS
NRCA4_260STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA4_FULL , DHS
NRCA2_41STRIPE1_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA2_FULL , DHS
NRCA2_82STRIPE2_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA2_FULL , DHS
NRCA2_164STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA2_FULL , DHS
NRCA2_260STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA2_FULL , DHS
NRCA1_41STRIPE1_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA1_FULL , DHS
NRCA1_82STRIPE2_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA1_FULL , DHS
NRCA1_164STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA1_FULL , DHS
NRCA1_260STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA1_FULL , DHS
NRCA3_41STRIPE1_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA3_FULL , DHS
NRCA3_82STRIPE2_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA3_FULL , DHS
NRCA3_164STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2024.5 , 2048 , 40 , 1024.5 , 24.5 , NRCA3_FULL , DHS
NRCA3_260STRIPE4_DHS_F322W2 , ROI , 1024.5 , 2012.5 , 2048 , 64 , 1024.5 , 36.5 , NRCA3_FULL , DHS

# AperName , AperType , XDetRef , YDetRef , XSciSize , YSciSize , XSciRef , YSciRef , parent_apertures , dependency_type

# WFSC / MIMF Field Points (Module-A)
NRCA3_DHSPIL , FULLSCA , 1084.0 , 1194.0 , 2048 , 2048 , 965.0 , 1194.0 , NRCA3_FULL , default
NRCA3_DHSPIL_SUB96 , SUBARRAY , 1084.0 , 1194.0 , 96 , 96 , 48.0 , 49.0 , NRCA3_FULL , default
Expand Down
12 changes: 12 additions & 0 deletions pysiaf/source_data/NIRCam/nircam_siaf_dhs_offsets.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# NIRCam detector parameter definition file for SIAF
#
# This file contains the dos offsets.
#
# Generated 2025-05-
# by pbennet
#
name , v2_offset , v3_offset
NRCA4 , 0.0000000 , -4.4620005
NRCA3 , 0.0000000 , 1.2025858
NRCA2 , 0.0000000 , -4.7070388
NRCA1 , 0.0000000 , 0.9079181