From 91c4dd13722801147ad2b15be3bb77844af03572 Mon Sep 17 00:00:00 2001
From: gac-alvra <gac-alvra@saresa-cons-03.psi.ch>
Date: Fri, 3 Jul 2020 17:12:23 +0200
Subject: [PATCH] changes for actually running at Alvra

---
 alvra.py           | 15 ++++++++-------
 config/config.json |  2 +-
 devices.py         |  8 ++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/alvra.py b/alvra.py
index 554db45..9b4125d 100755
--- a/alvra.py
+++ b/alvra.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition
+from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, NuDIArAcquisition
 from slic.core.scanner import Scanner
 from slic.utils import Channels, Config, Elog, Screenshot, PV
 from slic.core.condition import PVCondition
@@ -12,25 +12,26 @@ from adhoc import *
 
 
 #fn_cfg = "/sf/alvra/config/exp/current_experiment.json"
-fn_cfg = "./alvra/config/config.json"
+fn_cfg = "/sf/alvra/config/src/python/slic/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
 screenshot = Screenshot(cfg.screenshot_directory)
 
 
-#fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
-fn_channels = "./alvra/config/channel_list"
+fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
+#fn_channels = "/sf/alvra/config/src/python/slic/alvra/config/channel_list"
 channels = Channels(fn_channels)
 
 
 check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3, required_fraction=0.8)
 
-bsdaqJF = DIAAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
+#bsdaqJF = DIAAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
+bsdaqJF = NuDIArAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels)
 
 scansJF = Scanner(
-#    scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
-    scan_info_dir="./",
+    scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
+#    scan_info_dir="./",
     default_acquisitions=[bsdaqJF],
     condition=check_intensity,
 )
diff --git a/config/config.json b/config/config.json
index bd348ec..006dbc9 100644
--- a/config/config.json
+++ b/config/config.json
@@ -4,7 +4,7 @@
     "elog_url": "https://elog-gfa.psi.ch/Alvra",
     "user": "gac-alvra",
     "screenshot_directory": "/sf/alvra/config/screenshots",
-    "pgroup": "p17983"
+    "pgroup": "p17589"
 }
 
 
diff --git a/devices.py b/devices.py
index 78b2c7b..bb8c73c 100644
--- a/devices.py
+++ b/devices.py
@@ -156,10 +156,10 @@ slitSwitch = sd.xoptics.slits.SlitBlades_old(
     description="Slit in Optics hutch after Photon switchyard and before Alvra mono"
 )
 
-slitUnd = sd.xoptics.slits.SlitFourBlades_old(
-    "SARFE10-OAPU044",
-    description="Slit after Undulator"
-)
+#slitUnd = sd.xoptics.slits.SlitFourBlades_old(
+#    "SARFE10-OAPU044",
+#    description="Slit after Undulator"
+#)
 
 slitAttExp = sd.xoptics.slits.SlitPosWidth_old(
     "SAROP11-OAPU120",