pyForceDAQ 2.0.1.dev1__py3-none-any.whl → 2.0.1.dev2__py3-none-any.whl

pyforcedaq/_lib/types.py

@@ -1,7 +1,7 @@
 __author__ = 'Oliver Lindemann'
 
 import ctypes as ct
-from typing import List
+from typing import Iterator, List, Tuple
 
 from .misc import MinMaxDetector as _MinMaxDetector
 
@@ -160,12 +160,13 @@ class ForceSensorData(object):
         self.force = struct.forces
         self.trigger = struct.trigger
 
-    def selected_forces(self, select: List[bool]):
-        """Return an iterator over selected force values."""
-        return (force for i, force in enumerate(self.forces) if select[i])
+    def selected_forces(self, select: List[bool]) -> List[float]:
+        """Return list of selected force values."""
+        return [force for i, force in enumerate(self.forces) if select[i]] # FIXME simplify not all force have to save in ForceClass
 
-    def selected_trigger(self, select: List[bool]):
-        return (trigger for i, trigger in enumerate(self.trigger) if select[i])
+    def selected_trigger(self, select: List[bool]) -> List[float]:
+        """Return list of selected trigger values."""
+        return [trigger for i, trigger in enumerate(self.trigger) if select[i]]
 
 
 class UDPData(object):

pyforcedaq/daq/_mock_sensor.py

@@ -75,6 +75,6 @@ class DAQReadAnalog(object):
             n_new_samples = self._simulation_timer.time - self._sample_cnt
 
         self._sample_cnt += 1
-        x = self._sample_cnt / 2000
+        x = self._sample_cnt / 1000
         y = 10 + np.array((np.sin(x/2), np.cos(x/5), np.sin(x)))*10
         return np.append(y, np.array((0, 0 , 0, 0, 0))), 1

pyforcedaq/force/sensor.py

@@ -8,11 +8,10 @@ __author__ = 'Oliver Lindemann'
 import ctypes as ct
 from copy import copy
 from pathlib import Path
+from typing import List, Tuple
 
 import numpy as np
-from icecream import ic
 
-#from .._lib import lsl
 from .._lib.timer import Timer, app_clock
 from .._lib.types import ForceSensorData
 from ..daq import ATI_CDLL, DAQConfiguration, DAQReadAnalog
@@ -27,11 +26,11 @@ class SensorSettings(DAQConfiguration):
                  channels="ai0:7",
                  device_name_prefix = "Dev",
                  rate:int=1000,
-                 minVal=-10,
-                 maxVal=10,
-                 reverse_parameter_names=(),
+                 minVal:float=-10,
+                 maxVal:float=10,
+                 reverse_parameter_names: str | Tuple[str] | List[str] | None = None,
                  convert_to_FT:bool=True,
-                 has_lsl_stream:bool=False,
+                 lsl_stream:bool=False,
                  write_Fx:bool=True,
                  write_Fy:bool=True,
                  write_Fz:bool=True,
@@ -54,7 +53,7 @@ class SensorSettings(DAQConfiguration):
         self.device_id = device_id
         self.sensor_name = sensor_name
         self.convert_to_FT = convert_to_FT
-        self.has_lsl_stream = has_lsl_stream
+        self.lsl_stream = lsl_stream
         self.write_Fx = write_Fx
         self.write_Fy = write_Fy
         self.write_Fz = write_Fz
@@ -66,13 +65,14 @@ class SensorSettings(DAQConfiguration):
         self.calibration_file = calibration_file
 
         self.reverse_parameters = []
-        if not isinstance(reverse_parameter_names, (tuple, list)):
-            reverse_parameter_names = [reverse_parameter_names]
-        for para in reverse_parameter_names:
-            try:
-                self.reverse_parameters.append(ForceSensorData.forces_names.index(para))
-            except Exception:
-                pass
+        if reverse_parameter_names is not None:
+            if isinstance(reverse_parameter_names, str):
+                reverse_parameter_names = [reverse_parameter_names]
+            for para in reverse_parameter_names:
+                try:
+                    self.reverse_parameters.append(ForceSensorData.forces_names.index(para))
+                except Exception:
+                    pass
 
     def array_write_forces(self):
         return [self.write_Fx, self.write_Fy, self.write_Fz, self.write_Tx, self.write_Ty, self.write_Tz]
