Fix linting and stuff

Author: fronzbot

adc_eval/adcs/sar.py

@@ -36,6 +36,8 @@ class SAR(ADC):
         Sets or returns the capacitor weighting of the array. Default is binary weighting.
     mismatch : float
         Sets or returns the stdev of the mismatch of the converter. Default is no mismatch.
+    comp_noise : float
+        Sets or returns the stdev of the comparator noise. Default is no noise.
     offset : tuple of float
         Sets the (mean, stdev) of the offset of the converter. Default is no offset.
     gain_error : tuple of float
@@ -57,25 +59,28 @@ def __init__(self, nbits=8, fs=1, vref=1, seed=1, **kwargs):
         super().__init__(nbits, fs, vref, seed)
 
         self._mismatch = None
+        self._comp_noise = 0
 
         # Get keyword arguments
         self._weights = kwargs.get("weights", None)
-        
+
     @property
     def weights(self):
         """Returns capacitor unit weights."""
         if self._weights is None:
-            self._weights = np.flip(2**np.linspace(0, self.nbits-1, self.nbits))
+            self._weights = np.flip(2 ** np.linspace(0, self.nbits - 1, self.nbits))
         return np.array(self._weights)
 
     @weights.setter
     def weights(self, values):
         """Sets the capacitor unit weights."""
         self._weights = np.array(values)
         if self._weights.size < self.nbits:
-            print(f"WARNING: Capacitor weight array size is {self._weights.size} for {self.nbits}-bit ADC.")
+            print(
+                f"WARNING: Capacitor weight array size is {self._weights.size} for {self.nbits}-bit ADC."
+            )
         self.mismatch = self.err["mismatch"]
-        
+
     @property
     def mismatch(self):
         """Return noise stdev."""
@@ -90,24 +95,34 @@ def mismatch(self, stdev):
         self._mismatch = np.random.normal(0, stdev, self.weights.size)
         self._mismatch /= np.sqrt(self.weights)
 
+    @property
+    def comp_noise(self):
+        """Returns the noise of the comparator."""
+        return self._comp_noise
+
+    @comp_noise.setter
+    def comp_noise(self, value):
+        """Sets the noise of the comparator."""
+        self._comp_noise = value
+
     def run_step(self):
         """Run a single ADC step."""
         vinx = self.vin
-        
+
         cweights = self.weights * (1 + self.mismatch)
         cdenom = sum(cweights) + 1
-        
-        comp_noise = np.random.normal(0, self.err["noise"], cweights.size)
-        
+
+        comp_noise = np.random.normal(0, self.comp_noise, cweights.size)
+
         # Bit cycling
         vdac = vinx
-        for n in range(len(cweights)):
-            vcomp = vdac - self.vref / 2
+        for n, _ in enumerate(cweights):
+            vcomp = vdac - self.vref / 2 + comp_noise[n]
             compout = vcomp * 1e6
             compout = -1 if compout <= 0 else 1
             self.dbits[n] = max(0, compout)
             vdac -= compout * self.vref / 2 * cweights[n] / cdenom
-            
+
         # Re-scale the data
         scalar = 2**self.nbits / cdenom
-        self.dval = min(2**self.nbits-1, scalar * sum(self.weights * self.dbits))
+        self.dval = min(2**self.nbits - 1, scalar * sum(self.weights * self.dbits))

adc_eval/signals.py

@@ -119,15 +119,17 @@ def tones(nlen, bins, amps, offset=0, fs=1, nfft=None, phases=None):
         Time-series and associated tone array.
     """
     t = time(nlen, fs=fs)
-    
+
     signal = np.zeros(nlen)
     if phases is None:
         phases = np.zeros(nlen)
     if nfft is None:
         nfft = nlen
-    
+
     fbin = fs / nfft
     for index, nbin in enumerate(bins):
-        signal += sin(t, amp=amps[index], offset=offset, freq=nbin*fbin, ph0=phases[index])
+        signal += sin(
+            t, amp=amps[index], offset=offset, freq=nbin * fbin, ph0=phases[index]
+        )
 
-    return (t, signal)
+    return (t, signal)

pylintrc

@@ -9,6 +9,7 @@ disable=
     duplicate-code,
     implicit-str-concat,
     too-many-arguments,
+    too-many-positional-arguments,
     too-many-branches,
     too-many-instance-attributes,
     too-many-locals,

pyproject.toml

@@ -73,6 +73,7 @@ ignore = [
     "PLR0912", # Too many branches ({branches} > {max_branches})
     "PLR0913", # Too many arguments to function call ({c_args} > {max_args})
     "PLR0915", # Too many statements ({statements} > {max_statements})
+    "PLR0917", # Too many positional arguments
     "PLR2004",  # Magic value used in comparison, consider replacing {value} with a constant variable
     "PLW2901", # Outer {outer_kind} variable {name} overwritten by inner {inner_kind} target
     "T201", # Allow print statements