Commit 944cfca4 authored by Sean Leavey's avatar Sean Leavey
Browse files

Fix misnamed op-amp component properties

parent 4d375cc5
......@@ -254,12 +254,11 @@ class LibraryOpAmp:
poles=np.array([]), vnoise=3.2e-9, vcorner=2.7, inoise=0.4e-12, icorner=140,
vmax=12, imax=0.06, sr=1e6, **kwargs):
super().__init__(**kwargs)
# default properties
# Default properties.
self._model = "None"
self.params = {}
# set parameters
# Op-amp parameters.
self.model = model
self.a0 = a0
self.gbw = gbw
......@@ -420,7 +419,6 @@ class LibraryOpAmp:
:class:`float`
Op-amp gain at specified frequency.
"""
return (self.a0
/ (1 + self.a0 * 1j * frequency / self.gbw)
* np.exp(-2j * np.pi * self.delay * frequency)
......@@ -438,19 +436,14 @@ class LibraryOpAmp:
def _mag_q_pairs(self, complex_freqs):
complex_freqs = list(complex_freqs)
pairs = []
for freq in complex_freqs:
fabs = np.absolute(freq)
freq_conj = np.conj(freq)
# find conjugate
# Find conjugate.
if freq_conj in complex_freqs:
complex_freqs.remove(freq_conj)
qfactor = fabs / (2 * np.real(freq)) # = 0.5 if real pole
pairs.append((fabs, qfactor))
return pairs
def __str__(self):
......
......@@ -850,7 +850,7 @@ op-amps:
vcorner: 300
inoise: 1.1p # noninverting, inverting: 9.1
icorner: 3k
umax: 3
vmax: 3
imax: 0.01
sr: 280e6
......@@ -863,7 +863,7 @@ op-amps:
vcorner: 30k
inoise: 3p
icorner: 30k
umax: 3.5
vmax: 3.5
imax: 55m
sr: 500e6
......@@ -893,7 +893,7 @@ op-amps:
vcorner: 10k
inoise: 1.8p
icorner: 10k
umax: 4.9
vmax: 4.9
imax: 100m
sr: 400e6
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment