Compare commits
2 Commits
e1867ee541
...
0e3212e624
Author | SHA1 | Date |
---|---|---|
colin | 0e3212e624 | |
colin | 2b8c5d45c2 |
|
@ -165,11 +165,16 @@ _48xx_study = [(p, get_meas(p)) for p in
|
|||
SimParams48(5e2, 2e4, 2000, 100, 9, 1, 400, "5e9"),
|
||||
# y0=0.70, slope0=1.7 until x=0.15
|
||||
SimParams48(5e2, 4e4, 4000, 200, 9, 1, 400, "1e10"),
|
||||
# TODO
|
||||
# y0=0.59, slope0=1.4 until x=0.20
|
||||
SimParams48(5e2, 4e4, 2000, 100, 9, 1, 400, "5e9"),
|
||||
|
||||
# y0=0.64, slope0=1.4 until x=0.20
|
||||
SimParams48(2e2, 1e4, 1000, 50, 9, 1, 400, "1e10"),
|
||||
|
||||
# y0=0.71, slope0=1.6 until x=0.15
|
||||
SimParams48(5e2, 1e5, 10000, 500, 9, 1, 400, "1e10"),
|
||||
# y0=0.62, slope0=1.3 until x=0.20
|
||||
SimParams48(5e2, 1e5, 10000, 500, 9, 1, 400, "5e9"),
|
||||
]
|
||||
]
|
||||
|
||||
|
@ -210,7 +215,7 @@ of_interest += _48xx_study
|
|||
# of_interest.sort(key = lambda i: i[1].get(0.5) - i[1].get(0.0)) # early output swing
|
||||
# of_interest.sort(key = lambda i: i[1].get_repeated(1.0) - i[1].get_repeated(0.0)) # inverter strength
|
||||
|
||||
for (params, curve) in of_interest[:10]:
|
||||
for (params, curve) in of_interest:
|
||||
curve = curve.flat_extrapolation()
|
||||
curve.plot(title = f"{params.human_name} mapping")
|
||||
curve.plot_slope(title = f"{params.human_name} slope")
|
||||
|
|
|
@ -398,6 +398,8 @@ sims = [
|
|||
(SimParams48(2e3, 2e4, 4000, 200, 9, 1, 400, "2e9"), None, 20000),
|
||||
(SimParams48(5e2, 4e4, 2000, 100, 9, 1, 400, "5e9"), None, 20000),
|
||||
(SimParams48(5e2, 4e4, 4000, 200, 9, 1, 400, "1e10"), None, 20000),
|
||||
(SimParams48(5e2, 1e5,10000, 500, 9, 1, 400, "5e9"), None, 20000),
|
||||
(SimParams48(5e2, 1e5,10000, 500, 9, 1, 400, "1e10"), None, 20000),
|
||||
(SimParams48(5e3, 5e4,10000, 500, 9, 1, 400, "5e8"), None, 20000),
|
||||
(SimParams48(5e3, 5e4,10000, 500, 9, 1, 400, "1e9"), None, 20000),
|
||||
]
|
||||
|
@ -4379,6 +4381,7 @@ set_meas("48-0.0004rad-1000ctl_cond-10000coupling_cond-2000ps-100ps-9ctl-9coupli
|
|||
Piecewise(
|
||||
[
|
||||
[ -16999, -3777 ], # -1.00
|
||||
[ -16742, -3787 ], # -0.50
|
||||
[ -13768, -1435 ], # -0.35
|
||||
[ -9559, 1353 ], # -0.30
|
||||
[ -5278, 3430 ], # -0.25
|
||||
|
@ -4570,6 +4573,28 @@ Piecewise(
|
|||
)
|
||||
""")
|
||||
|
||||
set_meas("48-0.0004rad-500ctl_cond-40000coupling_cond-2000ps-100ps-9ctl-9coupling-3_1_winding-5e9-drive", """
|
||||
Piecewise(
|
||||
[
|
||||
[ -21111, -4121 ], # -1.00
|
||||
[ -20681, -3380 ], # -0.50
|
||||
[ -19361, -1091 ], # -0.45
|
||||
[ -18997, -468 ], # -0.44
|
||||
[ -18209, 881 ], # -0.42
|
||||
[ -17350, 2421 ], # -0.40
|
||||
[ -16373, 4089 ], # -0.38
|
||||
[ -15169, 5937 ], # -0.36
|
||||
[ -14393, 7054 ], # -0.35
|
||||
[ -13568, 8200 ], # -0.34
|
||||
[ -10183, 12278 ], # -0.30
|
||||
[ -5878, 15315 ], # -0.25
|
||||
[ -1569, 15892 ], # -0.20
|
||||
[ 11211, 16460 ], # 0.00
|
||||
[ 18116, 16679 ], # 1.00
|
||||
]
|
||||
)
|
||||
""")
|
||||
|
||||
set_meas("48-0.0004rad-500ctl_cond-40000coupling_cond-4000ps-200ps-9ctl-9coupling-3_1_winding-1e10-drive", """
|
||||
Piecewise(
|
||||
[
|
||||
|
@ -4594,6 +4619,72 @@ Piecewise(
|
|||
)
|
||||
""")
|
||||
|
||||
set_meas("48-0.0004rad-500ctl_cond-100000coupling_cond-10000ps-500ps-9ctl-9coupling-3_1_winding-5e9-drive", """
|
||||
Piecewise(
|
||||
[
|
||||
[ -18009, 2478 ], # -1.00
|
||||
[ -17799, 2787 ], # -0.50
|
||||
[ -17330, 3494 ], # -0.40
|
||||
[ -17188, 3724 ], # -0.39
|
||||
[ -17022, 3998 ], # -0.38
|
||||
[ -16837, 4301 ], # -0.37
|
||||
[ -16630, 4643 ], # -0.36
|
||||
[ -16392, 5027 ], # -0.35
|
||||
[ -16119, 5448 ], # -0.34
|
||||
[ -15804, 5917 ], # -0.33
|
||||
[ -15419, 6482 ], # -0.32
|
||||
[ -14933, 7221 ], # -0.31
|
||||
[ -14121, 8389 ], # -0.30
|
||||
[ -13163, 9633 ], # -0.29
|
||||
[ -12182, 10842 ], # -0.28
|
||||
[ -11191, 12100 ], # -0.27
|
||||
[ -10188, 13226 ], # -0.26
|
||||
[ -9179, 14230 ], # -0.25
|
||||
[ -8166, 14951 ], # -0.24
|
||||
[ -7152, 15383 ], # -0.23
|
||||
[ -6137, 15611 ], # -0.22
|
||||
[ -4104, 15895 ], # -0.20
|
||||
[ -43, 16175 ], # -0.16
|
||||
[ 1987, 16260 ], # -0.14
|
||||
[ 3002, 16298 ], # -0.13
|
||||
[ 4015, 16332 ], # -0.12
|
||||
[ 12095, 16557 ], # 0.00
|
||||
[ 17086, 16676 ], # 1.00
|
||||
]
|
||||
)
|
||||
""")
|
||||
|
||||
set_meas("48-0.0004rad-500ctl_cond-100000coupling_cond-10000ps-500ps-9ctl-9coupling-3_1_winding-1e10-drive", """
|
||||
Piecewise(
|
||||
[
|
||||
[ -18257, 4896 ], # -1.00
|
||||
[ -18098, 5209 ], # -0.50
|
||||
[ -18035, 5337 ], # -0.40
|
||||
[ -17996, 5420 ], # -0.35
|
||||
[ -17988, 5441 ], # -0.34
|
||||
[ -17980, 5461 ], # -0.33
|
||||
[ -17970, 5482 ], # -0.32
|
||||
[ -17961, 5505 ], # -0.31
|
||||
[ -17950, 5529 ], # -0.30
|
||||
[ -17937, 5555 ], # -0.29
|
||||
[ -17922, 5584 ], # -0.28
|
||||
[ -17857, 5709 ], # -0.25
|
||||
[ -17368, 6578 ], # -0.20
|
||||
[ -16114, 8952 ], # -0.17
|
||||
[ -15371, 10306 ], # -0.16
|
||||
[ -13994, 12730 ], # -0.15
|
||||
[ -12074, 15831 ], # -0.14
|
||||
[ -10078, 16409 ], # -0.13
|
||||
[ -8057, 16687 ], # -0.12
|
||||
[ -6025, 16905 ], # -0.11
|
||||
[ -3987, 16940 ], # -0.10
|
||||
[ 6168, 16967 ], # -0.05
|
||||
[ 12301, 16969 ], # 0.00
|
||||
[ 17221, 16973 ], # 1.00
|
||||
]
|
||||
)
|
||||
""")
|
||||
|
||||
set_meas("48-0.0004rad-5000ctl_cond-50000coupling_cond-10000ps-500ps-9ctl-9coupling-3_1_winding-5e8-drive", """
|
||||
Piecewise(
|
||||
[
|
||||
|
|
|
@ -5189,6 +5189,67 @@ fn main() {
|
|||
// -0.13,
|
||||
// -0.12,
|
||||
// -0.11,
|
||||
// targeted for (5e2, 4e4, ps(2000), ps(100), 9, 1, um(400), 5e9)
|
||||
// -0.44,
|
||||
// -0.42,
|
||||
// -0.38,
|
||||
// -0.36,
|
||||
// -0.34,
|
||||
// -0.32,
|
||||
// -0.28,
|
||||
// -0.26,
|
||||
// -0.43,
|
||||
// -0.41,
|
||||
// -0.39,
|
||||
// -0.37,
|
||||
// -0.33,
|
||||
// -0.31,
|
||||
// -0.29,
|
||||
// -0.27,
|
||||
// -0.22,
|
||||
// -0.23,
|
||||
// -0.24,
|
||||
// -0.46,
|
||||
// -0.47,
|
||||
// -0.48,
|
||||
// -0.49,
|
||||
// -0.21,
|
||||
// -0.10,
|
||||
// -0.15,
|
||||
// -0.05,
|
||||
// 0.10,
|
||||
// 0.20,
|
||||
// targeted for (5e2, 1e5, ps(10000), ps(500), 9, 1, um(400), 1e10)
|
||||
// -0.14,
|
||||
// -0.13,
|
||||
// -0.12,
|
||||
// -0.16,
|
||||
// -0.17,
|
||||
// -0.11,
|
||||
|
||||
// -0.20,
|
||||
// -0.25,
|
||||
// -0.35,
|
||||
// -0.50,
|
||||
// -0.40,
|
||||
// -0.30,
|
||||
// -0.33,
|
||||
// -0.31,
|
||||
// -0.34,
|
||||
// -0.32,
|
||||
|
||||
// -0.29,
|
||||
// -0.28,
|
||||
// -0.27,
|
||||
// -0.26,
|
||||
|
||||
// -0.36,
|
||||
// -0.37,
|
||||
// -0.38,
|
||||
// -0.39,
|
||||
// -0.24,
|
||||
// -0.22,
|
||||
// -0.23,
|
||||
][..],
|
||||
&[
|
||||
// establish the domain/range
|
||||
|
@ -5200,13 +5261,16 @@ fn main() {
|
|||
-0.20,
|
||||
-0.10,
|
||||
-0.05,
|
||||
-0.35,
|
||||
-0.25,
|
||||
-0.15,
|
||||
// -0.35,
|
||||
// -0.50,
|
||||
// -0.25,
|
||||
-0.30,
|
||||
0.10,
|
||||
// -0.40,
|
||||
// -0.45,
|
||||
-0.15,
|
||||
// 0.10,
|
||||
// 0.20,
|
||||
0.35,
|
||||
// 0.35,
|
||||
][..],
|
||||
&[
|
||||
-0.05,
|
||||
|
@ -5263,7 +5327,7 @@ fn main() {
|
|||
|
||||
// (5e2, 1e4, ps(1000), ps(50), 9, 1, um(400), 3e9),
|
||||
|
||||
(5e2, 4e4, ps(2000), ps(100), 9, 1, um(400), 5e9),
|
||||
(5e2, 4e4, ps(2000), ps(100), 9, 1, um(400), 5e9), // mostly complete; y0=0.59, slope0=1.4
|
||||
// (5e2, 4e4, ps(4000), ps(200), 9, 1, um(400), 1e10), // complete. y0=0.70, slope0=1.4
|
||||
// (5e2, 2e4, ps(2000), ps(100), 9, 1, um(400), 1e10), // complete. slope0=1.6
|
||||
// (5e2, 2e4, ps(2000), ps(100), 9, 1, um(400), 5e9), // complete. slope0=1.3
|
||||
|
@ -5273,6 +5337,8 @@ fn main() {
|
|||
(2e3, 2e4, ps(4000), ps(200), 9, 1, um(400), 1e9),
|
||||
(5e3, 5e4, ps(10000),ps(500), 9, 1, um(400), 1e9), // too low slope
|
||||
(5e3, 5e4, ps(10000),ps(500), 9, 1, um(400), 5e8), // too low slope
|
||||
// (5e2, 1e5, ps(10000), ps(500), 9, 1, um(400), 5e9), // complete. y0=0.62, slope0=1.3
|
||||
// (5e2, 1e5, ps(10000), ps(500), 9, 1, um(400), 1e10), // complete. y0=0.71, slope0=1.6
|
||||
|
||||
] {
|
||||
for &init_flt in init_set {
|
||||
|
|
Loading…
Reference in New Issue