app: stacked_cores: 43-xx: complete more current variations

This commit is contained in:
2022-10-14 19:25:05 -07:00
parent 997ac5f299
commit 5a61613381
2 changed files with 114 additions and 16 deletions

View File

@@ -225,7 +225,7 @@ sims = [
(SimParams43(3, 2, 400, "5e9"), None, 20000), (SimParams43(3, 2, 400, "5e9"), None, 20000),
(SimParams43(3, 2, 400, "1e10"), None, 20000), (SimParams43(3, 2, 400, "1e10"), None, 20000),
(SimParams43(3, 2, 400, "2e10"), None, 20000), (SimParams43(3, 2, 400, "2e10"), None, 20000),
(SimParams43(3, 2, 400, "3e10"), None, 20000), (SimParams43(3, 2, 400, "30000001024e0"), None, 20000),
(SimParams43(5, 1, 400, "2e9"), None, 20000), (SimParams43(5, 1, 400, "2e9"), None, 20000),
(SimParams43(5, 1, 400, "3e9"), None, 20000), (SimParams43(5, 1, 400, "3e9"), None, 20000),
(SimParams43(5, 1, 400, "5e9"), None, 20000), (SimParams43(5, 1, 400, "5e9"), None, 20000),
@@ -238,6 +238,9 @@ sims = [
(SimParams43(7, 1, 600, "5e9"), None, 20000), (SimParams43(7, 1, 600, "5e9"), None, 20000),
(SimParams43(7, 1, 600, "1e10"), None, 20000), (SimParams43(7, 1, 600, "1e10"), None, 20000),
(SimParams43(7, 1, 600, "2e10"), None, 20000), (SimParams43(7, 1, 600, "2e10"), None, 20000),
(SimParams43(4, 2, 600, "1e10"), None, 20000),
(SimParams43(4, 2, 600, "2e10"), None, 20000),
(SimParams43(4, 2, 600, "30000001024e0"), None, 20000), # 3e10
] ]
measurements = { real.machine_name: [human, norm, None, None] for (real, human, norm) in sims } measurements = { real.machine_name: [human, norm, None, None] for (real, human, norm) in sims }
@@ -3162,8 +3165,11 @@ Piecewise(
set_meas("43-0.0004rad-2coupling-7_1_winding-1e10-drive", """ set_meas("43-0.0004rad-2coupling-7_1_winding-1e10-drive", """
Piecewise( Piecewise(
[ [
[ -16501, 4203 ], # -2.0
[ -16325, 4200 ], # -1.0 [ -16325, 4200 ], # -1.0
[ 1164, 4497 ], # 0.0
[ 16471, 4871 ], # 1.0 [ 16471, 4871 ], # 1.0
[ 16605, 4877 ], # 2.0
] ]
) )
""") """)
@@ -3328,6 +3334,32 @@ Piecewise(
) )
""") """)
set_meas("43-0.0004rad-3coupling-5_1_winding-30000001024e0-drive", """
Piecewise(
[
[ -16855, -15745 ], # -2.0
[ -16818, -15742 ], # -1.0
[ -16765, -15743 ], # -0.5
[ -16684, -15744 ], # -0.3
[ -16638, -15742 ], # -0.25
[ -16550, -15742 ], # -0.2
[ -14280, -15740 ], # -0.15
[ -5019, -15722 ], # -0.1
[ 2131, -15645 ], # -0.05
[ 6131, -15554 ], # 0.0
[ 9158, -15469 ], # 0.05
[ 12202, -15376 ], # 0.1
[ 15674, -15265 ], # 0.15
[ 16459, -15243 ], # 0.2
[ 16584, -15239 ], # 0.25
[ 16655, -15237 ], # 0.3
[ 16766, -15233 ], # 0.5
[ 16826, -15232 ], # 1.0
[ 16848, -15229 ], # 2.0
]
)
""")
set_meas("43-0.0004rad-5coupling-3_1_winding-2e9-drive", """ set_meas("43-0.0004rad-5coupling-3_1_winding-2e9-drive", """
Piecewise( Piecewise(
[ [
@@ -3393,8 +3425,11 @@ Piecewise(
set_meas("43-0.0004rad-5coupling-3_1_winding-1e10-drive", """ set_meas("43-0.0004rad-5coupling-3_1_winding-1e10-drive", """
Piecewise( Piecewise(
[ [
[ -16861, -15654 ], # -2.0
[ -16824, -15656 ], # -1.0 [ -16824, -15656 ], # -1.0
[ 9512, -13473 ], # 0.0
[ 16791, -12547 ], # 1.0 [ 16791, -12547 ], # 1.0
[ 16839, -12547 ], # 2.0
] ]
) )
""") """)
@@ -3402,7 +3437,11 @@ Piecewise(
set_meas("43-0.0004rad-5coupling-3_1_winding-149999992832e0-drive", """ set_meas("43-0.0004rad-5coupling-3_1_winding-149999992832e0-drive", """
Piecewise( Piecewise(
[ [
[ -17018, -3558 ], # -2.0
[ -16995, -3535 ], # -1.0
[ 4265, -3990 ], # 0.0
[ 16771, -4213 ], # 1.0 [ 16771, -4213 ], # 1.0
[ 16801, -4217 ], # 2.0
] ]
) )
""") """)
@@ -3433,9 +3472,25 @@ Piecewise(
set_meas("43-0.00059999997rad-7coupling-3_1_winding-3e9-drive", """ set_meas("43-0.00059999997rad-7coupling-3_1_winding-3e9-drive", """
Piecewise( Piecewise(
[ [
[ -16766, 4631 ], # -2.0
[ -15848, 4681 ], # -1.0 [ -15848, 4681 ], # -1.0
[ -492, 5288 ], # -0.5
[ 12, 5319 ], # -0.3
[ 71, 5323 ], # -0.25
[ 126, 5327 ], # -0.2
[ 174, 5331 ], # -0.15
[ 220, 5335 ], # -0.1
[ 297, 5340 ], # -0.05
[ 472, 5351 ], # 0.0 [ 472, 5351 ], # 0.0
[ 734, 5368 ], # 0.05
[ 1061, 5389 ], # 0.1
[ 1445, 5413 ], # 0.15
[ 1882, 5441 ], # 0.2
[ 2363, 5471 ], # 0.25
[ 2885, 5504 ], # 0.3
[ 5324, 5662 ], # 0.5
[ 15868, 6306 ], # 1.0 [ 15868, 6306 ], # 1.0
[ 16768, 6393 ], # 2.0
] ]
) )
""") """)
@@ -3443,9 +3498,11 @@ Piecewise(
set_meas("43-0.00059999997rad-7coupling-3_1_winding-5e9-drive", """ set_meas("43-0.00059999997rad-7coupling-3_1_winding-5e9-drive", """
Piecewise( Piecewise(
[ [
[ -16823, 394 ], # -2.0
[ -16750, 340 ], # -1.0 [ -16750, 340 ], # -1.0
[ 5257, 1485 ], # 0.0 [ 5257, 1485 ], # 0.0
[ 16738, 2003 ], # 1.0 [ 16738, 2003 ], # 1.0
[ 16818, 1978 ], # 2.0
] ]
) )
""") """)
@@ -3453,9 +3510,11 @@ Piecewise(
set_meas("43-0.00059999997rad-7coupling-3_1_winding-1e10-drive", """ set_meas("43-0.00059999997rad-7coupling-3_1_winding-1e10-drive", """
Piecewise( Piecewise(
[ [
[ -16863, -14903 ], # -2.0
[ -16834, -14911 ], # -1.0 [ -16834, -14911 ], # -1.0
[ 9322, -12390 ], # 0.0 [ 9322, -12390 ], # 0.0
[ 16817, -11570 ], # 1.0 [ 16817, -11570 ], # 1.0
[ 16847, -11558 ], # 2.0
] ]
) )
""") """)
@@ -3463,8 +3522,47 @@ Piecewise(
set_meas("43-0.00059999997rad-7coupling-3_1_winding-2e10-drive", """ set_meas("43-0.00059999997rad-7coupling-3_1_winding-2e10-drive", """
Piecewise( Piecewise(
[ [
[ -16899, -16098 ], # -2.0
[ -16874, -16099 ], # -1.0 [ -16874, -16099 ], # -1.0
[ 8624, -14621 ], # 0.0
[ 16849, -13622 ], # 1.0 [ 16849, -13622 ], # 1.0
[ 16867, -13615 ], # 2.0
]
)
""")
set_meas("43-0.00059999997rad-4coupling-5_1_winding-1e10-drive", """
Piecewise(
[
[ -16755, -1427 ], # -2.0
[ -16699, -1435 ], # -1.0
[ 3637, -627 ], # 0.0
[ 16714, -168 ], # 1.0
[ 16778, -183 ], # 2.0
]
)
""")
set_meas("43-0.00059999997rad-4coupling-5_1_winding-2e10-drive", """
Piecewise(
[
[ -16821, -15570 ], # -2.0
[ -16771, -15569 ], # -1.0
[ 5377, -14463 ], # 0.0
[ 16802, -13682 ], # 1.0
[ 16851, -13693 ], # 2.0
]
)
""")
set_meas("43-0.00059999997rad-4coupling-5_1_winding-30000001024e0-drive", """
Piecewise(
[
[ -16857, -15327 ], # -2.0
[ -16807, -15323 ], # -1.0
[ 5536, -14712 ], # 0.0
[ 16840, -14200 ], # 1.0
[ 16860, -14200 ], # 2.0
] ]
) )
""") """)

View File

@@ -4517,30 +4517,30 @@ fn main() {
] { ] {
for (coupling_loops, s0_loops, s_major, cur_flt) in [ for (coupling_loops, s0_loops, s_major, cur_flt) in [
(7, 1, um(600), 3e9), // verified geom; (4700, 6300) (7, 1, um(600), 3e9), // verified geom; (4700, 6300)
(7, 1, um(600), 5e9), // verified geom (7, 1, um(600), 5e9), // verified geom; (300, 2000)
(7, 1, um(600), 1e10), // verified geom (7, 1, um(600), 1e10), // verified geom; (-14900, -11600)
(7, 1, um(600), 2e10), // verified geom (7, 1, um(600), 2e10), // verified geom; (-16100, -13600)
(4, 2, um(600), 1e10), (4, 2, um(600), 1e10), // (-1400, -200)
(4, 2, um(600), 2e10), (4, 2, um(600), 2e10), // (-15600, -13700)
(4, 2, um(600), 3e10), (4, 2, um(600), 3e10), // (-15300, -14200)
// generally not viable (parens represent f(-16000), f(+16000)) // generally not viable (parens represent f(-16000), f(+16000))
(2, 3, um(400), 1e10), (2, 3, um(400), 1e10), // ( 4200, 4900)
(2, 3, um(400), 2e10), // (-7900, -6900) (2, 3, um(400), 2e10), // ( -7900, -6900)
(2, 3, um(400), 3e10), (2, 3, um(400), 3e10), // (-15700, -15200)
// (3, 2, um(400), 2e9), // verified geom; M1 initialization varies // (3, 2, um(400), 2e9), // verified geom; M1 initialization varies
(3, 2, um(400), 3e9), // verified geom; M1 isn't fully initialized // (3, 2, um(400), 3e9), // verified geom; M1 isn't fully initialized
(3, 2, um(400), 5e9), // verified geom; (5700, 6700) (3, 2, um(400), 5e9), // verified geom; (5700, 6700)
(3, 2, um(400), 1e10), // verified geom; (-3700, -2400) (3, 2, um(400), 1e10), // verified geom; (-3700, -2400)
(3, 2, um(400), 2e10), // verified geom; (-16000, -15200) (3, 2, um(400), 2e10), // verified geom; (-16000, -15200)
(3, 2, um(400), 3e10), // verified geom (3, 2, um(400), 3e10), // verified geom; (-15700, -15200)
(5, 1, um(400), 2e9), (5, 1, um(400), 2e9), // (8100, 9500)
(5, 1, um(400), 3e9), // (3900, 5700) (5, 1, um(400), 3e9), // (3900, 5700)
(5, 1, um(400), 5e9), // (-500, 1200) (5, 1, um(400), 5e9), // (-500, 1200)
(5, 1, um(400), 8e9), // (-10700, -8300) (5, 1, um(400), 8e9), // (-10700, -8300)
(5, 1, um(400), 1e10), (5, 1, um(400), 1e10), // (-15700, -12500)
(5, 1, um(400), 15e10), // (5, 1, um(400), 15e10), // so much tx it double-inverts (i meant to write 15e9)
// (5, 1, um(400), 2e10), // (-16400, -14300) (5, 1, um(400), 2e10), // (-16400, -14300)
// (5, 1, um(400), 4e10), // so much tx it double-inverts // (5, 1, um(400), 4e10), // so much tx it double-inverts
] { ] {
for &init_flt in init_set { for &init_flt in init_set {