Perform most CorrelationTrigger calculations using FLOAT

pull/357/head
nyanpasu64 2018-07-20 02:04:37 -07:00
rodzic 34c660b55a
commit c50ed2853e
2 zmienionych plików z 5 dodań i 3 usunięć

Wyświetl plik

@ -6,6 +6,8 @@ from dataclasses import dataclass
from scipy import signal
from ovgenpy.util import find
from ovgenpy.wave import FLOAT
if TYPE_CHECKING:
from ovgenpy.wave import Wave
@ -74,7 +76,7 @@ class CorrelationTrigger(Trigger):
self.cfg = cfg
# Create correlation buffer (containing a series of old data)
self._buffer = np.zeros(scan_nsamp)
self._buffer = np.zeros(scan_nsamp, dtype=FLOAT) # type: np.ndarray[FLOAT]
# Create zero crossing trigger, for postprocessing results
self._zero_trigger = ZeroCrossingTrigger(wave, self.ZERO_CROSSING_SCAN)
@ -92,7 +94,7 @@ class CorrelationTrigger(Trigger):
# prev_buffer = windowed step function + self._buffer
halfN = N // 2
step = np.empty(N)
step = np.empty(N, dtype=FLOAT) # type: np.ndarray[FLOAT]
step[:halfN] = -trigger_strength / 2
step[halfN:] = trigger_strength / 2

Wyświetl plik

@ -57,7 +57,7 @@ class Wave:
data /= self.max_val
return data
def get(self, begin: int, end: int):
def get(self, begin: int, end: int) -> 'np.ndarray[FLOAT]':
""" Copies self.data[begin:end] with zero-padding. """
if 0 <= begin and end <= self.nsamp:
return self[begin:end]