From 0e32388a8a7cd8b44fd26b54c1ddda3da25df0e9 Mon Sep 17 00:00:00 2001 From: "Brett M. Morris" Date: Wed, 27 Nov 2024 15:34:57 -0500 Subject: [PATCH 1/2] fix deprecation warnings from importlib and numpy --- pysiaf/iando/read.py | 4 ++-- pysiaf/tests/test_polynomial.py | 4 ++-- pysiaf/utils/polynomial.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pysiaf/iando/read.py b/pysiaf/iando/read.py index c4d5d790..33c1f0aa 100644 --- a/pysiaf/iando/read.py +++ b/pysiaf/iando/read.py @@ -641,8 +641,8 @@ def read_roman_siaf(siaf_file=None): from pysiaf import specpars if not siaf_file: - with importlib_resources.path('pysiaf.prd_data.Roman', - 'roman_siaf.xml') as siaf_file: + source = importlib_resources.files('pysiaf.prd_data.Roman').joinpath('roman_siaf.xml') + with importlib_resources.as_file(source) as siaf_file: siaf_file = str(siaf_file) else: siaf_file = str(siaf_file) diff --git a/pysiaf/tests/test_polynomial.py b/pysiaf/tests/test_polynomial.py index 72517aa9..dc4120f2 100644 --- a/pysiaf/tests/test_polynomial.py +++ b/pysiaf/tests/test_polynomial.py @@ -17,9 +17,9 @@ def makeup_polynomial(order = 5): a = np.zeros(terms) np.random.seed(seed=1) - a[1] = 0.05 + 0.01 * np.random.rand(1) + a[1] = 0.05 + 0.01 * np.random.rand() np.random.seed(seed=2) - a[2] = 0.0001 * np.random.rand(1) + a[2] = 0.0001 * np.random.rand() np.random.seed(seed=3) a[3:6] = 1.0e-7 * np.random.rand(3) np.random.seed(seed=4) diff --git a/pysiaf/utils/polynomial.py b/pysiaf/utils/polynomial.py index b88aa9c9..2d6e64da 100644 --- a/pysiaf/utils/polynomial.py +++ b/pysiaf/utils/polynomial.py @@ -545,7 +545,7 @@ def prepend_rotation_to_polynomial(a, theta, verbose=False): for j in range(m-n-mu, m-mu+1): factor = (-1)**(m-n-mu) * choose(m-j, mu) * choose(j, m-n-mu) cosSin = c**(j+2*mu-m+n) * s**(2*m-2*mu-j-n) - atrotate[m, n] = atrotate[m, n] + factor * cosSin * at[m, j] + atrotate[m, n] = np.squeeze(atrotate[m, n] + factor * cosSin * at[m, j]) if verbose: print(m, n, j, factor, 'cos^', j+2*mu-m+n, 'sin^', 2*m-2*mu-j-n, ' A', m, j) # Put back in linear layout From ad639e9d3e4a118d43080715d2c31e24583a8fd0 Mon Sep 17 00:00:00 2001 From: Douglas Long Date: Mon, 10 Feb 2025 18:29:25 -0500 Subject: [PATCH 2/2] Added updated files from Paul Bennet for JWSTSIAF-284 --- generate/generate_nircam.py | 43 +++++++------------ .../nircam_siaf_aperture_definition.txt | 20 ++++----- 2 files changed, 25 insertions(+), 38 deletions(-) diff --git a/generate/generate_nircam.py b/generate/generate_nircam.py index 88289074..09c8d08e 100644 --- a/generate/generate_nircam.py +++ b/generate/generate_nircam.py @@ -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: diff --git a/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt b/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt index 373cf86e..e7c0b542 100644 --- a/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt +++ b/pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt @@ -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