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 467d8bb..b7cd363 100755 --- a/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py +++ b/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py @@ -399,8 +399,10 @@ sims = [ (SimParams48(1e3, 1e4, 2000, 100, 9, 1, 400, "3e9"), None, 20000), (SimParams48(1e3, 1e4, 2000, 100, 9, 1, 400, "5e9"), None, 20000), (SimParams48(1e3, 1e4, 2000, 100, 9, 1, 400, "1e10"), None, 20000), - (SimParams48(2e3, 2e4, 4000, 200, 9, 1, 400, "3e9"), None, 20000), - (SimParams48(5e3, 5e4,10000, 500, 9, 1, 400, "3e9"), None, 20000), + (SimParams48(2e3, 2e4, 4000, 200, 9, 1, 400, "1e9"), None, 20000), + (SimParams48(2e3, 2e4, 4000, 200, 9, 1, 400, "2e9"), None, 20000), + (SimParams48(5e3, 5e4,10000, 500, 9, 1, 400, "5e8"), None, 20000), + (SimParams48(5e3, 5e4,10000, 500, 9, 1, 400, "1e9"), None, 20000), ] measurements = { real.machine_name: [human, norm, None, None] for (real, human, norm) in sims } @@ -4069,6 +4071,23 @@ set_meas("48-0.0004rad-500ctl_cond-5000coupling_cond-1000ps-50ps-9ctl-9coupling- Piecewise( [ [ -17210, 1376 ], # -1.00 + [ -17061, 1548 ], # -0.35 + [ -16998, 1629 ], # -0.25 + [ -16783, 1850 ], # -0.20 + [ -16289, 2360 ], # -0.17 + [ -15157, 3634 ], # -0.15 + [ -9165, 10620 ], # -0.12 + [ -4926, 14787 ], # -0.10 + [ 1432, 16422 ], # -0.07 + [ 5604, 16743 ], # -0.05 + [ 10182, 16778 ], # -0.02 + [ 11224, 16783 ], # 0.00 + [ 12523, 16787 ], # 0.05 + [ 12908, 16788 ], # 0.07 + [ 13476, 16790 ], # 0.10 + [ 13889, 16790 ], # 0.12 + [ 16500, 16793 ], # 0.20 + [ 16816, 16793 ], # 0.35 [ 16931, 16791 ], # 1.00 ] ) @@ -4087,6 +4106,43 @@ set_meas("48-0.0004rad-500ctl_cond-10000coupling_cond-1000ps-50ps-9ctl-9coupling Piecewise( [ [ -18553, -1270 ], # -1.00 + [ -16802, 913 ], # -0.35 + [ -9426, 9490 ], # -0.25 + [ -8409, 10396 ], # -0.24 + [ -7390, 11313 ], # -0.23 + [ -6370, 12220 ], # -0.22 + [ -5350, 12984 ], # -0.21 + [ -4329, 13677 ], # -0.20 + [ -3308, 14279 ], # -0.19 + [ -2286, 14744 ], # -0.18 + [ -1266, 15074 ], # -0.17 + [ -245, 15280 ], # -0.16 + [ 775, 15429 ], # -0.15 + [ 1793, 15555 ], # -0.14 + [ 2810, 15666 ], # -0.13 + [ 3824, 15748 ], # -0.12 + [ 4834, 15816 ], # -0.11 + [ 5838, 15881 ], # -0.10 + [ 6835, 15943 ], # -0.09 + [ 7813, 16000 ], # -0.08 + [ 8767, 16044 ], # -0.07 + [ 9589, 16078 ], # -0.06 + [ 10211, 16103 ], # -0.05 + [ 10689, 16120 ], # -0.04 + [ 10887, 16127 ], # -0.03 + [ 11026, 16132 ], # -0.02 + [ 11140, 16135 ], # -0.01 + [ 11237, 16138 ], # 0.00 + [ 11323, 16141 ], # 0.01 + [ 11403, 16144 ], # 0.02 + [ 11478, 16146 ], # 0.03 + [ 11550, 16148 ], # 0.04 + [ 11620, 16151 ], # 0.05 + [ 11758, 16154 ], # 0.07 + [ 11959, 16160 ], # 0.10 + [ 12092, 16164 ], # 0.12 + [ 12621, 16179 ], # 0.20 + [ 15897, 16276 ], # 0.35 [ 17271, 16313 ], # 1.00 ] ) @@ -4112,6 +4168,43 @@ set_meas("48-0.0004rad-1000ctl_cond-10000coupling_cond-2000ps-100ps-9ctl-9coupli Piecewise( [ [ -16999, -3777 ], # -1.00 + [ -13768, -1435 ], # -0.35 + [ -5278, 3430 ], # -0.25 + [ -4420, 3777 ], # -0.24 + [ -3562, 4109 ], # -0.23 + [ -2705, 4423 ], # -0.22 + [ -1847, 4721 ], # -0.21 + [ -992, 5010 ], # -0.20 + [ -139, 5293 ], # -0.19 + [ 711, 5569 ], # -0.18 + [ 1560, 5843 ], # -0.17 + [ 2407, 6113 ], # -0.16 + [ 3249, 6381 ], # -0.15 + [ 4077, 6643 ], # -0.14 + [ 4900, 6904 ], # -0.13 + [ 5719, 7162 ], # -0.12 + [ 6526, 7417 ], # -0.11 + [ 7296, 7660 ], # -0.10 + [ 8044, 7897 ], # -0.09 + [ 8771, 8127 ], # -0.08 + [ 9422, 8335 ], # -0.07 + [ 10024, 8527 ], # -0.06 + [ 10446, 8662 ], # -0.05 + [ 10580, 8704 ], # -0.04 + [ 10674, 8733 ], # -0.03 + [ 10762, 8759 ], # -0.02 + [ 10845, 8784 ], # -0.01 + [ 10926, 8809 ], # 0.00 + [ 11004, 8832 ], # 0.01 + [ 11081, 8855 ], # 0.02 + [ 11156, 8878 ], # 0.03 + [ 11230, 8900 ], # 0.04 + [ 11304, 8922 ], # 0.05 + [ 11449, 8966 ], # 0.07 + [ 11660, 9029 ], # 0.10 + [ 11799, 9071 ], # 0.12 + [ 12332, 9229 ], # 0.20 + [ 13386, 9543 ], # 0.35 [ 16812, 10556 ], # 1.00 ] ) @@ -4121,6 +4214,43 @@ set_meas("48-0.0004rad-1000ctl_cond-10000coupling_cond-2000ps-100ps-9ctl-9coupli Piecewise( [ [ -17090, -1037 ], # -1.00 + [ -16920, -886 ], # -0.35 + [ -16229, -202 ], # -0.25 + [ -15980, 74 ], # -0.24 + [ -15616, 480 ], # -0.23 + [ -14998, 1181 ], # -0.22 + [ -13739, 2608 ], # -0.21 + [ -12356, 4146 ], # -0.20 + [ -10956, 5720 ], # -0.19 + [ -9537, 7231 ], # -0.18 + [ -8109, 8659 ], # -0.17 + [ -6678, 10153 ], # -0.16 + [ -5245, 11575 ], # -0.15 + [ -3811, 12962 ], # -0.14 + [ -2377, 14221 ], # -0.13 + [ -942, 15144 ], # -0.12 + [ 492, 15592 ], # -0.11 + [ 1925, 15850 ], # -0.10 + [ 3354, 16030 ], # -0.09 + [ 4775, 16145 ], # -0.08 + [ 6187, 16239 ], # -0.07 + [ 7566, 16321 ], # -0.06 + [ 8917, 16391 ], # -0.05 + [ 10193, 16454 ], # -0.04 + [ 11267, 16505 ], # -0.03 + [ 11557, 16519 ], # -0.02 + [ 11712, 16525 ], # -0.01 + [ 11831, 16530 ], # 0.00 + [ 11931, 16534 ], # 0.01 + [ 12020, 16537 ], # 0.02 + [ 12104, 16541 ], # 0.03 + [ 12186, 16544 ], # 0.04 + [ 12267, 16547 ], # 0.05 + [ 12425, 16552 ], # 0.07 + [ 12659, 16560 ], # 0.10 + [ 12814, 16565 ], # 0.12 + [ 13516, 16586 ], # 0.20 + [ 16720, 16652 ], # 0.35 [ 16874, 16650 ], # 1.00 ] ) @@ -4130,10 +4260,140 @@ set_meas("48-0.0004rad-1000ctl_cond-10000coupling_cond-2000ps-100ps-9ctl-9coupli Piecewise( [ [ -17206, 2148 ], # -1.00 + [ -17066, 2328 ], # -0.35 + [ -17024, 2390 ], # -0.25 + [ -16990, 2439 ], # -0.20 + [ -16928, 2512 ], # -0.17 + [ -16782, 2671 ], # -0.15 + [ -15978, 3579 ], # -0.12 + [ -12303, 8135 ], # -0.10 + [ -3747, 15942 ], # -0.07 + [ 1991, 16581 ], # -0.05 + [ 10231, 16806 ], # -0.02 [ 11896, 16811 ], # 0.00 + [ 13064, 16813 ], # 0.05 + [ 13432, 16814 ], # 0.07 + [ 14095, 16814 ], # 0.10 + [ 14946, 16815 ], # 0.12 + [ 16756, 16816 ], # 0.20 + [ 16829, 16817 ], # 0.35 [ 16938, 16814 ], # 1.00 ] ) """) +set_meas("48-0.0004rad-2000ctl_cond-20000coupling_cond-4000ps-200ps-9ctl-9coupling-3_1_winding-1e9-drive", """ +Piecewise( + [ + [ -16695, -12962 ], # -1.00 + [ 189, -7932 ], # -0.35 + [ 1302, -7574 ], # -0.25 + [ 1728, -7439 ], # -0.20 + [ 1996, -7355 ], # -0.17 + [ 2181, -7297 ], # -0.15 + [ 2468, -7207 ], # -0.12 + [ 2665, -7146 ], # -0.10 + [ 2970, -7051 ], # -0.07 + [ 3179, -6986 ], # -0.05 + [ 3502, -6885 ], # -0.02 + [ 3722, -6817 ], # 0.00 + [ 4293, -6640 ], # 0.05 + [ 4528, -6567 ], # 0.07 + [ 4888, -6456 ], # 0.10 + [ 5132, -6380 ], # 0.12 + [ 6146, -6068 ], # 0.20 + [ 8166, -5448 ], # 0.35 + [ 16600, -2984 ], # 1.00 + ] +) +""") + +set_meas("48-0.0004rad-2000ctl_cond-20000coupling_cond-4000ps-200ps-9ctl-9coupling-3_1_winding-2e9-drive", """ +Piecewise( + [ + [ -16955, -3998 ], # -1.00 + [ -14123, -1880 ], # -0.35 + [ -5549, 3367 ], # -0.25 + [ -1211, 5059 ], # -0.20 + [ 1372, 5916 ], # -0.17 + [ 2229, 6190 ], # -0.16 + [ 3082, 6462 ], # -0.15 + [ 3921, 6727 ], # -0.14 + [ 4753, 6988 ], # -0.13 + [ 5580, 7248 ], # -0.12 + [ 6394, 7502 ], # -0.11 + [ 7168, 7745 ], # -0.10 + [ 7922, 7982 ], # -0.09 + [ 8641, 8208 ], # -0.08 + [ 9288, 8413 ], # -0.07 + [ 9863, 8595 ], # -0.06 + [ 10239, 8714 ], # -0.05 + [ 10344, 8747 ], # -0.04 + [ 10433, 8774 ], # -0.03 + [ 10519, 8800 ], # -0.02 + [ 10603, 8826 ], # -0.01 + [ 10685, 8851 ], # 0.00 + [ 11066, 8967 ], # 0.05 + [ 11208, 9010 ], # 0.07 + [ 11411, 9072 ], # 0.10 + [ 11542, 9111 ], # 0.12 + [ 12021, 9255 ], # 0.20 + [ 13494, 9696 ], # 0.35 + [ 16794, 10663 ], # 1.00 + ] +) +""") + +set_meas("48-0.0004rad-5000ctl_cond-50000coupling_cond-10000ps-500ps-9ctl-9coupling-3_1_winding-5e8-drive", """ +Piecewise( + [ + [ -16608, -12761 ], # -1.00 + [ 107, -7801 ], # -0.35 + [ 1350, -7404 ], # -0.25 + [ 1793, -7265 ], # -0.20 + [ 2069, -7179 ], # -0.17 + [ 2260, -7119 ], # -0.15 + [ 2556, -7027 ], # -0.12 + [ 2760, -6964 ], # -0.10 + [ 3073, -6866 ], # -0.07 + [ 3288, -6800 ], # -0.05 + [ 3620, -6698 ], # -0.02 + [ 3847, -6628 ], # 0.00 + [ 4432, -6448 ], # 0.05 + [ 4672, -6373 ], # 0.07 + [ 5041, -6260 ], # 0.10 + [ 5292, -6183 ], # 0.12 + [ 6325, -5867 ], # 0.20 + [ 8379, -5240 ], # 0.35 + [ 16585, -2845 ], # 1.00 + ] +) +""") + +set_meas("48-0.0004rad-5000ctl_cond-50000coupling_cond-10000ps-500ps-9ctl-9coupling-3_1_winding-1e9-drive", """ +Piecewise( + [ + [ -16845, -3852 ], # -1.00 + [ -14379, -2012 ], # -0.35 + [ -5768, 3505 ], # -0.25 + [ -1389, 5290 ], # -0.20 + [ 1219, 6176 ], # -0.17 + [ 2947, 6730 ], # -0.15 + [ 5471, 7524 ], # -0.12 + [ 7077, 8026 ], # -0.10 + [ 9217, 8696 ], # -0.07 + [ 10163, 8994 ], # -0.05 + [ 10440, 9079 ], # -0.02 + [ 10603, 9129 ], # 0.00 + [ 10982, 9244 ], # 0.05 + [ 11124, 9287 ], # 0.07 + [ 11326, 9348 ], # 0.10 + [ 11455, 9387 ], # 0.12 + [ 11934, 9530 ], # 0.20 + [ 13718, 10061 ], # 0.35 + [ 16758, 10948 ], # 1.00 + ] +) +""") + if __name__ == '__main__': main() diff --git a/crates/applications/stacked_cores/src/main.rs b/crates/applications/stacked_cores/src/main.rs index 0b617d5..b54e8c6 100644 --- a/crates/applications/stacked_cores/src/main.rs +++ b/crates/applications/stacked_cores/src/main.rs @@ -5106,12 +5106,12 @@ fn main() { ][..], &[ 0.00, - 0.20, -0.20, - 0.10, + 0.20, -0.10, - 0.35, + 0.10, -0.35, + 0.35, ][..], &[ -0.05, @@ -5157,8 +5157,10 @@ fn main() { (1e3, 1e4, ps(2000), ps(100), 9, 1, um(400), 3e9), (1e3, 1e4, ps(2000), ps(100), 9, 1, um(400), 5e9), (5e2, 1e4, ps(1000), ps(50), 9, 1, um(400), 5e9), - (2e3, 2e4, ps(4000), ps(200), 9, 1, um(400), 3e9), - (5e3, 5e4, ps(10000),ps(500), 9, 1, um(400), 3e9), + (2e3, 2e4, ps(4000), ps(200), 9, 1, um(400), 2e9), + (2e3, 2e4, ps(4000), ps(200), 9, 1, um(400), 1e9), + (5e3, 5e4, ps(10000),ps(500), 9, 1, um(400), 1e9), + (5e3, 5e4, ps(10000),ps(500), 9, 1, um(400), 5e8), // boring current variants of the above (1e3, 1e4, ps(2000), ps(100), 9, 1, um(400), 1e10),