diff --git a/sparkles/tests/test_find_er_catalog.py b/sparkles/tests/test_find_er_catalog.py index 05f9eaf..711d102 100644 --- a/sparkles/tests/test_find_er_catalog.py +++ b/sparkles/tests/test_find_er_catalog.py @@ -93,62 +93,20 @@ def test_find_er_catalog_minus_2_pitch_bins(proseco_agasc_1p7, ACA, ATTS): # import pprint; pprint.pprint(att_opts[TEST_COLS].pformat_all(), width=100) assert acar is att_opts["acar"][8] assert att_opts[TEST_COLS].pformat_all() == [ - ( - "dpitch dyaw count_9th count_10th count_all count_ok n_critical att" - " " - ), - ( - "------ ----- --------- ---------- --------- -------- ----------" - " -----------------" - ), - ( - " -0.01 -3.10 4.18 6.00 5.65 True 2 7.67" - " -25.22 29.3" - ), - ( - " -0.01 -0.05 2.00 2.67 2.25 False -- 6.47" - " -26.05 26.1" - ), - ( - " -0.01 3.00 2.62 7.92 5.26 False -- 5.21" - " -26.82 22.8" - ), - ( - " -1.17 -3.10 2.00 9.33 5.92 False -- 8.49" - " -26.12 29.7" - ), - ( - " -1.17 -0.05 0.00 1.23 0.78 False -- 7.23" - " -27.00 26.4" - ), - ( - " -1.17 3.00 0.75 6.87 4.03 False -- 5.91" - " -27.80 23.1" - ), - ( - " -2.34 -3.10 1.89 7.77 5.21 False -- 9.32" - " -27.02 30.1" - ), - ( - " -2.34 -0.05 2.87 8.52 5.97 False -- 8.01" - " -27.93 26.8" - ), - ( - " -2.34 3.00 8.53 13.90 12.67 True 0 6.64" - " -28.78 23.5" - ), - ( - " -3.50 -3.10 2.12 10.01 6.66 False -- 10.16" - " -27.91 30.4" - ), - ( - " -3.50 -0.05 4.87 9.63 7.50 True -- 8.80" - " -28.86 27.2" - ), - ( - " -3.50 3.00 3.60 9.93 6.38 True -- 7.37" - " -29.75 23.8" - ), + "dpitch dyaw count_9th count_10th count_all count_ok n_critical att ", + "------ ----- --------- ---------- --------- -------- ---------- -----------------", + " -0.01 -3.10 4.18 6.00 5.65 True 2 7.66 -25.21 29.3", + " -0.01 -0.05 2.00 2.67 2.25 False -- 6.47 -26.05 26.1", + " -0.01 3.00 2.62 7.92 5.26 False -- 5.21 -26.84 22.8", + " -1.17 -3.10 2.00 9.33 5.92 False -- 8.49 -26.10 29.7", + " -1.17 -0.05 0.00 1.23 0.78 False -- 7.25 -26.99 26.4", + " -1.17 3.00 0.75 6.87 4.03 False -- 5.94 -27.81 23.1", + " -2.34 -3.10 1.89 7.77 5.21 False -- 9.33 -26.99 30.1", + " -2.34 -0.05 2.87 8.52 5.97 False -- 8.04 -27.92 26.8", + " -2.34 3.00 8.53 13.90 12.67 True 0 6.67 -28.78 23.5", + " -3.50 -3.10 2.12 10.01 6.66 False -- 10.19 -27.87 30.5", + " -3.50 -0.05 5.60 10.63 8.39 True -- 8.84 -28.84 27.2", + " -3.50 3.00 2.83 8.93 5.47 False -- 7.42 -29.74 23.8", ] @@ -157,62 +115,20 @@ def test_find_er_catalog_minus_2_count_all(proseco_agasc_1p7, ACA, ATTS): # import pprint; pprint.pprint(att_opts[TEST_COLS].pformat_all(), width=100) assert acar is att_opts["acar"][8] assert att_opts[TEST_COLS].pformat_all() == [ - ( - "dpitch dyaw count_9th count_10th count_all count_ok n_critical att" - " " - ), - ( - "------ ----- --------- ---------- --------- -------- ----------" - " -----------------" - ), - ( - " -0.01 -3.10 4.18 6.00 5.65 True -- 7.67" - " -25.22 29.3" - ), - ( - " -0.01 -0.05 2.00 2.67 2.25 False -- 6.47" - " -26.05 26.1" - ), - ( - " -0.01 3.00 2.62 7.92 5.26 False -- 5.21" - " -26.82 22.8" - ), - ( - " -1.17 -3.10 2.00 9.33 5.92 False -- 8.49" - " -26.12 29.7" - ), - ( - " -1.17 -0.05 0.00 1.23 0.78 False -- 7.23" - " -27.00 26.4" - ), - ( - " -1.17 3.00 0.75 6.87 4.03 False -- 5.91" - " -27.80 23.1" - ), - ( - " -2.34 -3.10 1.89 7.77 5.21 False -- 9.32" - " -27.02 30.1" - ), - ( - " -2.34 -0.05 2.87 8.52 5.97 False -- 8.01" - " -27.93 26.8" - ), - ( - " -2.34 3.00 8.53 13.90 12.67 True 0 6.64" - " -28.78 23.5" - ), - ( - " -3.50 -3.10 2.12 10.01 6.66 False -- 10.16" - " -27.91 30.4" - ), - ( - " -3.50 -0.05 4.87 9.63 7.50 True -- 8.80" - " -28.86 27.2" - ), - ( - " -3.50 3.00 3.60 9.93 6.38 True -- 7.37" - " -29.75 23.8" - ), + "dpitch dyaw count_9th count_10th count_all count_ok n_critical att ", + "------ ----- --------- ---------- --------- -------- ---------- -----------------", + " -0.01 -3.10 4.18 6.00 5.65 True -- 7.66 -25.21 29.3", + " -0.01 -0.05 2.00 2.67 2.25 False -- 6.47 -26.05 26.1", + " -0.01 3.00 2.62 7.92 5.26 False -- 5.21 -26.84 22.8", + " -1.17 -3.10 2.00 9.33 5.92 False -- 8.49 -26.10 29.7", + " -1.17 -0.05 0.00 1.23 0.78 False -- 7.25 -26.99 26.4", + " -1.17 3.00 0.75 6.87 4.03 False -- 5.94 -27.81 23.1", + " -2.34 -3.10 1.89 7.77 5.21 False -- 9.33 -26.99 30.1", + " -2.34 -0.05 2.87 8.52 5.97 False -- 8.04 -27.92 26.8", + " -2.34 3.00 8.53 13.90 12.67 True 0 6.67 -28.78 23.5", + " -3.50 -3.10 2.12 10.01 6.66 False -- 10.19 -27.87 30.5", + " -3.50 -0.05 5.60 10.63 8.39 True -- 8.84 -28.84 27.2", + " -3.50 3.00 2.83 8.93 5.47 False -- 7.42 -29.74 23.8", ] @@ -221,62 +137,20 @@ def test_find_er_catalog_minus_2_input_order(proseco_agasc_1p7, ACA, ATTS): # import pprint; pprint.pprint(att_opts[TEST_COLS].pformat_all(), width=100) assert acar is att_opts["acar"][8] assert att_opts[TEST_COLS].pformat_all() == [ - ( - "dpitch dyaw count_9th count_10th count_all count_ok n_critical att" - " " - ), - ( - "------ ----- --------- ---------- --------- -------- ----------" - " -----------------" - ), - ( - " -0.01 -3.10 4.18 6.00 5.65 True 2 7.67" - " -25.22 29.3" - ), - ( - " -0.01 -0.05 2.00 2.67 2.25 False -- 6.47" - " -26.05 26.1" - ), - ( - " -0.01 3.00 2.62 7.92 5.26 False -- 5.21" - " -26.82 22.8" - ), - ( - " -1.17 -3.10 2.00 9.33 5.92 False -- 8.49" - " -26.12 29.7" - ), - ( - " -1.17 -0.05 0.00 1.23 0.78 False -- 7.23" - " -27.00 26.4" - ), - ( - " -1.17 3.00 0.75 6.87 4.03 False -- 5.91" - " -27.80 23.1" - ), - ( - " -2.34 -3.10 1.89 7.77 5.21 False -- 9.32" - " -27.02 30.1" - ), - ( - " -2.34 -0.05 2.87 8.52 5.97 False -- 8.01" - " -27.93 26.8" - ), - ( - " -2.34 3.00 8.53 13.90 12.67 True 0 6.64" - " -28.78 23.5" - ), - ( - " -3.50 -3.10 2.12 10.01 6.66 False -- 10.16" - " -27.91 30.4" - ), - ( - " -3.50 -0.05 4.87 9.63 7.50 True -- 8.80" - " -28.86 27.2" - ), - ( - " -3.50 3.00 3.60 9.93 6.38 True -- 7.37" - " -29.75 23.8" - ), + "dpitch dyaw count_9th count_10th count_all count_ok n_critical att ", + "------ ----- --------- ---------- --------- -------- ---------- -----------------", + " -0.01 -3.10 4.18 6.00 5.65 True 2 7.66 -25.21 29.3", + " -0.01 -0.05 2.00 2.67 2.25 False -- 6.47 -26.05 26.1", + " -0.01 3.00 2.62 7.92 5.26 False -- 5.21 -26.84 22.8", + " -1.17 -3.10 2.00 9.33 5.92 False -- 8.49 -26.10 29.7", + " -1.17 -0.05 0.00 1.23 0.78 False -- 7.25 -26.99 26.4", + " -1.17 3.00 0.75 6.87 4.03 False -- 5.94 -27.81 23.1", + " -2.34 -3.10 1.89 7.77 5.21 False -- 9.33 -26.99 30.1", + " -2.34 -0.05 2.87 8.52 5.97 False -- 8.04 -27.92 26.8", + " -2.34 3.00 8.53 13.90 12.67 True 0 6.67 -28.78 23.5", + " -3.50 -3.10 2.12 10.01 6.66 False -- 10.19 -27.87 30.5", + " -3.50 -0.05 5.60 10.63 8.39 True -- 8.84 -28.84 27.2", + " -3.50 3.00 2.83 8.93 5.47 False -- 7.42 -29.74 23.8", ] diff --git a/sparkles/tests/test_review.py b/sparkles/tests/test_review.py index 097c3bb..47df199 100644 --- a/sparkles/tests/test_review.py +++ b/sparkles/tests/test_review.py @@ -441,17 +441,17 @@ def test_roll_options_dec89_9(proseco_agasc_1p7): exp[48000] = [ " roll P2 n_stars improvement roll_min roll_max add_ids drop_ids", "------ ---- ------- ----------- -------- -------- --------- --------", - "287.25 3.61 0.55 0.00 287.25 287.25 -- --", - "281.00 7.24 6.98 9.53 276.75 285.25 608567744 --", - "287.50 7.25 5.43 7.68 276.42 298.08 -- --", + "286.97 3.61 0.55 0.00 286.97 286.97 -- --", + "280.97 7.23 6.98 9.53 276.72 285.22 608567744 --", + "287.47 7.25 5.43 7.68 276.14 297.81 -- --", ] exp[18000] = [ " roll P2 n_stars improvement roll_min roll_max add_ids drop_ids", "------ ---- ------- ----------- -------- -------- --------- --------", - "276.94 3.61 7.54 0.00 276.94 276.94 -- --", - "277.07 7.25 8.00 1.89 266.11 287.77 -- --", - "270.57 7.16 8.00 1.84 266.19 274.94 608567744 --", + "276.71 3.61 7.54 0.00 276.71 276.71 -- --", + "277.09 7.25 8.00 1.89 265.88 287.54 -- --", + "270.59 7.15 8.00 1.84 266.21 274.96 608567744 --", ] for obsid in (48000, 18000): @@ -555,65 +555,66 @@ def compare_intervs(intervs, exp_intervs): # For the OR we expect this or_exp_intervs = [ { + "roll": 281.56864473302164, + "roll_min": 281.56864473302164, + "roll_max": 281.5759766065589, "add_ids": {84943288}, "drop_ids": {84937736}, - "roll": 281.53501733258395, - "roll_max": 281.57597660655892, - "roll_min": 281.53501733258395, }, { + "roll": 289.0759766065589, + "roll_min": 283.8259766065589, + "roll_max": 291.56864473302164, "add_ids": set(), "drop_ids": set(), - "roll": 289.07597660655892, - "roll_max": 291.53501733258395, - "roll_min": 283.82597660655892, }, { + "roll": 289.0759766065589, + "roll_min": 287.8259766065589, + "roll_max": 290.3259766065589, "add_ids": {84941648}, "drop_ids": set(), - "roll": 289.07597660655892, - "roll_max": 290.32597660655892, - "roll_min": 287.82597660655892, }, { + "roll": 289.8259766065589, + "roll_min": 289.3259766065589, + "roll_max": 290.3259766065589, "add_ids": {85328120, 84941648}, "drop_ids": set(), - "roll": 289.82597660655892, - "roll_max": 290.32597660655892, - "roll_min": 289.32597660655892, }, { + "roll": 291.56864473302164, + "roll_min": 289.3259766065589, + "roll_max": 291.56864473302164, "add_ids": {85328120}, "drop_ids": set(), - "roll": 291.53501733258395, - "roll_max": 291.53501733258395, - "roll_min": 289.32597660655892, }, ] + compare_intervs(or_roll_intervs, or_exp_intervs) # For the ER we expect these er_exp_intervs = [ { + "roll": 290.8033828990559, + "roll_min": 285.1783828990559, + "roll_max": 291.67104636183814, "add_ids": set(), "drop_ids": set(), - "roll": 290.80338289905592, - "roll_max": 291.63739755173594, - "roll_min": 285.17838289905592, }, { + "roll": 291.67104636183814, + "roll_min": 289.6783828990559, + "roll_max": 291.67104636183814, "add_ids": {84943288}, "drop_ids": set(), - "roll": 291.63739755173594, - "roll_max": 291.63739755173594, - "roll_min": 289.67838289905592, }, { + "roll": 291.67104636183814, + "roll_min": 290.9283828990559, + "roll_max": 291.67104636183814, "add_ids": {85328120, 84943288}, "drop_ids": set(), - "roll": 291.63739755173594, - "roll_max": 291.63739755173594, - "roll_min": 290.92838289905592, }, ] compare_intervs(er_roll_intervs, er_exp_intervs) @@ -629,7 +630,7 @@ def test_roll_options_for_not_allowed_pitch(): roll = nominal_roll(ra, dec, date) att0 = Quat([ra, dec, roll]) - att = apply_sun_pitch_yaw(att0, pitch=40) + att = apply_sun_pitch_yaw(att0, pitch=40, time=date) aca = get_aca_catalog(**mod_std_info(att=att, date=date)) acar = aca.get_review_table() acar.get_roll_options() diff --git a/sparkles/tests/test_yoshi.py b/sparkles/tests/test_yoshi.py index 98e9957..6ab5b6b 100644 --- a/sparkles/tests/test_yoshi.py +++ b/sparkles/tests/test_yoshi.py @@ -74,7 +74,7 @@ def test_get_params(): "offset_y": 0.0, "offset_z": np.ma.masked, "ra_targ": 149.91616666666664, - "roll_targ": 62.01050867568485, + "roll_targ": 62.09064956241331, "sim_offset": 0, "target_name": "C-COSMOS", } @@ -87,7 +87,7 @@ def test_get_params(): man_angle=5.0, ) exp_proseco = { - "att": Quat([0.15014290, 0.49293780, 0.83025915, 0.21245982]), + "att": Quat([0.15029134, 0.49351836, 0.82991428, 0.21235450]), "date": "2022:001:00:00:00.000", "detector": "ACIS-I", "dither": (7.9992, 7.9992), @@ -139,7 +139,7 @@ def test_get_params_use_cycle(): "offset_y": 0.0, "offset_z": np.ma.masked, "ra_targ": 149.91616666666664, - "roll_targ": 62.01050867568485, + "roll_targ": 62.09064956241331, "sim_offset": 0, "target_name": "C-COSMOS", } @@ -162,12 +162,12 @@ def test_acar_from_ocat(proseco_agasc_1p7): " 1 0 1 FID 7.00 919.8 -844.2 -178.7 -164.1", " 2 1 5 FID 7.00 -1828.2 1053.8 374.1 216.2", " 3 2 6 FID 7.00 385.8 1697.8 -70.8 346.0", - " 4 3 31983336 BOT 8.64 884.6 -1608.5 -172.3 -317.9", - " 5 4 31075368 BOT 9.13 57.2 751.5 -5.1 155.5", - " 6 5 32374896 BOT 9.17 2014.3 -2035.8 -401.4 -405.4", - " 7 6 31075128 BOT 9.35 -310.8 1200.0 68.9 245.4", - " 8 7 31463496 BOT 9.46 2035.0 1385.8 -403.5 284.7", - " 9 0 31076560 ACQ 9.70 -933.4 -354.4 193.0 -66.4", + " 4 3 31983336 BOT 8.64 882.3 -1609.6 -171.8 -318.2", + " 5 4 31075368 BOT 9.13 58.2 751.6 -5.3 155.5", + " 6 5 32374896 BOT 9.17 2011.4 -2038.5 -400.8 -406.0", + " 7 6 31075128 BOT 9.35 -309.2 1200.5 68.5 245.5", + " 8 7 31463496 BOT 9.46 2036.9 1383.0 -403.8 284.2", + " 9 0 31076560 ACQ 9.70 -934.0 -353.0 193.1 -66.1", ] cols = ("idx", "slot", "id", "type", "mag", "yang", "zang")