Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/cbadc/analog_signal/_analog_signal.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ def __div__(self, other):
class ModulatedSignal(_AnalogSignal):
def __init__(self, *signals: _AnalogSignal):
self._signals = signals
# Check if piecewise constant
self.piecewise_constant = True
for signal in self._signals:
if not signal.piecewise_constant:
self.piecewise_constant = False

def evaluate(self, t: float) -> float:
"""Evaluate the signal at time :math:`t`.
Expand Down Expand Up @@ -98,6 +103,11 @@ class SuperpositionSignal(_AnalogSignal):

def __init__(self, *signals: _AnalogSignal):
self._signals = signals
# Check if piecewise constant
self.piecewise_constant = True
for signal in self._signals:
if not signal.piecewise_constant:
self.piecewise_constant = False

def evaluate(self, t: float) -> float:
"""Evaluate the signal at time :math:`t`.
Expand Down
2 changes: 2 additions & 0 deletions src/cbadc/analog_signal/impulse_responses.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Analog impulse response signals from common linear systems."""

from typing import Union
import numpy as np
import sympy as sp
Expand All @@ -10,6 +11,7 @@ class _ImpulseResponse(_AnalogSignal):
def __init__(self):
super().__init__()
self.t0 = 0.0
self.piecewise_constant = True


class StepResponse(_ImpulseResponse):
Expand Down
4 changes: 3 additions & 1 deletion src/cbadc/simulator/numerical_simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,9 @@ def _pre_computations(self):
tf = self.analog_system.transfer_function_matrix(
np.array([analog_signal.angularFrequency])
)
self._pre_computed_transfer_function[0, :, l] = np.abs(tf[:, l_index, 0])
self._pre_computed_transfer_function[0, :, l] = (
np.abs(tf[:, l_index, 0]) * analog_signal.amplitude
)
self._pre_computed_transfer_function[1, :, l] = (
np.angle(tf[:, l_index, 0]) + analog_signal.phase
)
Expand Down