Compare commits

...

2 Commits

6 changed files with 170 additions and 35 deletions

View File

@ -8,6 +8,8 @@ import os
import sys
import re
from natsort import natsorted
from stacked_cores import load_csv, labeled_rows, last_row_before_t, extract_m
from stacked_cores_39xx import extract_polarity
@ -58,7 +60,7 @@ class ParameterizedMeas:
def __repr__(self) -> str:
meas_entries = "\n".join(
f" {format_float_tuple(k)}: {indented(format_list(v))}," for (k, v) in sorted(self.meas.items())
f" {format_float_tuple(k)}: {indented(format_list(v))}," for (k, v) in natsorted(self.meas.items())
)
return f"ParameterizedMeas({{\n{meas_entries}\n}})"

View File

@ -2,6 +2,7 @@
from math import sqrt
from natsort import natsorted
import plotly.express as px
from pandas import DataFrame
@ -87,6 +88,6 @@ sweep_a1 = lambda a0, points=101: [(a0, unit_to_m(x/(points-1))) for x in range(
unit_to_m = lambda u: -17000 + 34000 * u
for name, meas in sorted(or_gates.items()):
for name, meas in natsorted(or_gates.items()):
trace = eval_series(meas, sweep_a1(-17000))
plot(f"{name}", "a1", trace)

View File

@ -2,6 +2,8 @@
import os
from natsort import natsorted
from extract_meas import extract_parameterized_meas, indented
from stacked_cores_52xx_db import DB
@ -32,7 +34,7 @@ def dump(path: str, db: dict):
with open(path, "w") as f:
f.write("from extract_meas import MeasRow, ParameterizedMeas\n\n")
f.write("DB = {")
for k, v in sorted(db.items()):
for k, v in natsorted(db.items()):
f.write(indented(f"\n{k!r}: {v},"))
f.write("\n}")

View File

@ -1,12 +1,119 @@
from extract_meas import MeasRow, ParameterizedMeas
DB = {
'52-or--0.0004rad-500ctl_cond-20000coupling_cond-2000ps-100ps-3ctl-3coupling-3_1_winding-49999998976e0-drive-': ParameterizedMeas({
(-1.000, -1.000,): [
MeasRow(2e-09, [-17062, -17312, -17911, -17059]),
MeasRow(4e-09, [-29152, -29125, -9394, -11763]),
MeasRow(8e-09, [-29139, -29027, -28928, 8454]),
],
(-1.000, -0.600,): [
MeasRow(2e-09, [-17049, -17250, -17822, -17047]),
MeasRow(4e-09, [-29152, -29124, -9304, -11748]),
MeasRow(8e-09, [-29139, -29027, -28927, 8510]),
],
(-1.000, -0.500,): [
MeasRow(2e-09, [-17046, -17233, -17799, -17044]),
MeasRow(4e-09, [-29152, -29124, -9280, -11740]),
MeasRow(8e-09, [-29139, -29027, -28928, 8526]),
],
(-1.000, -0.400,): [
MeasRow(2e-09, [-17041, -17203, -17776, -17038]),
MeasRow(4e-09, [-29152, -29124, -9251, -11762]),
MeasRow(8e-09, [-29138, -29026, -28927, 8543]),
],
(-1.000, -0.300,): [
MeasRow(2e-09, [-17025, -16794, -17680, -17023]),
MeasRow(4e-09, [-29152, -29124, -9052, -11854]),
MeasRow(8e-09, [-29138, -29028, -28927, 8625]),
],
(-1.000, -0.250,): [
MeasRow(2e-09, [-17017, -13349, -17566, -17018]),
MeasRow(4e-09, [-29152, -29101, -7798, -12233]),
MeasRow(8e-09, [-29136, -29018, -28917, 9222]),
],
(-1.000, -0.200,): [
MeasRow(2e-09, [-17016, -8254, -17579, -17019]),
MeasRow(4e-09, [-29153, -29079, -6145, -12731]),
MeasRow(8e-09, [-29133, -29013, -28906, 10007]),
],
(-1.000, -0.150,): [
MeasRow(2e-09, [-17018, -2733, -17595, -17020]),
MeasRow(4e-09, [-29155, -29054, -4420, -13191]),
MeasRow(8e-09, [-29130, -29004, -28897, 10827]),
],
(-1.000, -0.100,): [
MeasRow(2e-09, [-17020, 2931, -17613, -17022]),
MeasRow(4e-09, [-29158, -29032, -2679, -13601]),
MeasRow(8e-09, [-29127, -28997, -28888, 11633]),
],
(-1.000, -0.050,): [
MeasRow(2e-09, [-17023, 8654, -17630, -17023]),
MeasRow(4e-09, [-29160, -29008, -950, -13991]),
MeasRow(8e-09, [-29124, -28988, -28879, 12402]),
],
(-1.000, 0.000,): [
MeasRow(2e-09, [-17023, 13648, -17638, -17023]),
MeasRow(4e-09, [-29163, -28990, 569, -14326]),
MeasRow(8e-09, [-29121, -28986, -28871, 13032]),
],
(-1.000, 1.000,): [
MeasRow(2e-09, [-16965, 16158, -17435, -16962]),
MeasRow(4e-09, [-29165, -28975, 1495, -14497]),
MeasRow(8e-09, [-29118, -28980, -28866, 13417]),
],
( 0.000, 0.000,): [
MeasRow(2e-09, [ 13197, 14274, -17489, -16997]),
MeasRow(4e-09, [-29132, -28975, 5489, -14455]),
MeasRow(8e-09, [-29110, -28967, -28847, 14870]),
],
( 1.000, -1.000,): [
MeasRow(2e-09, [ 16364, -17232, -17722, -17014]),
MeasRow(4e-09, [-29122, -29129, -3513, -13042]),
MeasRow(8e-09, [-29126, -29003, -28892, 11345]),
],
( 1.000, 1.000,): [
MeasRow(2e-09, [ 16590, 16410, -17188, -16904]),
MeasRow(4e-09, [-29126, -28962, 6689, -14511]),
MeasRow(8e-09, [-29105, -28961, -28842, 15194]),
],
}),
'52-or--0.0004rad-1000ctl_cond-20000coupling_cond-2000ps-100ps-3ctl-3coupling-3_1_winding-2e10-drive-': ParameterizedMeas({
(-1.000, -1.000,): [
MeasRow(2e-09, [-16877, -16904, -16285, -16878]),
MeasRow(4e-09, [-28630, -28441, -8576, -15553]),
MeasRow(8e-09, [-28306, -28231, -28077, 177]),
],
(-1.000, -0.600,): [
MeasRow(2e-09, [-16875, -16840, -16382, -16877]),
MeasRow(4e-09, [-28630, -28439, -8627, -15556]),
MeasRow(8e-09, [-28307, -28228, -28076, 152]),
],
(-1.000, -0.400,): [
MeasRow(2e-09, [-16872, -16310, -16545, -16877]),
MeasRow(4e-09, [-28632, -28424, -8565, -15626]),
MeasRow(8e-09, [-28305, -28229, -28075, 152]),
],
(-1.000, -0.300,): [
MeasRow(2e-09, [-16877, -11805, -16718, -16893]),
MeasRow(4e-09, [-28665, -28282, -7051, -16161]),
MeasRow(8e-09, [-28298, -28211, -28071, 685]),
],
(-1.000, -0.200,): [
MeasRow(2e-09, [-16877, -6265, -16901, -16907]),
MeasRow(4e-09, [-28702, -28186, -5242, -16507]),
MeasRow(8e-09, [-28289, -28206, -28068, 1497]),
],
(-1.000, -0.100,): [
MeasRow(2e-09, [-16877, -36, -17024, -16921]),
MeasRow(4e-09, [-28738, -28130, -3343, -16636]),
MeasRow(8e-09, [-28284, -28201, -28068, 2428]),
],
(-1.000, -0.050,): [
MeasRow(2e-09, [-16876, 3282, -17068, -16926]),
MeasRow(4e-09, [-28760, -28110, -2418, -16672]),
MeasRow(8e-09, [-28282, -28200, -28066, 2883]),
],
(-1.000, 0.000,): [
MeasRow(2e-09, [-16874, 6656, -17107, -16929]),
MeasRow(4e-09, [-28777, -28098, -1512, -16687]),
@ -167,6 +274,51 @@ DB = {
MeasRow(4e-09, [-30532, -30505, -8672, -11666]),
MeasRow(8e-09, [-30542, -30568, -30482, 6999]),
],
(-1.000, -0.600,): [
MeasRow(2e-09, [-17256, -17700, -18846, -17245]),
MeasRow(4e-09, [-30532, -30505, -8594, -11662]),
MeasRow(8e-09, [-30542, -30569, -30482, 7020]),
],
(-1.000, -0.500,): [
MeasRow(2e-09, [-17252, -17684, -18820, -17240]),
MeasRow(4e-09, [-30532, -30505, -8569, -11658]),
MeasRow(8e-09, [-30542, -30569, -30482, 7038]),
],
(-1.000, -0.400,): [
MeasRow(2e-09, [-17246, -17666, -18788, -17235]),
MeasRow(4e-09, [-30532, -30506, -8539, -11656]),
MeasRow(8e-09, [-30542, -30569, -30482, 7051]),
],
(-1.000, -0.300,): [
MeasRow(2e-09, [-17239, -17644, -18751, -17229]),
MeasRow(4e-09, [-30532, -30506, -8502, -11638]),
MeasRow(8e-09, [-30542, -30569, -30482, 7085]),
],
(-1.000, -0.250,): [
MeasRow(2e-09, [-17235, -17630, -18729, -17225]),
MeasRow(4e-09, [-30532, -30506, -8482, -11643]),
MeasRow(8e-09, [-30542, -30569, -30482, 7079]),
],
(-1.000, -0.200,): [
MeasRow(2e-09, [-17230, -17615, -18704, -17220]),
MeasRow(4e-09, [-30532, -30506, -8459, -11654]),
MeasRow(8e-09, [-30542, -30569, -30482, 7090]),
],
(-1.000, -0.150,): [
MeasRow(2e-09, [-17224, -17604, -18673, -17215]),
MeasRow(4e-09, [-30532, -30506, -8428, -11637]),
MeasRow(8e-09, [-30542, -30569, -30482, 7107]),
],
(-1.000, -0.100,): [
MeasRow(2e-09, [-17217, -17527, -18629, -17207]),
MeasRow(4e-09, [-30532, -30506, -8376, -11659]),
MeasRow(8e-09, [-30542, -30569, -30482, 7121]),
],
(-1.000, -0.050,): [
MeasRow(2e-09, [-17208, -7269, -18390, -17200]),
MeasRow(4e-09, [-30531, -30498, -5269, -12143]),
MeasRow(8e-09, [-30542, -30566, -30475, 8128]),
],
(-1.000, 0.000,): [
MeasRow(2e-09, [-17208, 12746, -18402, -17198]),
MeasRow(4e-09, [-30531, -30485, 340, -13040]),
@ -193,36 +345,4 @@ DB = {
MeasRow(8e-09, [-30540, -30556, -30463, 11596]),
],
}),
'52-or--0.0004rad-500ctl_cond-20000coupling_cond-2000ps-100ps-3ctl-3coupling-3_1_winding-49999998976e0-drive-': ParameterizedMeas({
(-1.000, -1.000,): [
MeasRow(2e-09, [-17062, -17312, -17911, -17059]),
MeasRow(4e-09, [-29152, -29125, -9394, -11763]),
MeasRow(8e-09, [-29139, -29027, -28928, 8454]),
],
(-1.000, 0.000,): [
MeasRow(2e-09, [-17023, 13648, -17638, -17023]),
MeasRow(4e-09, [-29163, -28990, 569, -14326]),
MeasRow(8e-09, [-29121, -28986, -28871, 13032]),
],
(-1.000, 1.000,): [
MeasRow(2e-09, [-16965, 16158, -17435, -16962]),
MeasRow(4e-09, [-29165, -28975, 1495, -14497]),
MeasRow(8e-09, [-29118, -28980, -28866, 13417]),
],
( 0.000, 0.000,): [
MeasRow(2e-09, [ 13197, 14274, -17489, -16997]),
MeasRow(4e-09, [-29132, -28975, 5489, -14455]),
MeasRow(8e-09, [-29110, -28967, -28847, 14870]),
],
( 1.000, -1.000,): [
MeasRow(2e-09, [ 16364, -17232, -17722, -17014]),
MeasRow(4e-09, [-29122, -29129, -3513, -13042]),
MeasRow(8e-09, [-29126, -29003, -28892, 11345]),
],
( 1.000, 1.000,): [
MeasRow(2e-09, [ 16590, 16410, -17188, -16904]),
MeasRow(4e-09, [-29126, -28962, 6689, -14511]),
MeasRow(8e-09, [-29105, -28961, -28842, 15194]),
],
}),
}

View File

@ -5684,6 +5684,15 @@ fn main() {
for init_set in [
&[
// targeted
(-1.00, -0.20),
(-1.00, -0.40),
(-1.00, -0.60),
(-1.00, -0.10),
(-1.00, -0.30),
(-1.00, -0.05),
(-1.00, -0.15),
(-1.00, -0.25),
(-1.00, -0.50),
][..],
&[
// establish the domain/range

View File

@ -15,6 +15,7 @@
};
rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
python-packages = pypkg: with pypkg; [
natsort
pandas
plotly
];