Skip to content

Commit

Permalink
Added updated files from Paul Bennet for JWSTSIAF-284
Browse files Browse the repository at this point in the history
  • Loading branch information
@Witchblade101
Witchblade101 committed Feb 10, 2025
1 parent 41cd1c9 commit ad639e9
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 38 deletions.
43 changes: 15 additions & 28 deletions generate/generate_nircam.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,43 +558,30 @@
for sca in ["1", "2", "3", "4", "5"]
],
[
"NRCA2_MASK210R",
"NRCA5_MASK210R",
"NRCA2_TAMASK210R",
"NRCA2_FSTAMASK210R",
"NRCA5_{}STRIPE{}_DHS_F322W2".format(pix,stripe)
for pix in ["41", "82", "164", "260"]
for stripe in ["1", "2", "3", "4"]
],
[
"NRCA5_MASK335R",
"NRCA2_MASK335R",
"NRCA5_TAMASK335R",
"NRCA5_FSTAMASK335R",
"NRCA5_{}STRIPE{}_DHS_F444W".format(pix,stripe)
for pix in ["41", "82", "164", "260"]
for stripe in ["1", "2", "3", "4"]
],
[
"NRCA5_MASK430R",
"NRCA2_MASK430R",
"NRCA5_TAMASK430R",
"NRCA5_FSTAMASK430R",
"NRCA5_{}STRIPE{}_DHS_F322W2".format(pix,stripe)
for pix in ["40", "80", "160", "256"]
for stripe in ["1", "2", "3", "4"]
],
[
"NRCA5_400X256_MASKLWB",
"NRCA4_400X256_MASKLWB",
"NRCA5_TAMASKLWB",
"NRCA5_TAMASKLWBL",
"NRCA5_FSTAMASKLWB",
"NRCA5_400X256_MASKLWB_NARROW",
"NRCA5_400X256_MASKLWB_F444W",
"NRCA5_400X256_MASKLWB_F250M",
"NRCA5_{}STRIPE{}_DHS_F444W".format(pix,stripe)
for pix in ["40", "80", "160", "256"]
for stripe in ["1", "2", "3", "4"]
],
[
"NRCA4_MASKSWB",
"NRCA5_MASKSWB",
"NRCA4_TAMASKSWB",
"NRCA4_TAMASKSWBS",
"NRCA4_FSTAMASKSWB",
"NRCA4_MASKSWB_NARROW",
"NRCA4_MASKSWB_F212N",
"NRCA4_MASKSWB_F182M",
"NRCA5_TADHSTS_SCI_{}".format(filter)
for filter in ["F322W2", "F444W"]
],

]

for selected_aperture_name in selected_aperture_names:
Expand Down
20 changes: 10 additions & 10 deletions pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,16 +183,16 @@
# 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_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
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
# 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

0 comments on commit ad639e9

Please sign in to comment.