diff --git a/crates/applications/stacked_cores/scripts/plot_inverters.py b/crates/applications/stacked_cores/scripts/plot_inverters.py index 302abad..6847c80 100755 --- a/crates/applications/stacked_cores/scripts/plot_inverters.py +++ b/crates/applications/stacked_cores/scripts/plot_inverters.py @@ -62,10 +62,26 @@ for (name, curve) in [ # ("40 6x 9:1 (600um, 1e11 I)", fwd_40_600um_6_9_1_1e11.logically_inverted()), # ("40 6x 11:1 (600um, 5e10 I)", fwd_40_600um_6_11_1_5e10.logically_inverted()), - ("40 6x 5:1 (600um, 5e10 I)", fwd_40_600um_6_5_1_5e10.logically_inverted()), - ("40 8x 5:1 (600um, 5e10 I)", fwd_40_600um_8_5_1_5e10.logically_inverted()), - ("40 10x 5:1 (600um, 5e10 I)", fwd_40_600um_10_5_1_5e10.logically_inverted()), - ("40 12x 5:1 (600um, 5e10 I)", fwd_40_600um_12_5_1_5e10.logically_inverted()), + # ("40 6x 5:1 (600um, 5e10 I)", fwd_40_600um_6_5_1_5e10.logically_inverted()), + # ("40 8x 5:1 (600um, 5e10 I)", fwd_40_600um_8_5_1_5e10.logically_inverted()), + # ("40 10x 5:1 (600um, 5e10 I)", fwd_40_600um_10_5_1_5e10.logically_inverted()), + + # ("40 12x 7:1 (800um, 5e10 I)", fwd_40_800um_12_7_1_5e10.logically_inverted()), + # ("40 12x 7:1 (800um, 1e11 I)", fwd_40_800um_12_7_1_1e11.logically_inverted()), + # ("40 10x 5:1 (600um, 5e10 I)", fwd_40_600um_10_5_1_5e10.logically_inverted()), + # ("40 10x 9:1 (800um, 2e11 I)", fwd_40_800um_10_9_1_2e11.logically_inverted()), + + # ("40 12x 5:1 (600um, 5e10 I)", fwd_40_600um_12_5_1_5e10.logically_inverted()), + # ("40 12x 7:1 (800um, 5e10 I)", fwd_40_800um_12_7_1_5e10.logically_inverted()), + # ("40 10x 5:1 (600um, 5e10 I)", fwd_40_600um_10_5_1_5e10.logically_inverted()), + # ("40 10x 9:1 (800um, 5e10 I)", fwd_40_800um_10_9_1_5e10.logically_inverted()), + + ("40 24x 3:1 (800um, 1e11 I)", fwd_40_800um_24_3_1_1e11.logically_inverted()), + ("40 18x 5:1 (800um, 1e11 I)", fwd_40_800um_18_5_1_1e11.logically_inverted()), + ("40 12x 7:1 (800um, 1e11 I)", fwd_40_800um_12_7_1_1e11.logically_inverted()), + ("40 12x 7:1 (800um, 5e10 I)", fwd_40_800um_12_7_1_5e10.logically_inverted()), + ("40 10x 9:1 (800um, 2e11 I)", fwd_40_800um_10_9_1_2e11.logically_inverted()), + ("40 10x 9:1 (800um, 5e10 I)", fwd_40_800um_10_9_1_5e10.logically_inverted()), ]: curve.plot(title = f"{name} mapping") curve.logically_inverted().plot_slope(title = f"{name} slope") diff --git a/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py b/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py index 6e4f8f7..91cd8d0 100755 --- a/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py +++ b/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py @@ -41,13 +41,16 @@ sims = [ (sim_name(10, 2, 600, "5e10"), "fwd_40_600um_10_5_1_5e10", 20000), # partially complete - (sim_name(12, 3, 800, "5e10"), "fwd_40_800um_12_7_1_5e10", 20000), - (sim_name(12, 3, 800, "1e11"), "fwd_40_800um_12_7_1_1e11", 20000), - (sim_name(10, 4, 800, "2e11"), "fwd_40_800um_10_9_1_2e11", 20000), - (sim_name(10, 4, 800, "5e10"), "fwd_40_800um_10_9_1_5e10", 20000), - (sim_name(10, 4, 800, "1e11"), "fwd_40_800um_10_9_1_1e11", 20000), - (sim_name(12, 2, 800, "5e10"), "fwd_40_800um_12_5_1_5e10", 20000), - (sim_name(12, 2, 800, "1e11"), "fwd_40_800um_12_5_1_1e11", 20000), + (sim_name(24, 1, 800, "1e11"), "fwd_40_800um_24_3_1_1e11", 12000), + (sim_name(18, 2, 800, "1e11"), "fwd_40_800um_18_5_1_1e11", 10000), + (sim_name(18, 2, 800, "5e10"), "fwd_40_800um_18_5_1_5e10", 10000), + (sim_name(12, 3, 800, "5e10"), "fwd_40_800um_12_7_1_5e10", 8000), + (sim_name(12, 3, 800, "1e11"), "fwd_40_800um_12_7_1_1e11", 8000), + (sim_name(10, 4, 800, "2e11"), "fwd_40_800um_10_9_1_2e11", 8000), + (sim_name(10, 4, 800, "5e10"), "fwd_40_800um_10_9_1_5e10", 8000), + (sim_name(10, 4, 800, "1e11"), "fwd_40_800um_10_9_1_1e11", 8000), + (sim_name(12, 2, 800, "5e10"), "fwd_40_800um_12_5_1_5e10", 8000), + (sim_name(12, 2, 800, "1e11"), "fwd_40_800um_12_5_1_1e11", 8000), ] measurements = { real: [human, norm, None, None] for (real, human, norm) in sims } @@ -722,6 +725,66 @@ Piecewise( ) """) +set_meas("40-0.0008rad-24coupling-3_1_winding-1e11-drive", """ +Piecewise( + [ + [ -9820, -2521 ], # -2.0 + [ -8879, -1658 ], # -1.5 + [ -7734, -623 ], # -1.0 + [ -7195, -152 ], # -0.8 + [ -6536, 353 ], # -0.6 + [ -6131, 578 ], # -0.5 + [ -5591, 852 ], # -0.4 + [ -4914, 1143 ], # -0.3 + [ -4439, 1401 ], # -0.25 + [ -3452, 2107 ], # -0.2 + [ -1471, 3443 ], # -0.17 + [ -351, 4282 ], # -0.15 + [ 599, 5057 ], # -0.13 + [ 1827, 6231 ], # -0.1 + [ 2866, 7402 ], # -0.07 + [ 3456, 8065 ], # -0.05 + [ 4483, 9100 ], # 0.0 + [ 5059, 9621 ], # 0.05 + [ 5529, 9869 ], # 0.1 + [ 5926, 10058 ], # 0.2 + [ 6124, 10161 ], # 0.3 + [ 6417, 10457 ], # 0.5 + [ 6818, 10623 ], # 0.8 + [ 7070, 10703 ], # 1.0 + [ 7665, 11010 ], # 1.5 + [ 8196, 11153 ], # 2.0 + ] +) +""") + +set_meas("40-0.0008rad-18coupling-5_1_winding-1e11-drive", """ +Piecewise( + [ + [ -9383, -4435 ], # -2.0 + [ -7402, -2697 ], # -1.0 + [ -6879, -2366 ], # -0.8 + [ -5813, -1708 ], # -0.5 + [ -5278, -1432 ], # -0.4 + [ -4635, -1141 ], # -0.3 + [ -4198, -879 ], # -0.25 + [ -3311, -301 ], # -0.2 + [ -503, 1567 ], # -0.15 + [ 1320, 3288 ], # -0.1 + [ 2532, 4939 ], # -0.05 + [ 3242, 5979 ], # 0.0 + [ 3652, 6352 ], # 0.05 + [ 4067, 6713 ], # 0.1 + [ 4566, 7101 ], # 0.2 + [ 4783, 7244 ], # 0.3 + [ 5077, 7430 ], # 0.5 + [ 5448, 7668 ], # 0.8 + [ 5691, 7818 ], # 1.0 + [ 6840, 8656 ], # 2.0 + ] +) +""") + set_meas("40-0.0008rad-12coupling-7_1_winding-5e10-drive", """ Piecewise( [ diff --git a/crates/applications/stacked_cores/src/main.rs b/crates/applications/stacked_cores/src/main.rs index 6931085..633e495 100644 --- a/crates/applications/stacked_cores/src/main.rs +++ b/crates/applications/stacked_cores/src/main.rs @@ -3794,24 +3794,24 @@ fn main() { ("n050", -0.50), ("p020", 0.20), ("n020", -0.20), - ][..], - &[ - ("n080", -0.80), - ("n030", -0.30), - ("n010", -0.10), - ("p010", 0.10), - ("p030", 0.30), - ("p080", 0.80), - ][..], - &[ - ("n040", -0.40), - ("n060", -0.60), - ("n025", -0.25), - ("n015", -0.15), - ("n005", -0.05), - ("p005", 0.05), + // ][..], + // &[ ("p200", 2.00), ("n200", -2.00), + ("p010", 0.10), + ("n010", -0.10), + ("p030", 0.30), + ("n030", -0.30), + ("p080", 0.80), + ("n080", -0.80), + // ][..], + // &[ + ("p005", 0.05), + ("n005", -0.05), + ("n015", -0.15), + ("n025", -0.25), + ("n040", -0.40), + ("n060", -0.60), ("p150", 1.50), ("n150", -1.50), @@ -3821,6 +3821,17 @@ fn main() { ][..], ] { for (coupling_loops, s0_loops, s_major, cur_str, cur_flt) in [ + (24, 1, um(800), "1e11", 1e11), // verified geom + (18, 2, um(800), "1e11", 1e11), // verified geom + (12, 3, um(800), "5e10", 5e10), // verified geom + (18, 2, um(800), "5e10", 5e10), // verified geom + (12, 3, um(800), "1e11", 1e11), // verified geom + (10, 4, um(800), "2e11", 2e11), + (12, 2, um(800), "5e10", 5e10), + (12, 2, um(800), "1e11", 1e11), + (10, 4, um(800), "5e10", 5e10), + (10, 4, um(800), "1e11", 1e11), + (6, 3, um(600), "5e10", 5e10), // completed // (10, 3, um(600), "5e10", 5e10), // (8, 3, um(600), "5e10", 5e10), // completed @@ -3830,13 +3841,6 @@ fn main() { (10, 2, um(600), "5e10", 5e10), // (12, 2, um(600), "5e10", 5e10), // completed - (12, 3, um(800), "5e10", 5e10), - (12, 3, um(800), "1e11", 1e11), - (10, 4, um(800), "2e11", 2e11), - (10, 4, um(800), "5e10", 5e10), - (10, 4, um(800), "1e11", 1e11), - (12, 2, um(800), "5e10", 5e10), - (12, 2, um(800), "1e11", 1e11), // (8, 1, um(600), "5e10", 5e10), // not started // (12, 1, um(600), "5e10", 5e10), // not started