Skip to content

Commit

Permalink
fix config and testS
Browse files Browse the repository at this point in the history
  • Loading branch information
CamDavidsonPilon committed Jan 12, 2025
1 parent c8325e8 commit 09c7578
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config.dev.ini
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ use_calibration=1
smoothing_penalizer=700.0

[storage]
database=/Users/camerondavidson-pilon/code/pioreactorui/pioreactor.sqlite
database=.pioreactor/storage/pioreactor.sqlite
temporary_cache=local_intermittent_pioreactor_metadata.sqlite
persistent_cache=.pioreactor/storage/local_persistent_pioreactor_metadata.sqlite

Expand Down
13 changes: 10 additions & 3 deletions pioreactor/tests/test_od_reading.py
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,7 @@ def test_calibration_simple_linear_calibration_positive_slope() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)
cal.save_to_disk_for_device("od")

cal.set_as_active_calibration_for_device("od")

Expand Down Expand Up @@ -694,6 +695,7 @@ def test_calibration_simple_linear_calibration_negative_slope() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)
cal.save_to_disk_for_device("od")

cal.set_as_active_calibration_for_device("od")

Expand Down Expand Up @@ -739,7 +741,7 @@ def test_calibration_simple_quadratic_calibration() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)

cal.save_to_disk_for_device("od")
cal.set_as_active_calibration_for_device("od")

with start_od_reading(
Expand Down Expand Up @@ -772,7 +774,7 @@ def test_calibration_multi_modal() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)

cal.save_to_disk_for_device("od")
cal.set_as_active_calibration_for_device("od")

with start_od_reading("REF", "90", interval=None, fake_data=True, experiment=experiment) as od:
Expand Down Expand Up @@ -803,6 +805,7 @@ def test_calibration_errors_when_ir_led_differs() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)
cal.save_to_disk_for_device("od")

cal.set_as_active_calibration_for_device("od")
with pytest.raises(exc.CalibrationError) as error:
Expand Down Expand Up @@ -848,6 +851,7 @@ def test_calibration_with_irl_data1() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)
cal.save_to_disk_for_device("od")

cal.set_as_active_calibration_for_device("od")

Expand Down Expand Up @@ -931,8 +935,9 @@ def test_calibration_data_from_user1() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)

calibration.save_to_disk_for_device("od")
calibration.set_as_active_calibration_for_device("od")

with start_od_reading("REF", "90", interval=None, fake_data=True, experiment=experiment) as od:
assert isinstance(od.calibration_transformer, CachedCalibrationTransformer)
infer = od.calibration_transformer.models["2"]
Expand Down Expand Up @@ -973,6 +978,7 @@ def test_calibration_data_from_user2() -> None:
pd_channel="2",
calibrated_on_pioreactor_unit=get_unit_name(),
)
cal.save_to_disk_for_device("od")

cal.set_as_active_calibration_for_device("od")

Expand Down Expand Up @@ -1138,6 +1144,7 @@ def test_CachedCalibrationTransformer_with_real_calibration() -> None:
y="od600s",
calibration_name="test",
)
calibration.save_to_disk_for_device("od")

calibration.set_as_active_calibration_for_device("od")

Expand Down
6 changes: 3 additions & 3 deletions pioreactor/tests/test_stirring.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def clean_up(self):
voltage=5.0,
recorded_data={"x": [], "y": []},
)

cal.save_to_disk_for_device("stirring")
cal.set_as_active_calibration_for_device("stirring")

target_rpm = 500
Expand All @@ -187,8 +187,8 @@ def clean_up(self):

assert st.duty_cycle > initial_dc

assert st.rpm_to_dc_lookup(600) == 59.5
assert st.rpm_to_dc_lookup(700) == 68.5
assert st.rpm_to_dc_lookup(600) == 60.4
assert st.rpm_to_dc_lookup(700) == 69.4


def test_stirring_will_try_to_restart_and_dodge_od_reading() -> None:
Expand Down

0 comments on commit 09c7578

Please sign in to comment.