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 964d6d4..30cb995 100755 --- a/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py +++ b/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py @@ -182,6 +182,11 @@ sims = [ (SimParams41(4, 3, 400, "4e10"), None, 20000), (SimParams42(9, 1, 400, "1e10"), None, 20000), + (SimParams42(9, 1, 400, "12e9"), None, 20000), + (SimParams42(9, 1, 400, "8e9"), None, 20000), + (SimParams42(9, 1, 400, "15000000512e0"), None, 20000), # 15e9, but badly formatted T_T + (SimParams42(6, 2, 400, "1e10"), None, 20000), + (SimParams42(4, 3, 400, "2e10"), None, 20000), ] measurements = { real.machine_name: [human, norm, None, None] for (real, human, norm) in sims } @@ -2443,8 +2448,14 @@ Piecewise( [ [ -17058, -701 ], # -1.0 [ -16918, -872 ], # -0.3 + [ -16899, -893 ], # -0.27 + [ -16878, -915 ], # -0.25 + [ -16813, -979 ], # -0.22 [ -16674, -1109 ], # -0.2 + [ -16569, -1203 ], # -0.19 + [ -16433, -1326 ], # -0.18 [ -16229, -1523 ], # -0.17 + [ -15873, -1887 ], # -0.16 [ -15180, -2619 ], # -0.15 [ -13427, -4501 ], # -0.14 [ -11336, -6619 ], # -0.13 @@ -2456,6 +2467,10 @@ Piecewise( [ 1408, -16328 ], # -0.07 [ 3525, -16512 ], # -0.06 [ 5626, -16686 ], # -0.05 + [ 7675, -16734 ], # -0.04 + [ 9344, -16748 ], # -0.03 + [ 10132, -16756 ], # -0.02 + [ 10681, -16761 ], # -0.01 [ 11121, -16764 ], # 0.0 [ 13525, -16776 ], # 0.1 [ 16456, -16784 ], # 0.2 @@ -2464,4 +2479,144 @@ Piecewise( ) """) +set_meas("42-0.0004rad-9coupling-3_1_winding-12e9-drive", """ +Piecewise( + [ + [ -17082, -1246 ], # -1.0 + [ -16942, -1399 ], # -0.3 + [ -16872, -1480 ], # -0.2 + [ -16845, -1504 ], # -0.19 + [ -16802, -1541 ], # -0.18 + [ -16720, -1612 ], # -0.17 + [ -16598, -1715 ], # -0.16 + [ -16441, -1849 ], # -0.15 + [ -16184, -2083 ], # -0.14 + [ -15653, -2601 ], # -0.13 + [ -14247, -4101 ], # -0.12 + [ -11762, -6794 ], # -0.11 + [ -9226, -9334 ], # -0.1 + [ -6677, -11728 ], # -0.09 + [ -4125, -13936 ], # -0.08 + [ -1573, -15721 ], # -0.07 + [ 977, -16397 ], # -0.06 + [ 3514, -16641 ], # -0.05 + [ 11078, -16764 ], # 0.0 + [ 16686, -16774 ], # 0.2 + [ 16893, -16773 ], # 1.0 + ] +) +""") + +set_meas("42-0.0004rad-9coupling-3_1_winding-8e9-drive", """ +Piecewise( + [ + [ -17028, -32 ], # -1.0 + [ -16860, -213 ], # -0.3 + [ -15880, -1121 ], # -0.2 + [ -15375, -1631 ], # -0.19 + [ -14252, -2821 ], # -0.18 + [ -12607, -4558 ], # -0.17 + [ -10931, -6288 ], # -0.16 + [ -9238, -8004 ], # -0.15 + [ -7540, -9692 ], # -0.14 + [ -5842, -11279 ], # -0.13 + [ -4142, -12833 ], # -0.12 + [ -2442, -14325 ], # -0.11 + [ -742, -15569 ], # -0.1 + [ 956, -16090 ], # -0.09 + [ 2649, -16242 ], # -0.08 + [ 4334, -16371 ], # -0.07 + [ 6003, -16518 ], # -0.06 + [ 7627, -16656 ], # -0.05 + [ 11029, -16744 ], # 0.0 + [ 15012, -16765 ], # 0.2 + [ 16868, -16769 ], # 1.0 + ] +) +""") + +set_meas("42-0.0004rad-9coupling-3_1_winding-15000000512e0-drive", """ +Piecewise( + [ + [ -17110, -2110 ], # -1.0 + [ -16976, -2260 ], # -0.3 + [ -16931, -2322 ], # -0.2 + [ -16924, -2331 ], # -0.19 + [ -16913, -2343 ], # -0.18 + [ -16898, -2357 ], # -0.17 + [ -16877, -2378 ], # -0.16 + [ -16843, -2410 ], # -0.15 + [ -16775, -2470 ], # -0.14 + [ -16635, -2593 ], # -0.13 + [ -16442, -2757 ], # -0.12 + [ -16078, -3091 ], # -0.11 + [ -15175, -3969 ], # -0.1 + [ -12385, -6776 ], # -0.09 + [ -9216, -9896 ], # -0.08 + [ -6025, -12920 ], # -0.07 + [ -2832, -15395 ], # -0.06 + [ 360, -16474 ], # -0.05 + [ 11090, -16322 ], # 0.0 + [ 16743, -16310 ], # 0.2 + [ 16908, -16342 ], # 1.0 + ] +) +""") + +set_meas("42-0.0004rad-6coupling-5_1_winding-1e10-drive", """ +Piecewise( + [ + [ -16953, -1236 ], # -1.0 + [ -16620, -1540 ], # -0.3 + [ -11787, -6960 ], # -0.2 + [ -10417, -8395 ], # -0.19 + [ -9028, -9761 ], # -0.18 + [ -7638, -11057 ], # -0.17 + [ -6245, -12251 ], # -0.16 + [ -4851, -13364 ], # -0.15 + [ -3455, -14384 ], # -0.14 + [ -2060, -15176 ], # -0.13 + [ -671, -15606 ], # -0.12 + [ 710, -15827 ], # -0.11 + [ 2081, -15977 ], # -0.1 + [ 3420, -16083 ], # -0.09 + [ 4582, -16158 ], # -0.08 + [ 5305, -16198 ], # -0.07 + [ 5835, -16224 ], # -0.06 + [ 6243, -16242 ], # -0.05 + [ 7533, -16291 ], # 0.0 + [ 12271, -16458 ], # 0.2 + [ 16878, -16551 ], # 1.0 + ] +) +""") + +set_meas("42-0.0004rad-4coupling-7_1_winding-2e10-drive", """ +Piecewise( + [ + [ -16820, 25 ], # -1.0 + [ -16704, -82 ], # -0.3 + [ -16094, -669 ], # -0.2 + [ -15755, -1038 ], # -0.19 + [ -14674, -2338 ], # -0.18 + [ -13031, -4309 ], # -0.17 + [ -11360, -6215 ], # -0.16 + [ -9680, -8020 ], # -0.15 + [ -7991, -9723 ], # -0.14 + [ -6295, -11288 ], # -0.13 + [ -4596, -12674 ], # -0.12 + [ -2902, -13763 ], # -0.11 + [ -1220, -14570 ], # -0.1 + [ 316, -15098 ], # -0.09 + [ 1443, -15369 ], # -0.08 + [ 2269, -15522 ], # -0.07 + [ 2903, -15616 ], # -0.06 + [ 3414, -15687 ], # -0.05 + [ 5285, -15884 ], # 0.0 + [ 16062, -16479 ], # 0.2 + [ 16818, -16479 ], # 1.0 + ] +) +""") + if __name__ == '__main__': main() diff --git a/crates/applications/stacked_cores/src/main.rs b/crates/applications/stacked_cores/src/main.rs index 6e3c0cb..2f4873d 100644 --- a/crates/applications/stacked_cores/src/main.rs +++ b/crates/applications/stacked_cores/src/main.rs @@ -4290,22 +4290,30 @@ fn main() { -0.16, -0.18, -0.19, + ][..], + &[ + // edge-casey measurements -0.25, -0.03, -0.02, -0.04, -0.01, + -0.22, + -0.27, + 0.02, + 0.05, + 0.10, + 0.15, ][..], ] { for (coupling_loops, s0_loops, s_major, cur_flt) in [ - // unstarted - (9, 1, um(400), 1e10), + (4, 3, um(400), 2e10), // VIABLE INVERTER (0.22, 0.34) + (9, 1, um(400), 8e9), // VIABLE INVERTER (0.26, 0.31); verified gem - // (9, 1, um(400), 12e9), - // (9, 1, um(400), 8e9), - // (9, 1, um(400), 15e9), - // (6, 2, um(400), 1e10), - // (4, 3, um(400), 2e10), + // (9, 1, um(400), 1e10), // too low slope; verified geom + // (9, 1, um(400), 12e9), // too low slope; verified geom + // (6, 2, um(400), 1e10), // too low slope + // (9, 1, um(400), 15e9), // too low slope ] { for &init_flt in init_set { // coupling loops + control slots