Merge pull request #302 from mfixstsci/siaf-updates

Update pysiaf with PRDOPSSOC-062
spacetelescope · Jul 17, 2023 · 89c9cb6 · 89c9cb6
2 parents 247e7bf + ed5c89f
commit 89c9cb6
Show file tree

Hide file tree

Showing 16 changed files with 88,276 additions and 193 deletions.
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/FGS_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/FGS_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/MIRI_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/MIRI_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/NIRCam_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/NIRCam_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/NIRISS_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/NIRISS_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/NIRSpec_SIAF.xlsx b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/Excel/NIRSpec_SIAF.xlsx
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/FGS_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/FGS_SIAF.xml
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/MIRI_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/MIRI_SIAF.xml
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/NIRCam_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/NIRCam_SIAF.xml
diff --git a/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/NIRISS_SIAF.xml b/pysiaf/prd_data/JWST/PRDOPSSOC-062/SIAFXML/SIAFXML/NIRISS_SIAF.xml
diff --git a/...re_delivery_data/NIRSpec/NIRSpec_SIAF.xml → ...SSOC-062/SIAFXML/SIAFXML/NIRSpec_SIAF.xml b/...re_delivery_data/NIRSpec/NIRSpec_SIAF.xml → ...SSOC-062/SIAFXML/SIAFXML/NIRSpec_SIAF.xml
diff --git a/pysiaf/pre_delivery_data/.DS_Store b/pysiaf/pre_delivery_data/.DS_Store
diff --git a/pysiaf/pre_delivery_data/NIRSpec/NIRSpec_SIAF.xlsx b/pysiaf/pre_delivery_data/NIRSpec/NIRSpec_SIAF.xlsx
diff --git a/pysiaf/pre_delivery_data/NIRSpec/nirspec_diff_PRDOPSSOC-059_pre_delivery.txt b/pysiaf/pre_delivery_data/NIRSpec/nirspec_diff_PRDOPSSOC-059_pre_delivery.txt
diff --git a/pysiaf/pre_delivery_data/NIRSpec/nirspec_roundtrip_PRDOPSSOC-059_pre_delivery.txt b/pysiaf/pre_delivery_data/NIRSpec/nirspec_roundtrip_PRDOPSSOC-059_pre_delivery.txt
diff --git a/pysiaf/source_data/MIRI/delivery/miri_siaf_aperture_definition.txt b/pysiaf/source_data/MIRI/delivery/miri_siaf_aperture_definition.txt
@@ -9,6 +9,7 @@
 #
 # Subarray locations are updated 2022-04-29 by D. Law based on new information from M. Ressler (JSOCOPS-97)
 # Updated Coron centers 2022-10-03 by D. Law and M. Libralato (JSOCOPS-60)
+# Added full-array versions of 1065,1140,1550,Lyot MASK apertures 2023-03-08 by D. Law (JSOCINT-614)
 #
 # MRS apertures, MIRIM_SLIT updated 2022-05-28 by D. Law based on FLT-1 distortion solution
 # MRS apertures updated 2022-08-01 by D. Law based on FLT-3 distortion solution
@@ -44,6 +45,10 @@
        MIRIM_MASK1140 ,  SUBARRAY ,    None     ,         -1 ,  120.748 ,  355.236 ,       288 ,       224 ,       1 ,     243 , 120.748 , 113.236 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
        MIRIM_MASK1550 ,  SUBARRAY ,    None     ,         -1 ,  120.746 ,  576.289 ,       288 ,       224 ,       1 ,     463 , 120.746 , 114.289 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
        MIRIM_MASKLYOT ,  SUBARRAY ,    None     ,         -1 ,  144.331 ,  885.880 ,       320 ,       304 ,       1 ,     719 , 144.331 , 167.880 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
+       MIRIM_FULL1065 ,   FULLSCA ,    None     ,         -1 ,  121.184 ,  133.116 ,      1032 ,      1024 ,       1 ,       1 , 121.184 , 133.116 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
+       MIRIM_FULL1140 ,   FULLSCA ,    None     ,         -1 ,  120.748 ,  355.236 ,      1032 ,      1024 ,       1 ,       1 , 120.748 , 355.236 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
+       MIRIM_FULL1550 ,   FULLSCA ,    None     ,         -1 ,  120.746 ,  576.289 ,      1032 ,      1024 ,       1 ,       1 , 120.746 , 576.289 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
+       MIRIM_FULLLYOT ,   FULLSCA ,    None     ,         -1 ,  144.331 ,  885.880 ,      1032 ,      1024 ,       1 ,       1 , 144.331 , 885.880 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
           MIRIM_TAMRS ,       ROI ,    None     ,         -1 ,    997.5 ,    993.5 ,        48 ,        48 ,     974 ,     970 ,    24.5 ,    24.5 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
           MIRIM_TALRS ,       ROI ,    None     ,         -1 ,    413.5 ,    289.5 ,        48 ,        48 ,     390 ,     266 ,    24.5 ,    24.5 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None
         MIRIM_TABLOCK ,       ROI ,    None     ,         -1 ,    267.5 ,    427.5 ,        32 ,        32 ,     252 ,     412 ,    16.5 ,    16.5 ,             None ,            None ,        None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None ,      None

diff --git a/pysiaf/source_data/NIRSpec/delivery/positionsSIAFApertures.fits b/pysiaf/source_data/NIRSpec/delivery/positionsSIAFApertures.fits