@@ -100,7 +100,6 @@ class Sensor(DAQReadAnalog):
         self.name = settings.sensor_name
         self.convert_to_FT = settings.convert_to_FT
         self.timer = Timer(sync_timer=app_clock) # own timer, because this class is used in own process
-        ic(self.DAQ_TYPE)
         if self.DAQ_TYPE == "mock_sensor":
             self._atidaq = None
             self.convert_to_FT = False

pyforcedaq/force/sensor_process.py

@@ -157,19 +157,21 @@ class SensorProcess(Process):
         ## create init LSL
         lsl_data_steam = None
         lsl_hardware_trigger_stream = None
-        if self.sensor_settings.has_lsl_stream:
+        if self.sensor_settings.lsl_stream:
             lsl_data_steam = lsl.init(
-                    name=f"Force {self.sensor_settings.device_name}",
+                    name=f"Force_{self.sensor_settings.device_name}",
                     n_channels=sum(stream_forces),
                     stream_id=f"RF_{self.sensor_settings.device_name}",
                     freq=self.sensor_settings.rate,
+                    channel_format= lsl.cf_float32,
                     metadata={"sensor_name": self.sensor_settings.sensor_name})
             n_hardware_trigger = sum(stream_trigger)
             if n_hardware_trigger > 0:
                 lsl_hardware_trigger_stream = lsl.init(
-                    name=f"Trigger {self.sensor_settings.device_name}",
+                    name=f"Trigger_{self.sensor_settings.device_name}",
                     n_channels=n_hardware_trigger,
                     stream_id=f"Tr_{self.sensor_settings.device_name}",
+                    channel_format=lsl.cf_float32,
                     freq=self.sensor_settings.rate)
 
 
@@ -189,9 +191,12 @@ class SensorProcess(Process):
                 d = sensor.poll_data()
                 ## LSL
                 if lsl_data_steam is not None:
-                    lsl_data_steam.push_sample(list(d.selected_forces(stream_forces))) # steam only select forces
+                    lsl_data_steam.push_sample(d.selected_forces(stream_forces)) # steam only select forces
+
                 if lsl_hardware_trigger_stream is not None:
-                    lsl_hardware_trigger_stream.push_sample(list(d.selected_trigger(stream_trigger))) # stream only triggers
+                    tr = d.selected_trigger(stream_trigger)
+                    if any(tr): # only stream if at least one trigger is active
+                        lsl_hardware_trigger_stream.push_sample(tr)
 
                 ptp.update(d.time) # needed? TODO
                 self._last_Fx.value, self._last_Fy.value, self._last_Fz.value, \

pyforcedaq/gui/_run.py

@@ -367,7 +367,7 @@ def run_settings(settings_file: str | None = None):
                         zip_data=settings.recording.zip_data,
                         reverse_scaling = settings.recording.reverse_scaling,
                         convert_to_forces=settings.recording.convert_to_forces,
