script/TriggerScan.py

@@ -6,18 +6,25 @@ class Trigger(ReadonlyRegisterBase):
         
 trigger = Trigger()
 trigger.initialize()
-sca = "asd"
+scan = None
 
 def scan():
-    global sca
-    sca = mscan(trigger, [sc1, sin.cache], 20)
+    global scan
+    scan = mscan(trigger, [out, sin.cache])
+    print scan
 
 
-scan_task = fork(scan)
+scan_task = fork(scan)[0]
 
 time.sleep(0.5)
-for i in range(10):
+for i in range(20):
     trigger.update()
     time.sleep(random.random()/5)
 
-#ret = join(scan_task)
+time.sleep(1.0)
+ep=get_exec_pars()
+
+ep.currentScan.abort() 
+#scan_task.cancel(True)
+
+ret = join(scan_task)