From d8b5eac856027ebd64824d99fd038aecb84ac450 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Tue, 29 Nov 2016 20:51:29 +0100 Subject: [PATCH] sawg: style --- artiq/coredevice/sawg.py | 4 ++-- artiq/gateware/dsp/sawg.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/artiq/coredevice/sawg.py b/artiq/coredevice/sawg.py index 0a72bddc4..8bfe4edf9 100644 --- a/artiq/coredevice/sawg.py +++ b/artiq/coredevice/sawg.py @@ -89,10 +89,10 @@ class Spline: coeff64[i] = ci # artiq.wavesynth.coefficients.discrete_compensate: if i == 2: - coeff64[1] += ci >> (self.time_width + 1) + coeff64[1] += ci >> self.time_width + 1 elif i == 3: coeff64[2] += ci >> self.time_width - coeff64[1] += (ci // 3) >> (2*self.time_width + 1) + coeff64[1] += ci // 6 >> 2*self.time_width @kernel def set_coeff(self, value): diff --git a/artiq/gateware/dsp/sawg.py b/artiq/gateware/dsp/sawg.py index 9ff89d72e..4f13f87c1 100644 --- a/artiq/gateware/dsp/sawg.py +++ b/artiq/gateware/dsp/sawg.py @@ -88,8 +88,7 @@ class SplineParallelDDS(SplineParallelDUC): a = Spline(order=orders.a, width=widths.a) self.a = a.tri(widths.t) self.submodules += a - super().__init__(widths._replace(a=len(self.a.a0)), - orders, **kwargs) + super().__init__(widths._replace(a=len(self.a.a0)), orders, **kwargs) ###