Clock, Oscillator → from ezmsg.simbiophys.eeg import EEGSynth

Author: cboulay

pyproject.toml

@@ -28,6 +28,7 @@ lint = [
 ]
 test = [
     "pytest>=8.3.3",
+    "ezmsg-simbiophys>=1.4.1",
 ]
 docs = [
   "sphinx>=7.0",

scripts_nbs/profiler/ecog_preproc.py

@@ -7,9 +7,9 @@
 from ezmsg.sigproc.downsample import Downsample
 from ezmsg.sigproc.scaler import AdaptiveStandardScaler
 from ezmsg.sigproc.slicer import Slicer
-from ezmsg.sigproc.synth import EEGSynth
 from ezmsg.sigproc.wavelets import CWT, MinPhaseMode
 from ezmsg.sigproc.window import Anchor
+from ezmsg.simbiophys.eeg import EEGSynth
 from ezmsg.util.terminate import TerminateOnTotal
 
 

scripts_nbs/profiler/mp_demo.py

@@ -9,7 +9,7 @@
 import ezmsg.core as ez
 import numpy as np
 import pytest
-from ezmsg.sigproc.synth import Clock, Oscillator
+from ezmsg.simbiophys.eeg import EEGSynth
 from ezmsg.util.messagecodec import message_log
 from ezmsg.util.messagelogger import MessageLogger
 from ezmsg.util.messages.axisarray import AxisArray
@@ -85,15 +85,13 @@ def app(file_path) -> None:
     n_messages = int(TOTAL_DURATION * chunk_rate)
 
     comps = {
-        "CLOCK": Clock(dispatch_rate=chunk_rate),
-        "SYNTH": Oscillator(n_time=chunk_size, fs=SR, n_ch=CHANNEL_COUNT, dispatch_rate="ext_clock"),
+        "SYNTH": EEGSynth(fs=SR, n_time=chunk_size, n_ch=CHANNEL_COUNT),
         "CRAZY": CrazyUnit(change_after=n_messages // 2, change_type=change_type),
         "SINK": ShMemCircBuff(SHMEM_NAME, 2.0, conn=None, axis="time"),
         "LOGGER": MessageLogger(output=file_path),
         "TERM": TerminateOnTotal(total=n_messages),
     }
     conns = (
-        (comps["CLOCK"].OUTPUT_SIGNAL, comps["SYNTH"].INPUT_SIGNAL),
         (comps["SYNTH"].OUTPUT_SIGNAL, comps["CRAZY"].INPUT_SIGNAL),
         (comps["CRAZY"].OUTPUT_SIGNAL, comps["SINK"].INPUT_SIGNAL),
         (comps["CRAZY"].OUTPUT_SIGNAL, comps["LOGGER"].INPUT_MESSAGE),

tests/test_shmem_mirror.py

@@ -6,7 +6,7 @@
 import ezmsg.core as ez
 import numpy as np
 import pytest
-from ezmsg.sigproc.synth import Clock, Oscillator
+from ezmsg.simbiophys.eeg import EEGSynth
 from ezmsg.util.messagecodec import message_log
 from ezmsg.util.messagelogger import MessageLogger
 from ezmsg.util.messages.axisarray import AxisArray
@@ -82,15 +82,13 @@ def test_shmem_change(change_type: str):
     file_path.unlink(missing_ok=True)
 
     comps = {
-        "CLOCK": Clock(dispatch_rate=100.0),
-        "SYNTH": Oscillator(n_time=10, fs=1000, n_ch=n_ch, dispatch_rate="ext_clock"),
+        "SYNTH": EEGSynth(fs=1000, n_time=10, n_ch=n_ch),
         "CRAZY": CrazyUnit(change_after=n_messages // 2, change_type=change_type),
         "SINK": ShMemCircBuff(SHMEM_NAME, 2.0, conn=None, axis="time"),
         "LOGGER": MessageLogger(output=file_path),
         "TERM": TerminateOnTotal(total=n_messages),
     }
     conns = (
-        (comps["CLOCK"].OUTPUT_SIGNAL, comps["SYNTH"].INPUT_SIGNAL),
         (comps["SYNTH"].OUTPUT_SIGNAL, comps["CRAZY"].INPUT_SIGNAL),
         (comps["CRAZY"].OUTPUT_SIGNAL, comps["LOGGER"].INPUT_MESSAGE),
         (comps["LOGGER"].OUTPUT_MESSAGE, comps["TERM"].INPUT_MESSAGE),