From b617bc6caff163e533ad0ab5ab89a66e2b9c6254 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Wed, 26 Feb 2020 14:53:11 +0000
Subject: [PATCH] print globals to quickly test access to all devices, fixed
 devices built from SmarActRecord, cleaned str of laser object, fixed __str__
 cannot return None, fake epics device get method returns number to satisfy
 some string formatting

---
 alvra.py   | 8 ++++++++
 devices.py | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/alvra.py b/alvra.py
index efa821b..1dcd831 100755
--- a/alvra.py
+++ b/alvra.py
@@ -72,4 +72,12 @@ print(shut_und)
 print(pbps_und)
 
 
+for k, v in dict(globals()).items():
+    if k.startswith("__"):
+        continue
+    print("-" * 10)
+    print(k)
+    print(v)
+
+print(laser)
 
diff --git a/devices.py b/devices.py
index b5d5671..8ae793b 100644
--- a/devices.py
+++ b/devices.py
@@ -14,7 +14,7 @@ flexTable = sd.endstations.alvra_flex.table(
 )
 
 prism = sd.general.smaract.SmarActStage(
-    dict(
+    dict( #TODO: remove the wrapper dict
         gonio="SARES11-CMOV-SMA691110",
         trans="SARES11-CMOV-SMA691111",
         rotat="SARES11-CMOV-SMA691112"
@@ -24,7 +24,7 @@ prism = sd.general.smaract.SmarActStage(
 )
 
 xmic = sd.general.smaract.SmarActStage(
-    dict(
+    dict( #TODO: remove the wrapper dict
         gonio="SARES11-CMOV-SMA691113",
         rotat="SARES11-CMOV-SMA691114"
     ),
@@ -40,6 +40,8 @@ primeSample = sd.endstations.alvra_prime.Huber(
 
 primeMicroscope = sd.endstations.alvra_prime.Microscope(
     "SARES11-XMI125",
+    gonio="SARES11-CMOV-SMA691113",
+    rotat="SARES11-CMOV-SMA691114",
     z_undulator=127,
     description="Microscope focus and zoom"
 )