Skip to content

Commit 324b060

Browse files
fix tets
1 parent 2bccf2d commit 324b060

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

core/pioreactor/background_jobs/od_reading.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import random
4747
import threading
4848
import types
49-
from copy import deepcopy as copy
5049
from time import sleep
5150
from time import time
5251
from typing import Callable
@@ -731,9 +730,7 @@ def _calibrate_signal(observed_voltage: pt.Voltage) -> pt.OD:
731730
return _calibrate_signal, _verify
732731

733732
def __call__(self, od_readings: structs.ODReadings) -> structs.CalibratedODReadings:
734-
od_readings = copy(od_readings)
735733
calibrated_od_readings = structs.CalibratedODReadings(ods={}, timestamp=od_readings.timestamp)
736-
737734
for channel in self.models:
738735
if channel in od_readings.ods:
739736
raw_od = od_readings.ods[channel]

core/pioreactor/utils/streaming.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from msgspec import DecodeError
1919
from msgspec.json import decode
20-
2120
from pioreactor import types as pt
2221
from pioreactor.pubsub import subscribe
2322
from pioreactor.structs import DosingEvent
@@ -79,7 +78,11 @@ def __iter__(self):
7978
continue
8079
dt = to_datetime(line["timestamp"])
8180
od = RawODReading(
82-
angle=line["angle"], channel=line["channel"], timestamp=dt, od=float(line["od_reading"])
81+
angle=line["angle"],
82+
channel=line["channel"],
83+
timestamp=dt,
84+
od=float(line["od_reading"]),
85+
ir_led_intensity=80,
8386
)
8487
ods = ODReadings(timestamp=dt, ods={"2": od})
8588
yield ods

core/tests/test_od_reading.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -611,11 +611,7 @@ def test_simple_API() -> None:
611611

612612
def test_ability_to_be_iterated() -> None:
613613
od_stream = start_od_reading(
614-
"90",
615-
"REF",
616-
interval=1.0,
617-
fake_data=True,
618-
experiment="test_ability_to_be_iterated",
614+
"90", "REF", interval=1.0, fake_data=True, experiment="test_ability_to_be_iterated", calibration=False
619615
)
620616
results = []
621617

@@ -1427,7 +1423,7 @@ def test_raw_and_calibrated_data_is_published_if_calibration_is_used() -> None:
14271423
calibration_name="test_raw_and_calibrated_data_is_published_if_calibration_is_used",
14281424
curve_type="poly",
14291425
curve_data_=[1, 0],
1430-
ir_led_intensity=50,
1426+
ir_led_intensity=70,
14311427
pd_channel="2",
14321428
created_at=current_utc_datetime(),
14331429
calibrated_on_pioreactor_unit="pio1",
@@ -1483,7 +1479,7 @@ def test_raw_published_even_if_calibration_is_bad() -> None:
14831479
def test_ir_led_on_and_rest_off_state_turns_off_other_leds_by_default() -> None:
14841480
# By default, turn_off_leds_during_reading is True: only IR channel should be on
14851481
with temporary_config_change(config, "od_reading.config", "turn_off_leds_during_reading", "True"):
1486-
with start_od_reading("90", "REF", interval=None, fake_data=True) as od:
1482+
with start_od_reading("90", "REF", interval=None, fake_data=True, calibration=False) as od:
14871483
# set a custom IR intensity and verify desired state
14881484
od.ir_led_intensity = 42.0
14891485
state = od.ir_led_on_and_rest_off_state
@@ -1504,7 +1500,7 @@ def test_ir_led_on_and_rest_off_state_leaves_other_leds_intact_when_disabled() -
15041500
for ch, val in init_states.items():
15051501
cache[ch] = val
15061502

1507-
with start_od_reading("REF", "90", interval=None, fake_data=True) as od:
1503+
with start_od_reading("REF", "90", interval=None, fake_data=True, calibration=False) as od:
15081504
# set IR intensity and perform a single reading to exercise the LED context
15091505
_ = od.record_from_adc()
15101506

0 commit comments

Comments
 (0)