Commit be9188fc authored by Projects's avatar Projects

tests/pulse_rejection: updated test data points

parent 9394e0b4
...@@ -48,33 +48,37 @@ if(convttl.status.switch[1]): ...@@ -48,33 +48,37 @@ if(convttl.status.switch[1]):
print("Running short pulse tests") print("Running short pulse tests")
tests = ( tests = (
{'freq': 2000000, 'seconds': 1}, # {'freq': 2000000, 'pulses': 2e6},
{'freq': 1333333, 'seconds': 6.5}, # {'freq': 1333330, 'pulses': 8.65e6},
{'freq': 1000000, 'seconds': 10}, # {'freq': 1000000, 'pulses': 1e7},
{'freq': 800000, 'seconds': 26}, {'freq': 800000, 'pulses': 2.07e7},
{'freq': 666667, 'seconds': 36.6}, {'freq': 666670, 'pulses': 2.439e7},
{'freq': 571428.6, 'seconds': 120, 'continuous': True} {'freq': 571000, 'pulses': 550000 * 120, 'continuous': True}
) )
max_freq = 2e6
else: else:
# long pulse # long pulse
print("Running long pulse tests") print("Running long pulse tests")
tests = ( tests = (
{'freq': 104166.7, 'seconds': 1}, {'freq': 104166, 'pulses': 104160},
{'freq': 92592.5, 'seconds': 3}, {'freq': 92592, 'pulses': 273000},
{'freq': 83333.3, 'seconds': 6.5}, {'freq': 83333, 'pulses': 537400},
{'freq': 75757.8, 'seconds': 10}, {'freq': 75757, 'pulses': 755370},
{'freq': 69444.4, 'seconds': 20}, {'freq': 69444, 'pulses': 1388340},
{'freq': 55555.6, 'seconds': 60}, {'freq': 55555, 'pulses': 55555 * 60},
{'freq': 52083.3, 'seconds': 120, 'continuous': True}, {'freq': 52083, 'pulses': 52083 * 120, 'continuous': True},
) )
max_freq = 105e3
# run tests # run tests
for test in tests: for test in tests:
old_counters = None old_counters = None
freq = test['freq'] freq = test['freq']
seconds = test['seconds'] pulses = int(test['pulses'])
pulses = freq * seconds continuous = True if 'continuous' in test and test['continuous'] else False
continuous = True if 'continuous' in test and test['continous'] else False
############################################################################################# #############################################################################################
# test if the guaranteed number of pulses is repeated # test if the guaranteed number of pulses is repeated
...@@ -87,7 +91,7 @@ for test in tests: ...@@ -87,7 +91,7 @@ for test in tests:
convttl.error.clear() convttl.error.clear()
print("------") print("------")
print("TEST: accept %d pulses at %d Hz (%f s)" % (pulses, freq, seconds)) print("TEST: repeat %d pulses at %d Hz" % (pulses, freq))
print("Start the pulse burst generator (%d pulses)" % int(pulses)) print("Start the pulse burst generator (%d pulses)" % int(pulses))
print(" ./pulsegen.py -c %d -f %F" % (pulses, freq)) print(" ./pulsegen.py -c %d -f %F" % (pulses, freq))
print("") print("")
...@@ -122,7 +126,7 @@ for test in tests: ...@@ -122,7 +126,7 @@ for test in tests:
# check if we have reached the number of guaranteed pulses # check if we have reached the number of guaranteed pulses
if pulse_count >= pulses: if pulse_count >= pulses:
print("TEST PASSED: repeated %d pulses at frequency %d" % (pulse_count, freq)) print("TEST PASSED: repeated %d pulses at frequency %d Hz" % (pulse_count, freq))
test_run = False test_run = False
break break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment