diff --git a/generate/generate_nircam.py b/generate/generate_nircam.py index fed2c6fe..32496293 100644 --- a/generate/generate_nircam.py +++ b/generate/generate_nircam.py @@ -388,20 +388,9 @@ create_jira_plots = True if create_jira_plots: - # # 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'] + # # make figures for JSOCOPS-276 Jira ticket + selected_aperture_names = [['NRCA3_FP1','NRCA3_FP1_SUB8','NRCA3_FP1_SUB64'], + ['NRCA1_FP6','NRCA1_FP6_SUB8','NRCA1_FP6_SUB64','NRCA1_FP3MIMF'] ] for selected_aperture_name in selected_aperture_names: diff --git a/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xlsx b/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xlsx index f233147c..223e9c03 100644 Binary files a/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xlsx and b/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xlsx differ diff --git a/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xml b/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xml index 688d765c..7f163d90 100644 --- a/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xml +++ b/pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xml @@ -1,5 +1,5 @@ - + @@ -12002,6 +12002,366 @@ -1.535752558432540e-09 -1.292541590586392e-09 + + NIRCAM + NRCA1_FP6 + NRCA_CNTR + FULLSCA + QUAD + 2048 + 2048 + 220.50 + 1813.50 + 2048 + 2048 + 1828.50 + 1813.50 + 0.03099397 + 0.03114530 + 95.449438 + -503.021867 + -0.17249270 + -1 + 0 + -1 + -90.23179363 + -0.17249270 + -57.4350 + 6.8180 + 6.8073 + -56.5592 + -56.5145 + -56.9581 + 7.3104 + 7.5965 + 2014-01-01 + + 5 + -0.000000000000000e+00 + 3.099395679795427e-02 + 0.000000000000000e+00 + 1.470157004912349e-08 + -1.938348599114480e-07 + -3.269655435839287e-08 + -6.169036389725624e-12 + -6.933749102560765e-13 + 7.054397031003568e-12 + -1.316290627119628e-11 + -9.439712273034357e-15 + 1.675424583357310e-15 + -2.243732183488383e-15 + -2.402449727161794e-15 + -7.892395585170419e-15 + -1.831001773124550e-18 + 6.462095018362496e-19 + -4.505440780371859e-20 + -6.983474575874262e-20 + -6.040883807866748e-19 + -1.488896348270525e-18 + 0.000000000000000e+00 + -3.207864492838221e-05 + 3.114530326452716e-02 + 6.723128953200566e-08 + 5.083590158400067e-08 + -1.339825289868421e-07 + -5.181427812406002e-12 + 8.211497913411471e-12 + -3.319464005015762e-12 + -1.072314894553530e-11 + -6.584218774554674e-16 + 9.376069842622265e-16 + -9.791154462536369e-16 + -1.885194171344659e-15 + -1.108442222524362e-14 + 3.140387285884448e-19 + 2.337294297533558e-19 + 8.558098780135558e-19 + -3.890742700809280e-19 + -6.326851008878875e-19 + -1.577475756538732e-18 + 1.344831471215002e-04 + 3.226435325772827e+01 + 1.315998988271616e-05 + -4.902803365890791e-04 + 6.482665732434945e-03 + 1.085590448603243e-03 + 6.013671937526582e-06 + -4.010971063495604e-08 + -5.383668707957491e-06 + 1.426709625162352e-05 + 3.257436227317649e-07 + -6.062923359983957e-08 + 8.278177810139762e-08 + 8.024856717393448e-08 + 2.660570495037284e-07 + 2.030160994411747e-09 + -6.635877298760873e-10 + 1.296756008792065e-10 + 1.380126818599861e-10 + 7.313141435146692e-10 + 1.617169278697328e-09 + -2.769053389783949e-05 + 3.323068476834308e-02 + 3.210758004703323e+01 + -2.247600022492674e-03 + -1.671338588153453e-03 + 4.435271255082721e-03 + 5.910473420995697e-06 + -9.950729265261170e-06 + 2.654587566356847e-06 + 1.237525626609066e-05 + 2.656382692532531e-08 + -2.041371240244242e-08 + 3.672087795540185e-08 + 6.988271319515730e-08 + 3.751923291477098e-07 + -3.473416692546987e-10 + -1.726160797922748e-10 + -8.597110124481011e-10 + 5.126621722719357e-10 + 6.719831197743288e-10 + 1.806807251622440e-09 + + + NIRCAM + NRCA1_FP6_SUB8 + NRCA_CNTR + SUBARRAY + QUAD + 2048 + 2048 + 220.50 + 1813.50 + 8 + 8 + 4.50 + 4.50 + 0.03099397 + 0.03114530 + 95.449438 + -503.021867 + -0.17249270 + -1 + 0 + -1 + -90.23179363 + -0.17249270 + -0.1240 + 0.1240 + 0.1240 + -0.1240 + -0.1245 + -0.1247 + 0.1245 + 0.1247 + 2014-01-01 + + 5 + -0.000000000000000e+00 + 3.099395679795427e-02 + 0.000000000000000e+00 + 1.470157004912349e-08 + -1.938348599114480e-07 + -3.269655435839287e-08 + -6.169036389725624e-12 + -6.933749102560765e-13 + 7.054397031003568e-12 + -1.316290627119628e-11 + -9.439712273034357e-15 + 1.675424583357310e-15 + -2.243732183488383e-15 + -2.402449727161794e-15 + -7.892395585170419e-15 + -1.831001773124550e-18 + 6.462095018362496e-19 + -4.505440780371859e-20 + -6.983474575874262e-20 + -6.040883807866748e-19 + -1.488896348270525e-18 + 0.000000000000000e+00 + -3.207864492838221e-05 + 3.114530326452716e-02 + 6.723128953200566e-08 + 5.083590158400067e-08 + -1.339825289868421e-07 + -5.181427812406002e-12 + 8.211497913411471e-12 + -3.319464005015762e-12 + -1.072314894553530e-11 + -6.584218774554674e-16 + 9.376069842622265e-16 + -9.791154462536369e-16 + -1.885194171344659e-15 + -1.108442222524362e-14 + 3.140387285884448e-19 + 2.337294297533558e-19 + 8.558098780135558e-19 + -3.890742700809280e-19 + -6.326851008878875e-19 + -1.577475756538732e-18 + 1.344831471215002e-04 + 3.226435325772827e+01 + 1.315998988271616e-05 + -4.902803365890791e-04 + 6.482665732434945e-03 + 1.085590448603243e-03 + 6.013671937526582e-06 + -4.010971063495604e-08 + -5.383668707957491e-06 + 1.426709625162352e-05 + 3.257436227317649e-07 + -6.062923359983957e-08 + 8.278177810139762e-08 + 8.024856717393448e-08 + 2.660570495037284e-07 + 2.030160994411747e-09 + -6.635877298760873e-10 + 1.296756008792065e-10 + 1.380126818599861e-10 + 7.313141435146692e-10 + 1.617169278697328e-09 + -2.769053389783949e-05 + 3.323068476834308e-02 + 3.210758004703323e+01 + -2.247600022492674e-03 + -1.671338588153453e-03 + 4.435271255082721e-03 + 5.910473420995697e-06 + -9.950729265261170e-06 + 2.654587566356847e-06 + 1.237525626609066e-05 + 2.656382692532531e-08 + -2.041371240244242e-08 + 3.672087795540185e-08 + 6.988271319515730e-08 + 3.751923291477098e-07 + -3.473416692546987e-10 + -1.726160797922748e-10 + -8.597110124481011e-10 + 5.126621722719357e-10 + 6.719831197743288e-10 + 1.806807251622440e-09 + + + NIRCAM + NRCA1_FP6_SUB64 + NRCA_CNTR + SUBARRAY + QUAD + 2048 + 2048 + 220.50 + 1813.50 + 64 + 64 + 32.50 + 32.50 + 0.03099397 + 0.03114530 + 95.449438 + -503.021867 + -0.17249270 + -1 + 0 + -1 + -90.23179363 + -0.17249270 + -0.9920 + 0.9920 + 0.9916 + -0.9916 + -0.9956 + -0.9978 + 0.9956 + 0.9976 + 2014-01-01 + + 5 + -0.000000000000000e+00 + 3.099395679795427e-02 + 0.000000000000000e+00 + 1.470157004912349e-08 + -1.938348599114480e-07 + -3.269655435839287e-08 + -6.169036389725624e-12 + -6.933749102560765e-13 + 7.054397031003568e-12 + -1.316290627119628e-11 + -9.439712273034357e-15 + 1.675424583357310e-15 + -2.243732183488383e-15 + -2.402449727161794e-15 + -7.892395585170419e-15 + -1.831001773124550e-18 + 6.462095018362496e-19 + -4.505440780371859e-20 + -6.983474575874262e-20 + -6.040883807866748e-19 + -1.488896348270525e-18 + 0.000000000000000e+00 + -3.207864492838221e-05 + 3.114530326452716e-02 + 6.723128953200566e-08 + 5.083590158400067e-08 + -1.339825289868421e-07 + -5.181427812406002e-12 + 8.211497913411471e-12 + -3.319464005015762e-12 + -1.072314894553530e-11 + -6.584218774554674e-16 + 9.376069842622265e-16 + -9.791154462536369e-16 + -1.885194171344659e-15 + -1.108442222524362e-14 + 3.140387285884448e-19 + 2.337294297533558e-19 + 8.558098780135558e-19 + -3.890742700809280e-19 + -6.326851008878875e-19 + -1.577475756538732e-18 + 1.344831471215002e-04 + 3.226435325772827e+01 + 1.315998988271616e-05 + -4.902803365890791e-04 + 6.482665732434945e-03 + 1.085590448603243e-03 + 6.013671937526582e-06 + -4.010971063495604e-08 + -5.383668707957491e-06 + 1.426709625162352e-05 + 3.257436227317649e-07 + -6.062923359983957e-08 + 8.278177810139762e-08 + 8.024856717393448e-08 + 2.660570495037284e-07 + 2.030160994411747e-09 + -6.635877298760873e-10 + 1.296756008792065e-10 + 1.380126818599861e-10 + 7.313141435146692e-10 + 1.617169278697328e-09 + -2.769053389783949e-05 + 3.323068476834308e-02 + 3.210758004703323e+01 + -2.247600022492674e-03 + -1.671338588153453e-03 + 4.435271255082721e-03 + 5.910473420995697e-06 + -9.950729265261170e-06 + 2.654587566356847e-06 + 1.237525626609066e-05 + 2.656382692532531e-08 + -2.041371240244242e-08 + 3.672087795540185e-08 + 6.988271319515730e-08 + 3.751923291477098e-07 + -3.473416692546987e-10 + -1.726160797922748e-10 + -8.597110124481011e-10 + 5.126621722719357e-10 + 6.719831197743288e-10 + 1.806807251622440e-09 + NIRCAM NRCB4_DHSPIL diff --git a/pysiaf/pre_delivery_data/NIRCam/nircam_enhanced_siaf_aperture_definition.txt b/pysiaf/pre_delivery_data/NIRCam/nircam_enhanced_siaf_aperture_definition.txt index d77a3042..adeeef0b 100644 --- a/pysiaf/pre_delivery_data/NIRCam/nircam_enhanced_siaf_aperture_definition.txt +++ b/pysiaf/pre_delivery_data/NIRCam/nircam_enhanced_siaf_aperture_definition.txt @@ -191,6 +191,9 @@ NRCA1_FP3MIMF , FULLSCA , 1818.0 , 229.0 , 2048 , 2048 , 231.0 , 229.0 , 1 , 1 , 145.68940662431288 , -552.23628229404596 , NRCA1_FULL , default NRCA2_FP4MIMF , FULLSCA , 229.0 , 229.0 , 2048 , 2048 , 229.0 , 1820.0 , 1 , 1 , 144.02652410516976 , -435.15316281680396 , NRCA2_FULL , default NRCA4_FP5MIMF , FULLSCA , 1704.0 , 345.0 , 2048 , 2048 , 1704.0 , 1704.0 , 1 , 1 , 31.46728976754049 , -438.80198253141538 , NRCA4_FULL , default + NRCA1_FP6 , FULLSCA , 220.5 , 1813.5 , 2048 , 2048 , 1828.5 , 1813.5 , 1 , 1 , 95.44943833680915 , -503.02186694741960 , NRCA1_FULL , default + NRCA1_FP6_SUB8 , SUBARRAY , 220.5 , 1813.5 , 8 , 8 , 4.5 , 4.5 , 217 , 1810 , 95.44943833680915 , -503.02186694741960 , NRCA1_FULL , default + NRCA1_FP6_SUB64 , SUBARRAY , 220.5 , 1813.5 , 64 , 64 , 32.5 , 32.5 , 189 , 1782 , 95.44943833680915 , -503.02186694741960 , NRCA1_FULL , default # WFSC / MIMF Field Points (Module-B) NRCB4_DHSPIL , FULLSCA , 1003.0 , 1122.0 , 2048 , 2048 , 1046.0 , 1122.0 , 1 , 1 , -55.07609641610548 , -522.56985865284764 , NRCB4_FULL , default NRCB4_DHSPIL_SUB96 , SUBARRAY , 1003.0 , 1122.0 , 96 , 96 , 48.0 , 49.0 , 955 , 1074 , -55.07609641610548 , -522.56985865284764 , NRCB4_FULL , default