Skip to content

Commit

Permalink
revert to old schema so so it works; only sleep if not simulating
Browse files Browse the repository at this point in the history
  • Loading branch information
@andySigler
andySigler committed Aug 10, 2023
1 parent b48d96f commit 0ed04f1
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 85 deletions.
3 changes: 2 additions & 1 deletion hardware-testing/hardware_testing/gravimetric/execute.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,8 @@ def _calculate_evaporation(
f"wait for scale to stabilize "
f"({i + 1}/{config.SCALE_SECONDS_TO_TRUE_STABILIZE})"
)
sleep(1)
if not resources.ctx.is_simulating():
sleep(1)
actual_asp_list_evap: List[float] = []
actual_disp_list_evap: List[float] = []
for b_trial in blank_trials[resources.test_volumes[-1]][0]:
Expand Down
160 changes: 76 additions & 84 deletions shared-data/pipette/definitions/2/liquid/single_channel/p1000/3_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,54 +9,50 @@
"defaultTipOverlap": 10.5,
"defaultReturnTipHeight": 0.71,
"aspirate": {
"default": {
"1": [
[0.598667, 5.492916, 0.238012],
[1.008667, 4.441331, 0.867561],
[1.703333, 3.134903, 2.185311],
[2.148, 2.093612, 3.958978],
[2.630667, 1.531735, 5.165890],
[2.968667, 0.130993, 8.850773],
[3.040667, -6.20796, 27.669014],
[3.212, 0.534702, 7.166826],
[3.542, 1.528965, 3.973251],
[4.394, 1.677278, 3.447926],
[5.366, 0.947649, 6.653918],
[6.161333, 0.32074, 10.017910],
[8.794667, 0.274041, 10.305637],
[10.542667, 0.161462, 11.295736],
[13.850667, 0.104161, 11.899836],
[22.955333, 0.053443, 12.602318],
[29.402, 0.027894, 13.188802],
[47.971333, 0.015576, 13.550976],
[54.092, 0.006549, 13.984019]
]
}
"default": [
[0.598667, 5.492916, 0.238012],
[1.008667, 4.441331, 0.867561],
[1.703333, 3.134903, 2.185311],
[2.148, 2.093612, 3.958978],
[2.630667, 1.531735, 5.165890],
[2.968667, 0.130993, 8.850773],
[3.040667, -6.20796, 27.669014],
[3.212, 0.534702, 7.166826],
[3.542, 1.528965, 3.973251],
[4.394, 1.677278, 3.447926],
[5.366, 0.947649, 6.653918],
[6.161333, 0.32074, 10.017910],
[8.794667, 0.274041, 10.305637],
[10.542667, 0.161462, 11.295736],
[13.850667, 0.104161, 11.899836],
[22.955333, 0.053443, 12.602318],
[29.402, 0.027894, 13.188802],
[47.971333, 0.015576, 13.550976],
[54.092, 0.006549, 13.984019]
]
},
"dispense": {
"default": {
"1": [
[0.598667, 5.492916, 0.238012],
[1.008667, 4.441331, 0.867561],
[1.703333, 3.134903, 2.185311],
[2.148, 2.093612, 3.958978],
[2.630667, 1.531735, 5.165890],
[2.968667, 0.130993, 8.850773],
[3.040667, -6.20796, 27.669014],
[3.212, 0.534702, 7.166826],
[3.542, 1.528965, 3.973251],
[4.394, 1.677278, 3.447926],
[5.366, 0.947649, 6.653918],
[6.161333, 0.32074, 10.017910],
[8.794667, 0.274041, 10.305637],
[10.542667, 0.161462, 11.295736],
[13.850667, 0.104161, 11.899836],
[22.955333, 0.053443, 12.602318],
[29.402, 0.027894, 13.188802],
[47.971333, 0.015576, 13.550976],
[54.092, 0.006549, 13.984019]
]
}
"default": [
[0.598667, 5.492916, 0.238012],
[1.008667, 4.441331, 0.867561],
[1.703333, 3.134903, 2.185311],
[2.148, 2.093612, 3.958978],
[2.630667, 1.531735, 5.165890],
[2.968667, 0.130993, 8.850773],
[3.040667, -6.20796, 27.669014],
[3.212, 0.534702, 7.166826],
[3.542, 1.528965, 3.973251],
[4.394, 1.677278, 3.447926],
[5.366, 0.947649, 6.653918],
[6.161333, 0.32074, 10.017910],
[8.794667, 0.274041, 10.305637],
[10.542667, 0.161462, 11.295736],
[13.850667, 0.104161, 11.899836],
[22.955333, 0.053443, 12.602318],
[29.402, 0.027894, 13.188802],
[47.971333, 0.015576, 13.550976],
[54.092, 0.006549, 13.984019]
]
},
"defaultBlowoutVolume": 3.2
},
Expand Down Expand Up @@ -143,46 +139,42 @@
"defaultTipOverlap": 10.5,
"defaultReturnTipHeight": 0.82,
"aspirate": {
"default": {
"1": [
[1.915833, 1.927128, 3.925446],
[2.815833, 1.488084, 4.766582],
[4.740833, 0.734841, 6.887589],
[9.56, 0.312748, 8.888660],
[11.899167, 0.185659, 10.103631],
[14.8525, 0.147322, 10.559816],
[51.128333, 0.042193, 12.121236],
[92.410833, 0.010715, 13.730653],
[112.169167, 0.004993, 14.259441],
[243.099167, 0.002853, 14.499515],
[355.853333, 0.000919, 14.969688],
[430.2725, 0.000569, 15.094064],
[627.886667, 0.000284, 15.216604],
[999.469167, 0.000101, 15.331563],
[1103.450833, 0.0, 15.433145]
]
}
"default": [
[1.915833, 1.927128, 3.925446],
[2.815833, 1.488084, 4.766582],
[4.740833, 0.734841, 6.887589],
[9.56, 0.312748, 8.888660],
[11.899167, 0.185659, 10.103631],
[14.8525, 0.147322, 10.559816],
[51.128333, 0.042193, 12.121236],
[92.410833, 0.010715, 13.730653],
[112.169167, 0.004993, 14.259441],
[243.099167, 0.002853, 14.499515],
[355.853333, 0.000919, 14.969688],
[430.2725, 0.000569, 15.094064],
[627.886667, 0.000284, 15.216604],
[999.469167, 0.000101, 15.331563],
[1103.450833, 0.0, 15.433145]
]
},
"dispense": {
"default": {
"1": [
[1.915833, 1.927128, 3.925446],
[2.815833, 1.488084, 4.766582],
[4.740833, 0.734841, 6.887589],
[9.56, 0.312748, 8.888660],
[11.899167, 0.185659, 10.103631],
[14.8525, 0.147322, 10.559816],
[51.128333, 0.042193, 12.121236],
[92.410833, 0.010715, 13.730653],
[112.169167, 0.004993, 14.259441],
[243.099167, 0.002853, 14.499515],
[355.853333, 0.000919, 14.969688],
[430.2725, 0.000569, 15.094064],
[627.886667, 0.000284, 15.216604],
[999.469167, 0.000101, 15.331563],
[1103.450833, 0.0, 15.433145]
]
}
"default": [
[1.915833, 1.927128, 3.925446],
[2.815833, 1.488084, 4.766582],
[4.740833, 0.734841, 6.887589],
[9.56, 0.312748, 8.888660],
[11.899167, 0.185659, 10.103631],
[14.8525, 0.147322, 10.559816],
[51.128333, 0.042193, 12.121236],
[92.410833, 0.010715, 13.730653],
[112.169167, 0.004993, 14.259441],
[243.099167, 0.002853, 14.499515],
[355.853333, 0.000919, 14.969688],
[430.2725, 0.000569, 15.094064],
[627.886667, 0.000284, 15.216604],
[999.469167, 0.000101, 15.331563],
[1103.450833, 0.0, 15.433145]
]
},
"defaultBlowoutVolume": 16
}
Expand Down

0 comments on commit 0ed04f1

Please sign in to comment.