Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6510083b747
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 001f6d6fab81
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 14, 2016

  1. test_rtio: comments and correction

    * add comments what is actually being measured in the two rate tests
    * remove spurious factor of two
    jordens authored and sbourdeauducq committed Apr 14, 2016
    Copy the full SHA
    3d487d9 View commit details
  2. Copy the full SHA
    001f6d6 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 artiq/test/coredevice/test_rtio.py
12 changes: 7 additions & 5 deletions artiq/test/coredevice/test_rtio.py
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ def run(self):
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 @@ def run(self):
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/2))
return


@@ -256,18 +256,20 @@ def test_clock_generator_loopback(self):
self.assertEqual(count, 10)

def test_pulse_rate(self):
"""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 interval for sustained DDS frequency switching"""
self.execute(PulseRateDDS)
rate = self.dataset_mgr.get("pulse_rate")
print(rate)
self.assertGreater(rate, 5*us)
self.assertLess(rate, 25*us)
self.assertGreater(rate, 1*us)
self.assertLess(rate, 6*us)

def test_loopback_count(self):
npulses = 2