diff --git a/generate/generate_nircam.py b/generate/generate_nircam.py index 8a6afd0d..b4642a6f 100644 --- a/generate/generate_nircam.py +++ b/generate/generate_nircam.py @@ -388,13 +388,15 @@ create_jira_plots = True if create_jira_plots: - # # make figures for JWSTSIAF-156 Jira ticket - selected_aperture_names = [['NRCA5_TADHSTS32','NRCA5_TADHS32TS_F405N'], + # # make figures for JWSTSIAF-276 Jira ticket and for JWSTSIAF-156 + selected_aperture_names = [['NRCA3_FP1','NRCA3_FP1_SUB8','NRCA3_FP1_SUB64'], + ['NRCA1_FP6','NRCA1_FP6_SUB8','NRCA1_FP6_SUB64','NRCA1_FP3MIMF'], + ['NRCA5_TADHSTS32','NRCA5_TADHS32TS_F405N'], ['NRCA5_TADHSTS_SCI_F322W2','NRCA5_TADHSTS_SCI_F444W','NRCA5_TADHSTS32','NRCA5_FULL'], ['NRCA5_40STRIPE1_DHS_F322W2','NRCA5_80STRIPE2_DHS_F322W2','NRCA5_160STRIPE4_DHS_F322W2','NRCA5_256STRIPE4_DHS_F322W2'], ['NRCA5_40STRIPE1_DHS_F444W', 'NRCA5_80STRIPE2_DHS_F444W', 'NRCA5_160STRIPE4_DHS_F444W', 'NRCA5_256STRIPE4_DHS_F444W'], ['NRCA5_FULL','NRCA5_160STRIPE4_DHS_F322W2','NRCA5_160STRIPE4_DHS_F444W'] - ] + ] for selected_aperture_name in selected_aperture_names: compare.compare_inspection_figures(pre_delivery_siaf, reference_siaf_input=ref_siaf, diff --git a/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt b/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt index 0bd4a4d9..373cf86e 100644 --- a/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt +++ b/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt @@ -204,6 +204,9 @@ NRCA1_FP3MIMF , FULLSCA , 1818.0 , 229.0 , 2048 , 2048 , 231.0 , 229.0 , NRCA1_FULL , default NRCA2_FP4MIMF , FULLSCA , 229.0 , 229.0 , 2048 , 2048 , 229.0 , 1820.0 , NRCA2_FULL , default NRCA4_FP5MIMF , FULLSCA , 1704.0 , 345.0 , 2048 , 2048 , 1704.0 , 1704.0 , NRCA4_FULL , default + NRCA1_FP6 , FULLSCA , 220.5 , 1813.5 , 2048 , 2048 , 1828.5 , 1813.5 , NRCA1_FULL , default + NRCA1_FP6_SUB8 , SUBARRAY , 220.5 , 1813.5 , 8 , 8 , 4.5 , 4.5 , NRCA1_FULL , default + NRCA1_FP6_SUB64 , SUBARRAY , 220.5 , 1813.5 , 64 , 64 , 32.5 , 32.5 , NRCA1_FULL , default # WFSC / MIMF Field Points (Module-B) NRCB4_DHSPIL , FULLSCA , 1003.0 , 1122.0 , 2048 , 2048 , 1046.0 , 1122.0 , NRCB4_FULL , default NRCB4_DHSPIL_SUB96 , SUBARRAY , 1003.0 , 1122.0 , 96 , 96 , 48.0 , 49.0 , NRCB4_FULL , default diff --git a/relic b/relic deleted file mode 160000 index d5fc7bf6..00000000 --- a/relic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d5fc7bf6dbe01eb89de3ff5c2f6cfec2b4a6047d