From 69e521ca67703dc58530b74a91b6e64894e95612 Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Wed, 27 May 2020 17:26:59 +0200
Subject: [PATCH] adjust to git repo structure

---
 adhoc.py | 18 ++++++++++++++++++
 alvra.py | 36 +++++++++---------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/adhoc.py b/adhoc.py
index 52d2311..f3c91f2 100644
--- a/adhoc.py
+++ b/adhoc.py
@@ -19,4 +19,22 @@ microscope_pitch = SmarActRecord("SARES11-XMI125:ROY1")
 microscope_yaw = SmarActRecord("SARES11-XMI125:ROZ1")
 
 
+#TODO: just some generic examples:
+from slic.devices.device import Device
+
+shut_und = Device(
+    "SARFE10-OPSH044",
+    description="Photon shutter after Undulator"
+)
+
+pbps_und = Device(
+    "SARFE10-PBPS053",
+    z_undulator=44,
+    description="Intensity position monitor after Undulator (PBPS)"
+)
+
+#print(shut_und)
+#print(pbps_und)
+
+
 
diff --git a/alvra.py b/alvra.py
index 24b9307..554db45 100755
--- a/alvra.py
+++ b/alvra.py
@@ -12,7 +12,7 @@ from adhoc import *
 
 
 #fn_cfg = "/sf/alvra/config/exp/current_experiment.json"
-fn_cfg = "./slickits/alvra/config/config.json"
+fn_cfg = "./alvra/config/config.json"
 cfg = Config(fn_cfg)
 
 elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="supercorrect") #TODO: remove fake password
@@ -20,7 +20,7 @@ screenshot = Screenshot(cfg.screenshot_directory)
 
 
 #fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
-fn_channels = "./slickits/alvra/config/channel_list"
+fn_channels = "./alvra/config/channel_list"
 channels = Channels(fn_channels)
 
 
@@ -50,33 +50,15 @@ bsdaqPV = PVAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
 
 
 
-#TODO: just some generic examples:
-from slic.devices.device import Device
-
-shut_und = Device(
-    "SARFE10-OPSH044",
-    description="Photon shutter after Undulator"
-)
-
-pbps_und = Device(
-    "SARFE10-PBPS053",
-    z_undulator=44,
-    description="Intensity position monitor after Undulator (PBPS)"
-)
-
-print(shut_und)
-print(pbps_und)
-
-
-for k, v in sorted(dict(globals()).items()):
-    if k.startswith("__"):
-        continue
-    print("=" * 50)
-    print(k + ":")
-    print("-" * (len(k) + 1))
-    print(v)
 
 
+#for k, v in sorted(dict(globals()).items()):
+#    if k.startswith("__"):
+#        continue
+#    print("=" * 50)
+#    print(k + ":")
+#    print("-" * (len(k) + 1))
+#    print(v)