Skip to content

Commit 0ed04f1

Browse files
andySiglerandySigler
committed
revert to old schema so so it works; only sleep if not simulating
1 parent b48d96f commit 0ed04f1

File tree

2 files changed

+78
-85
lines changed
  • hardware-testing/hardware_testing/gravimetric
  • shared-data/pipette/definitions/2/liquid/single_channel/p1000

2 files changed

+78
-85
lines changed

‎hardware-testing/hardware_testing/gravimetric/execute.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,8 @@ def _calculate_evaporation(
387387
f"wait for scale to stabilize "
388388
f"({i + 1}/{config.SCALE_SECONDS_TO_TRUE_STABILIZE})"
389389
)
390-
sleep(1)
390+
if not resources.ctx.is_simulating():
391+
sleep(1)
391392
actual_asp_list_evap: List[float] = []
392393
actual_disp_list_evap: List[float] = []
393394
for b_trial in blank_trials[resources.test_volumes[-1]][0]:

‎shared-data/pipette/definitions/2/liquid/single_channel/p1000/3_5.json

Lines changed: 76 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -9,54 +9,50 @@
99
"defaultTipOverlap": 10.5,
1010
"defaultReturnTipHeight": 0.71,
1111
"aspirate": {
12-
"default": {
13-
"1": [
14-
[0.598667, 5.492916, 0.238012],
15-
[1.008667, 4.441331, 0.867561],
16-
[1.703333, 3.134903, 2.185311],
17-
[2.148, 2.093612, 3.958978],
18-
[2.630667, 1.531735, 5.165890],
19-
[2.968667, 0.130993, 8.850773],
20-
[3.040667, -6.20796, 27.669014],
21-
[3.212, 0.534702, 7.166826],
22-
[3.542, 1.528965, 3.973251],
23-
[4.394, 1.677278, 3.447926],
24-
[5.366, 0.947649, 6.653918],
25-
[6.161333, 0.32074, 10.017910],
26-
[8.794667, 0.274041, 10.305637],
27-
[10.542667, 0.161462, 11.295736],
28-
[13.850667, 0.104161, 11.899836],
29-
[22.955333, 0.053443, 12.602318],
30-
[29.402, 0.027894, 13.188802],
31-
[47.971333, 0.015576, 13.550976],
32-
[54.092, 0.006549, 13.984019]
33-
]
34-
}
12+
"default": [
13+
[0.598667, 5.492916, 0.238012],
14+
[1.008667, 4.441331, 0.867561],
15+
[1.703333, 3.134903, 2.185311],
16+
[2.148, 2.093612, 3.958978],
17+
[2.630667, 1.531735, 5.165890],
18+
[2.968667, 0.130993, 8.850773],
19+
[3.040667, -6.20796, 27.669014],
20+
[3.212, 0.534702, 7.166826],
21+
[3.542, 1.528965, 3.973251],
22+
[4.394, 1.677278, 3.447926],
23+
[5.366, 0.947649, 6.653918],
24+
[6.161333, 0.32074, 10.017910],
25+
[8.794667, 0.274041, 10.305637],
26+
[10.542667, 0.161462, 11.295736],
27+
[13.850667, 0.104161, 11.899836],
28+
[22.955333, 0.053443, 12.602318],
29+
[29.402, 0.027894, 13.188802],
30+
[47.971333, 0.015576, 13.550976],
31+
[54.092, 0.006549, 13.984019]
32+
]
3533
},
3634
"dispense": {
37-
"default": {
38-
"1": [
39-
[0.598667, 5.492916, 0.238012],
40-
[1.008667, 4.441331, 0.867561],
41-
[1.703333, 3.134903, 2.185311],
42-
[2.148, 2.093612, 3.958978],
43-
[2.630667, 1.531735, 5.165890],
44-
[2.968667, 0.130993, 8.850773],
45-
[3.040667, -6.20796, 27.669014],
46-
[3.212, 0.534702, 7.166826],
47-
[3.542, 1.528965, 3.973251],
48-
[4.394, 1.677278, 3.447926],
49-
[5.366, 0.947649, 6.653918],
50-
[6.161333, 0.32074, 10.017910],
51-
[8.794667, 0.274041, 10.305637],
52-
[10.542667, 0.161462, 11.295736],
53-
[13.850667, 0.104161, 11.899836],
54-
[22.955333, 0.053443, 12.602318],
55-
[29.402, 0.027894, 13.188802],
56-
[47.971333, 0.015576, 13.550976],
57-
[54.092, 0.006549, 13.984019]
58-
]
59-
}
35+
"default": [
36+
[0.598667, 5.492916, 0.238012],
37+
[1.008667, 4.441331, 0.867561],
38+
[1.703333, 3.134903, 2.185311],
39+
[2.148, 2.093612, 3.958978],
40+
[2.630667, 1.531735, 5.165890],
41+
[2.968667, 0.130993, 8.850773],
42+
[3.040667, -6.20796, 27.669014],
43+
[3.212, 0.534702, 7.166826],
44+
[3.542, 1.528965, 3.973251],
45+
[4.394, 1.677278, 3.447926],
46+
[5.366, 0.947649, 6.653918],
47+
[6.161333, 0.32074, 10.017910],
48+
[8.794667, 0.274041, 10.305637],
49+
[10.542667, 0.161462, 11.295736],
50+
[13.850667, 0.104161, 11.899836],
51+
[22.955333, 0.053443, 12.602318],
52+
[29.402, 0.027894, 13.188802],
53+
[47.971333, 0.015576, 13.550976],
54+
[54.092, 0.006549, 13.984019]
55+
]
6056
},
6157
"defaultBlowoutVolume": 3.2
6258
},
@@ -143,46 +139,42 @@
143139
"defaultTipOverlap": 10.5,
144140
"defaultReturnTipHeight": 0.82,
145141
"aspirate": {
146-
"default": {
147-
"1": [
148-
[1.915833, 1.927128, 3.925446],
149-
[2.815833, 1.488084, 4.766582],
150-
[4.740833, 0.734841, 6.887589],
151-
[9.56, 0.312748, 8.888660],
152-
[11.899167, 0.185659, 10.103631],
153-
[14.8525, 0.147322, 10.559816],
154-
[51.128333, 0.042193, 12.121236],
155-
[92.410833, 0.010715, 13.730653],
156-
[112.169167, 0.004993, 14.259441],
157-
[243.099167, 0.002853, 14.499515],
158-
[355.853333, 0.000919, 14.969688],
159-
[430.2725, 0.000569, 15.094064],
160-
[627.886667, 0.000284, 15.216604],
161-
[999.469167, 0.000101, 15.331563],
162-
[1103.450833, 0.0, 15.433145]
163-
]
164-
}
142+
"default": [
143+
[1.915833, 1.927128, 3.925446],
144+
[2.815833, 1.488084, 4.766582],
145+
[4.740833, 0.734841, 6.887589],
146+
[9.56, 0.312748, 8.888660],
147+
[11.899167, 0.185659, 10.103631],
148+
[14.8525, 0.147322, 10.559816],
149+
[51.128333, 0.042193, 12.121236],
150+
[92.410833, 0.010715, 13.730653],
151+
[112.169167, 0.004993, 14.259441],
152+
[243.099167, 0.002853, 14.499515],
153+
[355.853333, 0.000919, 14.969688],
154+
[430.2725, 0.000569, 15.094064],
155+
[627.886667, 0.000284, 15.216604],
156+
[999.469167, 0.000101, 15.331563],
157+
[1103.450833, 0.0, 15.433145]
158+
]
165159
},
166160
"dispense": {
167-
"default": {
168-
"1": [
169-
[1.915833, 1.927128, 3.925446],
170-
[2.815833, 1.488084, 4.766582],
171-
[4.740833, 0.734841, 6.887589],
172-
[9.56, 0.312748, 8.888660],
173-
[11.899167, 0.185659, 10.103631],
174-
[14.8525, 0.147322, 10.559816],
175-
[51.128333, 0.042193, 12.121236],
176-
[92.410833, 0.010715, 13.730653],
177-
[112.169167, 0.004993, 14.259441],
178-
[243.099167, 0.002853, 14.499515],
179-
[355.853333, 0.000919, 14.969688],
180-
[430.2725, 0.000569, 15.094064],
181-
[627.886667, 0.000284, 15.216604],
182-
[999.469167, 0.000101, 15.331563],
183-
[1103.450833, 0.0, 15.433145]
184-
]
185-
}
161+
"default": [
162+
[1.915833, 1.927128, 3.925446],
163+
[2.815833, 1.488084, 4.766582],
164+
[4.740833, 0.734841, 6.887589],
165+
[9.56, 0.312748, 8.888660],
166+
[11.899167, 0.185659, 10.103631],
167+
[14.8525, 0.147322, 10.559816],
168+
[51.128333, 0.042193, 12.121236],
169+
[92.410833, 0.010715, 13.730653],
170+
[112.169167, 0.004993, 14.259441],
171+
[243.099167, 0.002853, 14.499515],
172+
[355.853333, 0.000919, 14.969688],
173+
[430.2725, 0.000569, 15.094064],
174+
[627.886667, 0.000284, 15.216604],
175+
[999.469167, 0.000101, 15.331563],
176+
[1103.450833, 0.0, 15.433145]
177+
]
186178
},
187179
"defaultBlowoutVolume": 16
188180
}

0 commit comments

Comments
 (0)