Commit 283b0325 authored by Projects's avatar Projects

tests/pulse_rejection: generated pulsegen command specifies pulse width

parent cc1d6075
...@@ -45,7 +45,9 @@ if convttl.status.gw_version[0] != 4: ...@@ -45,7 +45,9 @@ if convttl.status.gw_version[0] != 4:
# selectt the test data set depending on the pulse duration switch # selectt the test data set depending on the pulse duration switch
if(convttl.status.switch[1]): if(convttl.status.switch[1]):
# short pulse # short pulse
print("Running short pulse tests") mode = "short"
max_freq = 2e6
pulse_len = 250e-9
tests = ( tests = (
{'freq': 2000000, 'pulses': 2e6}, {'freq': 2000000, 'pulses': 2e6},
...@@ -56,10 +58,11 @@ if(convttl.status.switch[1]): ...@@ -56,10 +58,11 @@ if(convttl.status.switch[1]):
{'freq': 571000, 'pulses': 571000 * 120, 'continuous': True} {'freq': 571000, 'pulses': 571000 * 120, 'continuous': True}
) )
max_freq = 2e6
else: else:
# long pulse # long pulse
print("Running long pulse tests") mode = "long"
max_freq = 105e3
pulse_len = 1.2e-6
tests = ( tests = (
# {'freq': 104166, 'pulses': 104166}, # {'freq': 104166, 'pulses': 104166},
...@@ -71,7 +74,7 @@ else: ...@@ -71,7 +74,7 @@ else:
{'freq': 52083, 'pulses': 52083 * 120, 'continuous': True}, {'freq': 52083, 'pulses': 52083 * 120, 'continuous': True},
) )
max_freq = 105e3 print("Running %s pulse tests" % mode)
# run tests # run tests
for test in tests: for test in tests:
...@@ -93,7 +96,7 @@ for test in tests: ...@@ -93,7 +96,7 @@ for test in tests:
print("------") print("------")
print("TEST: repeat %d pulses at %d Hz" % (pulses, freq)) 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 -w %G" % (pulses, freq, pulse_len))
print("") print("")
print("Pulse counters:") print("Pulse counters:")
...@@ -156,7 +159,7 @@ for test in tests: ...@@ -156,7 +159,7 @@ for test in tests:
print("") print("")
print("TEST: reject pulses after repeating %d pulses at %d Hz" % (pulses, freq)) print("TEST: reject pulses after repeating %d pulses at %d Hz" % (pulses, freq))
print("Start the pulse burst generator (%d pulses)" % (pulses * 2)) print("Start the pulse burst generator (%d pulses)" % (pulses * 2))
print(" ./pulsegen.py -c %d -f %F" % (pulses * 2, freq)) print(" ./pulsegen.py -c %d -f %F -w %G" % (pulses * 2, freq, pulse_len))
print("") print("")
print("Pulse counters:") print("Pulse counters:")
...@@ -229,7 +232,7 @@ print("------") ...@@ -229,7 +232,7 @@ print("------")
print("") print("")
print("TEST: reject pulses at too high frequency (FLIM_MISSED bit)") print("TEST: reject pulses at too high frequency (FLIM_MISSED bit)")
print("Start the pulse burst generator (%d pulses at %d Hz" % (pulses, freq)) print("Start the pulse burst generator (%d pulses at %d Hz" % (pulses, freq))
print(" ./pulsegen.py -c %d -f %F" % (pulses, freq)) print(" ./pulsegen.py -c %d -f %F -w %G" % (pulses, freq, pulse_len))
print("") print("")
test_run = True test_run = True
......
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