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

Update pysiaf with PRDOPSSOC-065 #334

Merged
merged 19 commits into from
Mar 1, 2024
Merged

Update pysiaf with PRDOPSSOC-065 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ab958f3
Merge pull request #325 from mfixstsci/release-0.21.0
mfixstsci Oct 28, 2023
180e0ec
Updated alignment files for FGS2 and NIRISS, and ran generate_fgs.py …
tonysohn Oct 30, 2023
8015116
Merge branch 'siaf-updates' into niriss_fgs2_siaf_updates
Witchblade101 Oct 30, 2023
366ba5c
Merge pull request #327 from tonysohn/niriss_fgs2_siaf_updates
Witchblade101 Oct 30, 2023
15926d9
Updating the distortion coefficients for imaging
Nov 29, 2023
98d6506
Hand edited the position of all the masks in the primary channel. Aft…
Nov 29, 2023
86b799e
Adding the new distortion coefficients for the coronagraphic BAR and …
Nov 30, 2023
7ef4dbe
Adding the new alignment file with updated reference positions and an…
Dec 1, 2023
a2107ef
The NRCA3 distortions file had a mistake and was newly produced. Deli…
Dec 1, 2023
04d4f21
Modified the secondary apertures entries for coronagraphy in the aper…
Dec 1, 2023
25f5333
Fixed a few minor glitches with the secondary coron apertures in the …
Dec 1, 2023
3be926b
Centered the B1 *P* apertures onto the B5 ones, the latter are the on…
Dec 1, 2023
739d39c
Modified the generate_nircam script, plotting part, to plot diagnosti…
Dec 1, 2023
df620a5
Merge pull request #328 from mgennaro/JSOCOPS-164_165_166
Witchblade101 Dec 1, 2023
74f2b29
Updated with Dec 2023 Roman SIAF
Witchblade101 Mar 1, 2024
b165a59
Merge branch 'siaf-updates' into roman_update
Witchblade101 Mar 1, 2024
b9a0568
Merge pull request #333 from Witchblade101/roman_update
Witchblade101 Mar 1, 2024
364a599
Merge remote-tracking branch 'upstream/main' into siaf-updates
mfixstsci Mar 1, 2024
380ed2b
Adding PRDOPSSOC-065
mfixstsci Mar 1, 2024
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
38 changes: 14 additions & 24 deletions generate/generate_nircam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,30 +388,20 @@