-                        has_lsl_stream=settings.recording.has_lsl_stream,
+                        lsl_stream=settings.recording.lsl_stream,
                         polling_priority=settings.recording.priority)
 
 def run(remote_control,
@@ -387,7 +387,7 @@ def run(remote_control,
                      zip_data: bool = False,
                      reverse_scaling: dict | None = None,
                      convert_to_forces: bool = True,
-                     has_lsl_stream: bool = False,
+                     lsl_stream: bool = False,
                      polling_priority: str | None = None):
 
     """start gui
@@ -430,7 +430,7 @@ def run(remote_control,
                     reverse_parameter_names=reverse_parameter_names,
                     rate = settings.gui.sampling_rate,
                     convert_to_FT=convert_to_forces,
-                    has_lsl_stream=has_lsl_stream,
+                    lsl_stream=lsl_stream,
                     write_Fx = write_Fx,
                     write_Fy = write_Fy,
                     write_Fz = write_Fz,

pyforcedaq/gui/_settings.py

@@ -1,6 +1,5 @@
 import json
 import os
-from copy import deepcopy
 from dataclasses import dataclass, field
 from typing import List
 
@@ -29,10 +28,6 @@ class _GUISettings:
     plot_data_plotter_for_two_sensors: list = field(
         default_factory=lambda: [(0, 2), (1, 2)])
 
-    def update_from_dict(self, d):
-        for key, value in d.items():
-            setattr(self, key, value)
-
 @dataclass
 class _RecordingSetting:
     device_name_prefix: str = "Dev"
@@ -48,9 +43,9 @@ class _RecordingSetting:
     write_Tx: bool = False
     write_Ty: bool = False
     write_Tz: bool = False
-    write_trigger1: bool = True
+    write_trigger1: bool = False
     write_trigger2: bool = False
-    has_lsl_stream: bool = False
+    lsl_stream: bool = False
     reverse_scaling: dict = field(default_factory=lambda: {"1": ["Fz"], "2": ["Fz"]})
     convert_to_forces: bool = True
     priority: str = "normal"
@@ -61,11 +56,6 @@ class _RecordingSetting:
         if isinstance(self.calibration_files, str):
             self.calibration_files = [self.calibration_files]
 
-    def update_from_dict(self, d):
-        for key, value in d.items():
-            ic(key, value)
-            setattr(self, key, value)
-
 
 class GUISettings(object):
 

{pyforcedaq-2.0.1.dev1.dist-info → pyforcedaq-2.0.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyForceDAQ
-Version: 2.0.1.dev1
+Version: 2.0.1.dev2
 Summary: A Python package for data acquisition and analysis in force-based experiments.
 Author: Oliver Lindemann
 Author-email: Oliver Lindemann <lindemann@essb.eur.nl>

{pyforcedaq-2.0.1.dev1.dist-info → pyforcedaq-2.0.1.dev2.dist-info}/RECORD

@@ -6,10 +6,10 @@ pyforcedaq/_lib/misc.py,sha256=YiG2fTac9YFYgWZac4iQ1j7BBhFo-y80-231xk1Gzds,4622
 pyforcedaq/_lib/polling_time_profile.py,sha256=5EHSWMVii-bEKk6dkuClH6OZnbSSJjrvW6hIfizS988,1487
 pyforcedaq/_lib/process_priority_manager.py,sha256=3povqR0hT54K9TRQtxk-rc8JPakT3K6PH4Np8pNgydo,4196
 pyforcedaq/_lib/timer.py,sha256=MN192NvqxezW-C5-znse9p-sv0DdoPV6jVN3X8d6CYY,1111
-pyforcedaq/_lib/types.py,sha256=haJORth-LE38G2bUpZJ7oudd_UUjH6HVRANiAbBNABs,11978
+pyforcedaq/_lib/types.py,sha256=m2lWFEiBz5fb7gZG3PbBjJIDwZv4dGErSvC3JE4Fu1o,12128
 pyforcedaq/_lib/udp_connection.py,sha256=k6Ww8n9r7PdOzC0AJmzs-sC9eW8Jnij3EyUR0ASJHas,10254
 pyforcedaq/daq/__init__.py,sha256=ZrRK8xFcoi523Rk9I7DQcY-LyCm21hFcmQOXP7VwwYw,716
-pyforcedaq/daq/_mock_sensor.py,sha256=GsNKDz87lAUIF8eRyP18s9b3gQy6WzL1r3sbKa1fur8,2076
+pyforcedaq/daq/_mock_sensor.py,sha256=msqRH36LlJM_numwjmYu5J5oYmz2DLSX364bOcXSCsY,2076
 pyforcedaq/daq/_pyATIDAQ.py,sha256=IqTdz2nAxEC8ea_u9OQvvCmT-fbOwkP85FBHV3gyIfQ,11142
 pyforcedaq/daq/_use_nidaqmx.py,sha256=MHUC83UnKbHYAlNWr5iuTFoGYJpSfB21cxkm41qS_Vg,2459
 pyforcedaq/daq/_use_pydaqmx.py,sha256=0jtLoY82CBq1UxoOQMaCylKAOs_AzpK6mL2UUIdkhsw,3568
@@ -23,20 +23,20 @@ pyforcedaq/extras/remote_control.py,sha256=2Ka9Y6edTAnsIY-P46rzyLDj9ddOc51n4cJ2M
 pyforcedaq/force/__init__.py,sha256=h9pQxFkwt_xOs1hrTYCiEPFr1Cg2XblxwyKEDuKH8rs,346
 pyforcedaq/force/_log.py,sha256=h2JbbLLJsrrh1U9HwEbY7iFdRW7FYxDbiZuIq5Z3sE0,541
 pyforcedaq/force/data_recorder.py,sha256=7hWM7WKD94uEv57_R1RydJwf7HAQBRyNN3gDRcN9cRc,12939
-pyforcedaq/force/sensor.py,sha256=ZdeK6pEedEosrk_4SlG3mEOji6zBRaopSg0oEV6ZBM8,6810
-pyforcedaq/force/sensor_process.py,sha256=gBZ4B3Z7CDz87QISUbMJ0tsSf-SBT1rbl3dxc0Eo-To,9319
+pyforcedaq/force/sensor.py,sha256=hVLNVtAm9mElNHXCDLkeZE76liiiC5oX98KelSgj8Ug,6870
+pyforcedaq/force/sensor_process.py,sha256=vkvWWN5QkpKlk2yW33dl9zx53yvTkIETENad7uom6JU,9496
 pyforcedaq/gui/__init__.py,sha256=bB1kI51Oi3fK-x_J7ncaN8yZpvai-5-3sp7UHqDr-GY,147
 pyforcedaq/gui/_gui_status.py,sha256=0YJcxVX2G8VtbgRn0H9avZi1wY4R-1A8re3cJjojkl0,13987
 pyforcedaq/gui/_layout.py,sha256=obptKZgw9CgygiqDCDgbXu4Esyfb8btOZgxxdNzgXiE,4616
 pyforcedaq/gui/_level_indicator.py,sha256=cBB-5DOlvdc95rQQ12Gt5dvhNxSYQTbaq19FSdz4YnQ,1905
 pyforcedaq/gui/_pg_surface.py,sha256=TD4rQJsBMMiKoQDZTon35LvsEmyayCWfklJbm0iRl6c,2902
 pyforcedaq/gui/_plotter.py,sha256=KvSxg3M3mDRj0_oNtn6mll8D2LBrBoboNoUs9hJJSUs,8451
-pyforcedaq/gui/_run.py,sha256=9IsWsnVVcRmk12aBxMPDVmNB0QcFLHVivpVIHBVQ8yg,23368
+pyforcedaq/gui/_run.py,sha256=YF1-5vzkJN54i8_4L0CGxRspTQW0f8ey7fMQhtB1IEc,23348
 pyforcedaq/gui/_scaling.py,sha256=XgdB7CXqzrBXNFT1Kul8t7mebqO9gojNxGzNIppj4Bg,1905
-pyforcedaq/gui/_settings.py,sha256=rSn3OgOx7mTkS7RCH_v7YPhugTKsDivmKqgzE1FvPOI,3772
+pyforcedaq/gui/_settings.py,sha256=v2ROOYBaF6LTJwhHJI3Gv4pSA5Wh6hmDBDRDuFhDuWM,3494
 pyforcedaq/gui/forceDAQ_logo.png,sha256=-bn6ZQQjKf2Pxd9mJ4r-wulibtjuv_bEkhG567GR1vc,15624
 pyforcedaq/gui/launcher.py,sha256=5IjHTCU65bsoctr52k-w9L6MBTJOW4gN6Wm0PItUwX0,8753
-pyforcedaq-2.0.1.dev1.dist-info/WHEEL,sha256=i9aSRDivn5iP9LaR1BLQX2GNAuriQWPsFwbbWygTX2k,81
-pyforcedaq-2.0.1.dev1.dist-info/entry_points.txt,sha256=0VDGqAldPs3uUCun3y9v4ue8Uae8n-D6-R5YpamgJwQ,56
-pyforcedaq-2.0.1.dev1.dist-info/METADATA,sha256=4RVrVMtGkSX5ibhek7BBHpWW4P25Qikz70QB2hk0VxQ,601
-pyforcedaq-2.0.1.dev1.dist-info/RECORD,,
+pyforcedaq-2.0.1.dev2.dist-info/WHEEL,sha256=i9aSRDivn5iP9LaR1BLQX2GNAuriQWPsFwbbWygTX2k,81
+pyforcedaq-2.0.1.dev2.dist-info/entry_points.txt,sha256=0VDGqAldPs3uUCun3y9v4ue8Uae8n-D6-R5YpamgJwQ,56
+pyforcedaq-2.0.1.dev2.dist-info/METADATA,sha256=vxeDyoldPgxOL1zqZE1IElyeNmhe8lAyGGk5QFQV3VE,601
+pyforcedaq-2.0.1.dev2.dist-info/RECORD,,