Skip to content

Commit 2c9659b

Browse files
committed
Fix test for modulation period for both heterodyne and baseband cases
1 parent 84e3622 commit 2c9659b

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

kid_readout/roach/interface.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,10 @@ def state(self):
230230
return self.get_state()
231231

232232
def get_state(self,include_registers=False):
233+
if self.phase0 is None:
234+
reference_sequence_number = -1
235+
else:
236+
reference_sequence_number = int(self.phase0)
233237
roach_state = StateDict(boffile=self.boffile,
234238
heterodyne=self.heterodyne,
235239
adc_sample_rate=self.fs*1e6, # roach still uses MHz, so convert to Hz
@@ -246,7 +250,7 @@ def get_state(self,include_registers=False):
246250
debug_register=self.debug_register,
247251
fft_shift_register = self.fft_shift_register,
248252
hardware_delay_samples = self.hardware_delay_samples,
249-
reference_sequence_number = int(self.phase0)
253+
reference_sequence_number = reference_sequence_number
250254
)
251255
if include_registers:
252256
for register in self.initial_values_for_writeable_registers:

kid_readout/roach/tests/mixin.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ def test_precomputed_wavenorm(self):
4040
assert self.ri.wavenorm >= 0.99 * actual_wavenorm # guarantees the wave won't overflow
4141

4242
def test_calculate_modulation_period(self):
43-
roach_state = core.StateDict(modulation_rate=7, modulation_output=2)
43+
roach_state = core.StateDict(modulation_rate=7, modulation_output=2, heterodyne=True)
4444
assert calculate.modulation_period_samples(roach_state) == 256
45+
roach_state = core.StateDict(modulation_rate=7, modulation_output=2, heterodyne=False)
46+
assert calculate.modulation_period_samples(roach_state) == 128
47+
4548

4649
def test_get_measurement_blocks(self):
4750
num_tones = 32

0 commit comments

Comments
 (0)