create_jira_plots = True
if create_jira_plots:
# # make figures for JWSTSIAF-189 Jira ticket
selected_aperture_names = [['NRCA2_MASK210R', 'NRCA5_MASK210R','NRCA2_FULL_MASK210R', 'NRCA5_FULL_MASK210R'],
['NRCA5_MASK335R', 'NRCA2_MASK335R','NRCA5_FULL_MASK335R', 'NRCA2_FULL_MASK335R','NRCA5_MASK430R', 'NRCA2_MASK430R',
'NRCA5_FULL_MASK430R', 'NRCA2_FULL_MASK430R'],
['NRCA4_MASKSWB', 'NRCA5_MASKSWB','NRCA4_MASKSWB_F182M', 'NRCA5_MASKSWB_F182M','NRCA4_MASKSWB_F187N',
'NRCA5_MASKSWB_F187N','NRCA4_MASKSWB_F210M', 'NRCA5_MASKSWB_F210M','NRCA4_MASKSWB_F212N',
'NRCA5_MASKSWB_F212N','NRCA4_MASKSWB_F200W', 'NRCA5_MASKSWB_F200W','NRCA4_MASKSWB_NARROW', 'NRCA5_MASKSWB_NARROW'],
['NRCA4_FULL_MASKSWB', 'NRCA5_FULL_MASKSWB','NRCA4_FULL_MASKSWB_F182M', 'NRCA5_FULL_MASKSWB_F182M','NRCA4_FULL_MASKSWB_F187N',
'NRCA5_FULL_MASKSWB_F187N','NRCA4_FULL_MASKSWB_F210M', 'NRCA5_FULL_MASKSWB_F210M','NRCA4_FULL_MASKSWB_F212N', 'NRCA5_FULL_MASKSWB_F212N',
'NRCA4_FULL_MASKSWB_F200W', 'NRCA5_FULL_MASKSWB_F200W','NRCA4_FULL_MASKSWB_NARROW', 'NRCA5_FULL_MASKSWB_NARROW'],
['NRCA5_400X256_MASKLWB', 'NRCA4_400X256_MASKLWB','NRCA5_400X256_MASKLWB_F250M', 'NRCA4_400X256_MASKLWB_F250M',
'NRCA5_400X256_MASKLWB_F300M', 'NRCA4_400X256_MASKLWB_F300M','NRCA5_400X256_MASKLWB_F277W', 'NRCA4_400X256_MASKLWB_F277W',
'NRCA5_400X256_MASKLWB_F335M', 'NRCA4_400X256_MASKLWB_F335M','NRCA5_400X256_MASKLWB_F360M', 'NRCA4_400X256_MASKLWB_F360M',
'NRCA5_400X256_MASKLWB_F356W', 'NRCA4_400X256_MASKLWB_F356W','NRCA5_400X256_MASKLWB_F410M', 'NRCA4_400X256_MASKLWB_F410M',
'NRCA5_400X256_MASKLWB_F430M', 'NRCA4_400X256_MASKLWB_F430M','NRCA5_400X256_MASKLWB_F460M', 'NRCA4_400X256_MASKLWB_F460M',
'NRCA5_400X256_MASKLWB_F480M', 'NRCA4_400X256_MASKLWB_F480M','NRCA5_400X256_MASKLWB_F444W', 'NRCA4_400X256_MASKLWB_F444W',
'NRCA5_400X256_MASKLWB_NARROW', 'NRCA4_400X256_MASKLWB_NARROW'],
['NRCA5_FULL_MASKLWB', 'NRCA4_FULL_MASKLWB','NRCA5_FULL_MASKLWB_F250M', 'NRCA4_FULL_MASKLWB_F250M',
'NRCA5_FULL_MASKLWB_F300M', 'NRCA4_FULL_MASKLWB_F300M','NRCA5_FULL_MASKLWB_F277W', 'NRCA4_FULL_MASKLWB_F277W',
'NRCA5_FULL_MASKLWB_F335M', 'NRCA4_FULL_MASKLWB_F335M','NRCA5_FULL_MASKLWB_F360M', 'NRCA4_FULL_MASKLWB_F360M',
'NRCA5_FULL_MASKLWB_F356W', 'NRCA4_FULL_MASKLWB_F356W','NRCA5_FULL_MASKLWB_F410M', 'NRCA4_FULL_MASKLWB_F410M',
'NRCA5_FULL_MASKLWB_F430M', 'NRCA4_FULL_MASKLWB_F430M','NRCA5_FULL_MASKLWB_F460M', 'NRCA4_FULL_MASKLWB_F460M',
'NRCA5_FULL_MASKLWB_F480M', 'NRCA4_FULL_MASKLWB_F480M','NRCA5_FULL_MASKLWB_F444W', 'NRCA4_FULL_MASKLWB_F444W',
'NRCA5_FULL_MASKLWB_NARROW', 'NRCA4_FULL_MASKLWB_NARROW']
# # make figures for JSOCOPS-164-165-166 Jira ticket
selected_aperture_names = [['NRCALL']+['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']
]

for selected_aperture_name in selected_aperture_names:
Expand Down
Binary file added pysiaf/prd_data/JWST/PRDOPSSOC-065/SIAFXML/Excel/FGS_SIAF.xlsx
View file
Open in desktop
Binary file not shown.
Binary file added pysiaf/prd_data/JWST/PRDOPSSOC-065/SIAFXML/Excel/MIRI_SIAF.xlsx
View file
Open in desktop
Binary file not shown.
Binary file added pysiaf/prd_data/JWST/PRDOPSSOC-065/SIAFXML/Excel/NIRCam_SIAF.xlsx
View file
Open in desktop
Binary file not shown.
Binary file added pysiaf/prd_data/JWST/PRDOPSSOC-065/SIAFXML/Excel/NIRISS_SIAF.xlsx
View file
Open in desktop
Binary file not shown.
Binary file added pysiaf/prd_data/JWST/PRDOPSSOC-065/SIAFXML/Excel/NIRSpec_SIAF.xlsx
View file
Open in desktop
Binary file not shown.
Loading
Loading