diff --git a/crates/applications/stacked_cores/scripts/plot_inverters.py b/crates/applications/stacked_cores/scripts/plot_inverters.py index 2a8bb42..f76b4ca 100755 --- a/crates/applications/stacked_cores/scripts/plot_inverters.py +++ b/crates/applications/stacked_cores/scripts/plot_inverters.py @@ -3,7 +3,8 @@ from fake_cores_db import * from stacked_cores_40xx_db import * -_3e10 = "30000001024e0" +_3e10 = "30000001024e0" +_5e10 = "49999998976e0" class SimParamsCascaded(SimParams): def __init__(self, p1: SimParams, p2: SimParams): @@ -238,12 +239,16 @@ _49xx_study = from_params( _51xx_study = from_params( [ - + SimParams51(5e2, 2e4, 2000, 100, 5, 1, 400, _5e10), SimParams51(1e3, 2e4, 2000, 100, 5, 1, 400, "2e10"), SimParams51(2e3, 2e4, 2000, 100, 5, 1, 400, "1e10"), SimParams51(2e3, 2e4, 2000, 100, 5, 1, 400, "2e10"), SimParams51(2e3, 2e4, 2000, 100, 5, 1, 400, _3e10), SimParams51(5e3, 2e4, 2000, 100, 5, 1, 400, _3e10), + SimParams51(5e3, 2e4, 2000, 100, 5, 1, 400, _5e10), + SimParams51(2e3, 2e4, 2000, 100, 3, 2, 400, "2e10"), + SimParams51(2e3, 2e4, 2000, 100, 3, 2, 400, _5e10), + SimParams51(2e3, 2e4, 2000, 100, 2, 3, 400, _5e10), ] ) 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 82e147c..704d873 100755 --- a/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py +++ b/crates/applications/stacked_cores/scripts/stacked_cores_40xx_db.py @@ -6,8 +6,9 @@ import subprocess import sys # these floats can't be represented as f32, so stringify bad on the rust side -_15e9 = "15000000512e0" -_3e10 = "30000001024e0" +_15e9 = "15000000512e0" +_3e10 = "30000001024e0" +_5e10 = "49999998976e0" _15e10 = "149999992832e0" class SimParams: @@ -464,11 +465,16 @@ sims = [ (SimParams50(5e3, 4e4, 4000, 200, 5, 1, 400, "1e10"), None, 20000), (SimParams50(5e3, 4e4, 4000, 200, 5, 1, 400, "2e10"), None, 20000), + (SimParams51(5e2, 2e4, 2000, 100, 5, 1, 400, _5e10), None, 20000), (SimParams51(1e3, 2e4, 2000, 100, 5, 1, 400, "2e10"), None, 20000), (SimParams51(2e3, 2e4, 2000, 100, 5, 1, 400, "1e10"), None, 20000), (SimParams51(2e3, 2e4, 2000, 100, 5, 1, 400, "2e10"), None, 20000), (SimParams51(2e3, 2e4, 2000, 100, 5, 1, 400, _3e10), None, 20000), (SimParams51(5e3, 2e4, 2000, 100, 5, 1, 400, _3e10), None, 20000), + (SimParams51(5e3, 2e4, 2000, 100, 5, 1, 400, _5e10), None, 20000), + (SimParams51(2e3, 2e4, 2000, 100, 3, 2, 400, "2e10"), None, 20000), + (SimParams51(2e3, 2e4, 2000, 100, 3, 2, 400, _5e10), None, 20000), + (SimParams51(2e3, 2e4, 2000, 100, 2, 3, 400, _5e10), None, 20000), ] measurements = { real.machine_name: [human, norm, None, None] for (real, human, norm) in sims } @@ -5163,6 +5169,19 @@ Piecewise( ) """) +set_meas("51-0.0004rad-500ctl_cond-20000coupling_cond-2000ps-100ps-5ctl-5coupling-3_1_winding-49999998976e0-drive", """ +Piecewise( + [ + [ -17584, -6603 ], # -1.000, M1=-2536 + [ -14787, -8326 ], # -0.200, M1= -491 + [ -2111, -14126 ], # -0.100, M1= 6269 + [ 4214, -15241 ], # -0.050, M1= 8808 + [ 10359, -15908 ], # 0.000, M1=11011 + [ 16909, -16185 ], # 1.000, M1=13354 + ] +) +""") + set_meas("51-0.0004rad-1000ctl_cond-20000coupling_cond-2000ps-100ps-5ctl-5coupling-3_1_winding-2e10-drive", """ Piecewise( [ @@ -5235,6 +5254,7 @@ Piecewise( [ -4081, -6784 ], # -0.100, M1= 1528 [ 3400, -10964 ], # -0.050, M1= 5393 [ 10508, -14107 ], # 0.000, M1= 8877 + [ 16692, -15776 ], # 0.200, M1=11822 [ 16959, -15828 ], # 1.000, M1=12067 ] ) @@ -5260,4 +5280,25 @@ Piecewise( ) """) +set_meas("51-0.0004rad-5000ctl_cond-20000coupling_cond-2000ps-100ps-5ctl-5coupling-3_1_winding-49999998976e0-drive", """ +Piecewise( + [ + [ -18258, 2488 ], # -1.000, M1=-5473 + [ -17949, 2414 ], # -0.200, M1=-5187 + [ -17849, 2419 ], # -0.100, M1=-5102 + [ -15109, 1672 ], # -0.050, M1=-3758 + [ 8689, -4897 ], # 0.000, M1= 4806 + [ 17125, -7188 ], # 1.000, M1= 8350 + ] +) +""") + +set_meas("51-0.0004rad-2000ctl_cond-20000coupling_cond-2000ps-100ps-3ctl-3coupling-5_1_winding-2e10-drive", """ +Piecewise( + [ + [ 16849, -309 ], # 1.000, M1=-1196 + ] +) +""") + if __name__ == '__main__': main() diff --git a/crates/applications/stacked_cores/src/main.rs b/crates/applications/stacked_cores/src/main.rs index fce0510..ea11679 100644 --- a/crates/applications/stacked_cores/src/main.rs +++ b/crates/applications/stacked_cores/src/main.rs @@ -5597,12 +5597,18 @@ fn main() { ][..], ] { for (ctl_cond, coupling_cond, clock_duration, clock_decay, coupling_loops, s0_loops, s_major, cur_flt) in [ - // from 50-xx + (2e3, 2e4, ps(2000), ps(100), 3, 2, um(400), 2e10), + (2e3, 2e4, ps(2000), ps(100), 2, 3, um(400), 5e10), + (2e3, 2e4, ps(2000), ps(100), 3, 2, um(400), 5e10), + + (5e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 5e10), + (5e2, 2e4, ps(2000), ps(100), 5, 1, um(400), 5e10), + (1e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 2e10), - (2e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 2e10), - (5e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 3e10), (2e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 1e10), + (2e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 2e10), (2e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 3e10), + (5e3, 2e4, ps(2000), ps(100), 5, 1, um(400), 3e10), ] { for &init_flt in init_set {