wip

app_utils.py

@@ -50,19 +50,19 @@ def assert_tweaker_positions(targets, timeout=60.0):
         summary = []
         for i, m in enumerate(targets):
             motor, target, tolerance = m
-            name = motor.short_name
+            #name = motor.short_name
-            pend_event()
+            #pend_event()
-            cur = motor.get_position()
+            cur = motor.get_rbv()
             done = motor.is_done()
-            logger.debug("check {}[done={}]: {} == {}".format(name, done, cur, target))
+            #logger.debug("check {}[done={}]: {} == {}".format(name, done, cur, target))
-            summary.append("{}[done={}]: {} == {}".format(name, done, cur, target))
+            #summary.append("{}[done={}]: {} == {}".format(name, done, cur, target))
             if done and tolerance >= abs(cur - target):
                 count += 1
-            pend_event(0.1)
+            #pend_event(0.1)
 
         if count == num_motors:
             break
-        pend_event(0.1)
+        #pend_event(0.1)
 
     if count != num_motors:
         raise PositionsNotReached("failed to reach target positions: {}".format("#".join(summary)))

deltatau.py

@@ -33,5 +33,5 @@ class Deltatau:
     except AttributeError as e:
       _log.critical('can not connect to deltatau')
       return
-    verbose=0xff
+    verbose=0x00
     self._shapepath=sp=shapepath.ShapePath(comm, gather, verbose, sync_mode=1, sync_flag=3)

swissmx.py

@@ -1945,35 +1945,21 @@ class Main(QMainWindow, Ui_MainWindow):
     )
 
   def move_post_tube(self, dir):
-    _log.info('Skip Zac''s orig. code')
+    app=QApplication.instance()
-    return
+    cfg=app._cfg
-    # ZAC: orig. code
+    x_up   = cfg.value(AppCfg.PST_X_UP  , type=float)
-    try:
+    y_up   = cfg.value(AppCfg.PST_Y_UP  , type=float)
-      tandem_twv = float(self._post_tandem_tweak_val.text())
+    x_down = cfg.value(AppCfg.PST_X_DOWN, type=float)
-    except:
+    y_down = cfg.value(AppCfg.PST_Y_DOWN, type=float)
-      tandem_twv = 1.0
+    dx     = cfg.value(AppCfg.PST_DX    , type=float)
-
+    dy     = cfg.value(AppCfg.PST_DY    , type=float)
-    x_up = settings.value("post_sample_tube/x_up")
+    tz_in  = cfg.value(AppCfg.PST_TZ_IN , type=float)
-    y_up = settings.value("post_sample_tube/y_up")
+    tz_out = cfg.value(AppCfg.PST_TZ_OUT, type=float)
-    x_down = settings.value("post_sample_tube/x_down")
-    y_down = settings.value("post_sample_tube/y_down")
-    dx = settings.value("post_sample_tube/dx")
-    dy = settings.value("post_sample_tube/dy")
-    tz_in = settings.value("post_sample_tube/z_in")
-    tz_out = settings.value("post_sample_tube/z_out")
     if x_up is None:
       msg = "SwissMX *POST-SAMPLE-TUBE* configuration is incomplete!!!"
       _log.warning(msg)
       QMessageBox.warning(self, "post tube not configured", msg)
       return
-    x_up = float(x_up)
-    y_up = float(y_up)
-    x_down = float(x_down)
-    y_down = float(y_down)
-    dx = float(dx)
-    dy = float(dy)
-    tz_in = float(tz_in)
-    tz_out = float(tz_out)
 
     usy = self.tweakers["tube_usy"]
     dsy = self.tweakers["tube_dsy"]
@@ -1982,6 +1968,8 @@ class Main(QMainWindow, Ui_MainWindow):
     dsx = self.tweakers["tube_dsx"]
     tube_z = self.tweakers["tube_z"]
 
+    tandem_twv = float(self._post_tandem_tweak_val.text())
+
     if dir == "in":
       _log.info("move post sample tube in")
       usy.move_motor_to_position(y_up)
@@ -2262,11 +2250,10 @@ class Main(QMainWindow, Ui_MainWindow):
         print('progress %d/%d'%(p, sp.points.shape[0]));
         time.sleep(.1)
       sp.gather_upload(fnRec=fn+'.npz')
-      dp=deltatau.shapepath.DebugPlot(sp)
+      #dp=deltatau.shapepath.DebugPlot(sp)
-      dp.plot_gather(mode=11)
+      #dp.plot_gather(mode=11)
-
+      #plt.show(block=False)
-    #plt.show(block=False)
+      #plt.show(block=True)
-    #plt.show(block=True)
     return