Merge branch 'main' into update/actions

spacetelescope · Sep 13, 2024 · 294e856 · 294e856
2 parents 9e90855 + 56fe105
commit 294e856
Show file tree

Hide file tree

Showing 12 changed files with 99,447 additions and 196 deletions.
diff --git a/generate/generate_nircam.py b/generate/generate_nircam.py
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/FGS_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/FGS_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/MIRI_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/MIRI_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/NIRCam_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/NIRCam_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/NIRISS_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/NIRISS_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/NIRSpec_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/Excel/NIRSpec_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/FGS_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/FGS_SIAF.xml
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/MIRI_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/MIRI_SIAF.xml
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/NIRCam_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/NIRCam_SIAF.xml
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/NIRISS_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/NIRISS_SIAF.xml
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/NIRSpec_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-067/SIAFXML/SIAFXML/NIRSpec_SIAF.xml
diff --git a/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt b/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt
@@ -180,6 +180,19 @@
             NRCB4_GRISMTS256 , SUBARRAY ,  1046.0 ,   176.0 ,     2048 ,      256 ,  1003.0 ,   176.0 ,              NRCB4_FULL; NRCB5_GRISM256_F322W2 ,     grism_ts_sw
             NRCB4_GRISMTS128 , SUBARRAY ,  1046.0 ,   176.0 ,     2048 ,      128 ,  1003.0 ,    65.0 ,              NRCB4_FULL; NRCB5_GRISM128_F322W2 ,     grism_ts_sw
              NRCB4_GRISMTS64 , SUBARRAY ,  1046.0 ,   176.0 ,     2048 ,       64 ,  1003.0 ,    33.0 ,               NRCB4_FULL; NRCB5_GRISM64_F322W2 ,     grism_ts_sw
+# 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
 # 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
@@ -191,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