python3, tweak

Author: Kay Kasemir (ky9)

example/client1.py

@@ -2,50 +2,55 @@
 from scan import *
 
 client = ScanClient('localhost')
-print client
+print(client)
 
-print client.serverInfo()
+print(client.serverInfo())
 
 # Assemble commands for a scan
 # Much more on that later...
 cmds = [ Comment('Hello'), Set('motor_x', 10) ]
 
 # Optionally, request a simulation that shows
 # how 'Include' and 'Loop' commands get expanded.
-simulation = client.simulate(cmds)
-print simulation
+info = client.simulate(cmds)
+print(info['simulation'])
 
 # Submit scan for execution
 id = client.submit(cmds, 'My First Scan')
-print id
+print(id)
 
 # Fetch information about scan
 info = client.scanInfo(id)
-print info
+print(info)
 
 # Could poll scanInfo until info.isDone().
 # Shortcut:
 info = client.waitUntilDone(id)
-print info
+print(info)
 
 # A submitted scan can be paused..
-id = client.submit(cmds, 'Not sure about this one')
+id = client.submit([ Delay(5) ], 'Not sure about this one')
 
 client.pause(id)
-print client.scanInfo(id)
+print(client.scanInfo(id))
 
 client.resume(id)
-print client.scanInfo(id)
+print(client.scanInfo(id))
 
 # .. or even aborted  & deleted
 client.abort(id)
-print client.scanInfo(id)
+print(client.scanInfo(id))
 
-print "Before deleting scan %d:" % id, [ str(info) for info in client.scanInfos() ]
+print("Before deleting scan %d:" % id)
+for info in client.scanInfos():
+    print(info)
 client.delete(id)
-print "After  deleting scan %d:" % id, [ str(info) for info in client.scanInfos() ]
+print("After deleting scan %d:" % id)
+for info in client.scanInfos():
+    print(info)
 
-# In extreme cases, it is possible to change a running scan
+# To a limited extend, it is possible to change a running scan:
+# Parameters of commands that have not been executed can be adjusted
 id = client.submit([ Delay(5), Set('motor_x', 10) ], 'Changing...')
 client.pause(id)
 # Want to set 'motor_x' to 5 instead of 10
@@ -55,15 +60,15 @@
 
 try:
     client.waitUntilDone(id)
-except Exception, e:
-    print "Waiting for an aborted scan will result in an exception: ", e
+except Exception as e:
+    print("Waiting for an aborted scan will result in an exception: ", e)
 
 try:
     # This scan will time out
     id = client.submit( [ Wait("motor_x", 60, timeout=1)], "Timeout Test")
     client.waitUntilDone(id)
-except Exception, e:
-    print "Waiting for a failed scan will result in an exception: ", e
+except Exception as e:
+    print("Waiting for a failed scan will result in an exception: ", e)
 
 # Log data during scan
 cmds = [ Loop('motor_x', 1, 10, 1,
@@ -79,21 +84,19 @@
        ]
 id = client.submit(cmds, 'Data Demo')
 info = client.waitUntilDone(id)
-print "Number of log calls: %d" % client.lastSerial(id)
+print("Number of log calls: %d" % client.lastSerial(id))
 
 # Fetch data
 data = client.getData(id)
 
 # Create table for motor_x and neutrons
 table = createTable(data, 'motor_x', 'neutrons')
-print "Positions: ", table[0]
-print "Counts   : ", table[1]
+print("Positions: ", table[0])
+print("Counts   : ", table[1])
 for (pos, count) in zip(*table):
-    print "Counts at motor position %g: %g" % (pos, count)
+    print("Counts at motor position %g: %g" % (pos, count))
 
 # Could plot this with numpy/scipy:  plot(table[0], table[1]) etc.
 
-# TODO get commands back from server
-
 # Remove information for all completed scans
 client.clear()

example/opi/1_BeamLine.bob

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-03-22 14:38:09 by ky9-->
+<!--Saved on 2024-03-26 11:44:53 by ky9-->
 <display version="2.0.0">
   <width>720</width>
   <height>380</height>
@@ -415,4 +415,21 @@ $(pv_value)</tooltip>
     <limits_from_pv>false</limits_from_pv>
     <maximum>1.0</maximum>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_6</name>
+    <text>Detector</text>
+    <x>408</x>
+    <y>12</y>
+    <width>72</width>
+    <height>16</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <auto_size>true</auto_size>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
 </display>