From 4bc5eaf9e8531afd62c6120848e893251e980cbb Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Wed, 6 Apr 2016 00:55:13 +0800 Subject: [PATCH] test_rtio: scale speed test results to 'event' intervals --- artiq/test/coredevice/test_rtio.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/artiq/test/coredevice/test_rtio.py b/artiq/test/coredevice/test_rtio.py index 1b168915a..ef3eab719 100644 --- a/artiq/test/coredevice/test_rtio.py +++ b/artiq/test/coredevice/test_rtio.py @@ -102,7 +102,7 @@ class PulseRate(EnvExperiment): self.core.break_realtime() break else: - self.set_dataset("pulse_rate", mu_to_seconds(2*dt)) + self.set_dataset("pulse_rate", mu_to_seconds(dt)) return @@ -131,7 +131,7 @@ class PulseRateDDS(EnvExperiment): self.core.break_realtime() break else: - self.set_dataset("pulse_rate", mu_to_seconds(dt)) + self.set_dataset("pulse_rate", mu_to_seconds(dt/2)) return @@ -255,21 +255,20 @@ class CoredeviceTest(ExperimentCase): self.assertEqual(count, 10) def test_pulse_rate(self): - """Mimumum delay and duration of sustainably emitted TTL pulses""" + """Minimum interval for sustained TTL output switching""" self.execute(PulseRate) rate = self.dataset_mgr.get("pulse_rate") print(rate) self.assertGreater(rate, 100*ns) - self.assertLess(rate, 1500*ns) + self.assertLess(rate, 700*ns) def test_pulse_rate_dds(self): - """Minimum delay between DDS batches each setting the frequencies of - two DDS""" + """Minimum interval for sustained DDS frequency switching""" self.execute(PulseRateDDS) rate = self.dataset_mgr.get("pulse_rate") print(rate) - self.assertGreater(rate, 3*us) - self.assertLess(rate, 12*us) + self.assertGreater(rate, 1*us) + self.assertLess(rate, 6*us) def test_loopback_count(self): npulses = 2