diff --git a/pysiaf/source_data/NIRCam/nircam_siaf_alignment.txt b/pysiaf/source_data/NIRCam/nircam_siaf_alignment.txt index dd4630dd..6f57bd8b 100644 --- a/pysiaf/source_data/NIRCam/nircam_siaf_alignment.txt +++ b/pysiaf/source_data/NIRCam/nircam_siaf_alignment.txt @@ -3,45 +3,34 @@ # This file contains the focal plane alignment parameters of master apertures calibrated # during FGS-SI alignment. # -# Generated 2022-02-26 -# by tsohn, sosborne -# ######## -# Modified 2022-05-09 -# by gennaro +# This version is based on the calibration programs PID 1476, 4447 (Cycle 1,2, resp.) +# Both the coronagraphic and the imaging master apertures have been modified as a result # -# Aligned the coronographic apertures to the imaging apertures - modified by tsohn, sosborne according to the OTE-10-. -# Now the offsets between coron and imaging apertures at fixed SCA are the same as in pre-flight -######## -# Modified 2022-06-29 -# by gennaro +# Analysis by rest, jirard, gennaro, hilbert # -# Tweaked the NRCA5_FULL_WEDGE_RND and NRCA5_FULL_WEDGE_BAR apertures to account for the PW tuning changes, AR-1325 -# The new alignment parameters are derived by shifting the previous version of these master apertures by the amount -# of (v2,V3) offset induced by the change in the PW clocking -######### -# Modified 2022-07-02 +# Generated 2023-11-30 # by gennaro -# -# Changed all the values for imaging, see JWSTSIAF-247 ######## AperName , V3IdlYAngle , V3SciXAngle , V3SciYAngle , V2Ref , V3Ref - NRCA1_FULL , -0.54644233000000 , -90.49420618873330 , -0.54644233000000 , 120.620865 ,-527.541137 - NRCA2_FULL , -0.19929500000000 , -90.26916134896717 , -0.19929500000000 , 119.789141 ,-459.825901 - NRCA3_FULL , 0.29449167000000 , -89.96143999037700 , 0.29449167000000 , 51.990953 ,-527.961173 - NRCA4_FULL , 0.10121920000000 , -89.94238433537600 , 0.10121920000000 , 52.408588 ,-459.935393 - NRCA5_FULL , -0.05489300000000 , -90.14291957363440 , -0.05489300000000 , 85.939298 ,-493.510653 - NRCB1_FULL , 0.34507233000000 , -89.58047630911983 , 0.34507233000000 , -122.378903 ,-457.730818 - NRCB2_FULL , 0.84980533000000 , -89.21610635579422 , 0.84980533000000 , -122.635577 ,-525.443870 - NRCB3_FULL , -0.44742133000000 , -90.41202705013653 , -0.44742133000000 , -54.559807 ,-457.731149 - NRCB4_FULL , -0.33302260000000 , -90.08273002596596 , -0.33302260000000 , -54.340619 ,-525.657995 - NRCB5_FULL , 0.02948617000000 , -89.89637902770211 , 0.02948617000000 , -89.387412 ,-491.352394 - NRCA1_FULL_WEDGE_RND , -0.33124826000000 , -90.54809966000001 , -0.33124826000000 , 118.337625 , -487.665346 - NRCA2_FULL_WEDGE_RND , 0.02423127000000 , -90.29051250999999 , 0.02423127000000 , 117.786705 , -420.414458 - NRCA3_FULL_WEDGE_RND , 0.30837949000000 , -89.66970549000000 , 0.30837949000000 , 50.232913 , -487.942132 - NRCA4_FULL_WEDGE_RND , 0.08305695000000 , -89.63598793000000 , 0.08305695000000 , 50.604520 , -420.371211 - NRCA5_FULL_WEDGE_RND , 0.08234906964979 , -89.97216057005521 , 0.08234906964979 , 83.409810 , -446.076167 - NRCA1_FULL_WEDGE_BAR , -0.33180754000000 , -90.54932540000000 , -0.33180754000000 , 118.454504 , -487.33635 - NRCA2_FULL_WEDGE_BAR , 0.02521288000000 , -90.29260742999999 , 0.02521288000000 , 117.901889 , -420.047637 - NRCA3_FULL_WEDGE_BAR , 0.30801422000000 , -89.66813883000000 , 0.30801422000000 , 50.355310 , -487.590900 - NRCA4_FULL_WEDGE_BAR , 0.08193758000000 , -89.63485863000000 , 0.08193758000000 , 50.722894 , -420.034916 - NRCA5_FULL_WEDGE_BAR , 0.08213809709691 , -89.97554806774346 , 0.08213809709691 , 83.240650 , -446.716752 + + NRCA1_FULL , -0.5518820100000 , -89.9493624282204 , -0.5518820100000 , 120.576793 , -527.501431 + NRCA2_FULL , -0.2072487800000 , -90.0637727002948 , -0.2072487800000 , 119.740061 , -459.784260 + NRCA3_FULL , 0.2821039500000 , -90.2489849877878 , 0.2821039500000 , 51.946174 , -527.927527 + NRCA4_FULL , 0.1001783200000 , -90.0457616937549 , 0.1001783200000 , 52.359040 , -459.901178 + NRCA5_FULL , -0.0633831100000 , -90.0857712017952 , -0.0633831100000 , 85.926560 , -493.502537 + NRCB1_FULL , 0.3448190400000 , -89.9240128504144 , 0.3448190400000 , -122.427986 , -457.706754 + NRCB2_FULL , 0.8465559900000 , -90.0643532343448 , 0.8465559900000 , -122.679933 , -525.420878 + NRCB3_FULL , -0.4516468900000 , -89.9637278385541 , -0.4516468900000 , -54.610778 , -457.702913 + NRCB4_FULL , -0.3382659000000 , -89.7488610900411 , -0.3382659000000 , -54.386704 , -525.630307 + NRCB5_FULL , 0.0231970500000 , -89.9248419453761 , 0.0231970500000 , -89.402822 , -491.360126 + NRCA1_FULL_WEDGE_RND , -0.3093876700000 , -90.2125799695504 , -0.3093876700000 , 118.409939 , -487.482172 + NRCA2_FULL_WEDGE_RND , -0.0076260900000 , -90.2846576266261 , -0.0076260900000 , 117.852253 , -420.230630 + NRCA3_FULL_WEDGE_RND , 0.3171251000000 , -89.9761522427062 , 0.3171251000000 , 50.287205 , -487.732709 + NRCA4_FULL_WEDGE_RND , 0.2143864600000 , -89.8331800738841 , 0.2143864600000 , 50.730586 , -420.167999 + NRCA4_FULL_WEDGE_RND , 0.2143864600000 , -89.8331800738841 , 0.2143864600000 , 50.730586 , -420.167999 + NRCA5_FULL_WEDGE_RND , 0.0921289800000 , -90.0586655661635 , 0.0921289800000 , 83.474710 , -445.984320 + NRCA1_FULL_WEDGE_BAR , -0.3119344200000 , -90.2087637087315 , -0.3119344200000 , 118.525498 , -487.138747 + NRCA2_FULL_WEDGE_BAR , -0.0252962800000 , -90.2830002269434 , -0.0252962800000 , 117.963731 , -419.882341 + NRCA3_FULL_WEDGE_BAR , 0.3140447700000 , -89.9722044693771 , 0.3140447700000 , 50.407294 , -487.386833 + NRCA4_FULL_WEDGE_BAR , 0.2139786000000 , -89.8238145789772 , 0.2139786000000 , 50.847304 , -419.821883 + NRCA5_FULL_WEDGE_BAR , 0.0903840600000 , -90.0519504156403 , 0.0903840600000 , 83.311902 , -446.596018