test/pulse_rejection: new set of test data points

software/tests/pulse_rejection.py

@@ -24,7 +24,7 @@ address = cfg.HNAME if cfg.ENABLED and cfg.HNAME else raw_input("Hostname: ")
 user = cfg.USER if cfg.ENABLED and cfg.USER else raw_input("User: ")
 password = cfg.PWD if cfg.ENABLED and cfg.PWD else raw_input("Password: ")
 slot = cfg.SLOT if cfg.ENABLED and cfg.SLOT else int(input("Slot number: "))
-cooldown_time = 10	# number seconds of cool down time between tests
+cooldown_time = 8	# number seconds of cool down time between tests
 
 elma = Elma(address, user, password)
 convttl = PyConvTTLBLO(slot, elma)
@@ -48,12 +48,12 @@ if(convttl.status.switch[1]):
     print("Running short pulse tests")
 
     tests = (
-        # {'freq': 2000000,   'pulses': 2e6},
-        # {'freq': 1333330,   'pulses': 8.65e6},
-        # {'freq': 1000000,   'pulses': 1e7},
-        {'freq':  800000,   'pulses': 2.07e7},
+        {'freq': 2000000,   'pulses': 2e6},
+        {'freq': 1333330,   'pulses': 8.65e6},
+        {'freq': 1000000,   'pulses': 1e7},
+        {'freq':  800000,   'pulses': 2.08e7},
         {'freq':  666670,   'pulses': 2.439e7},
-        {'freq':  571000,   'pulses': 550000 * 120, 'continuous': True}
+        {'freq':  571000,   'pulses': 571000 * 120, 'continuous': True}
     )
 
     max_freq = 2e6
@@ -62,13 +62,13 @@ else:
     print("Running long pulse tests")
 
     tests = (
-        {'freq':  104166, 'pulses': 104160},
-        {'freq':   92592, 'pulses': 273000},
-        {'freq':   83333, 'pulses': 537400},
-        {'freq':   75757, 'pulses': 755370},
-        {'freq':   69444, 'pulses': 1388340},
-        {'freq':   55555, 'pulses': 55555 * 60},
-        {'freq':   52083, 'pulses': 52083 * 120, 'continuous': True},
+        # {'freq':  104166, 'pulses': 104166},
+        # {'freq':   92592, 'pulses': 277000},
+        {'freq':   83333, 'pulses': 541000},
+        {'freq':   75757, 'pulses':  75757 * 10},
+        {'freq':   69444, 'pulses':  69444 * 20},
+        {'freq':   55555, 'pulses':  55555 * 60},
+        {'freq':   52083, 'pulses':  52083 * 120, 'continuous': True},
     )
 
     max_freq = 105e3