From 04571575cdb0609d651730b456fb1e94f79496cb Mon Sep 17 00:00:00 2001
From: Sven Augustin <sven.augustin@psi.ch>
Date: Sun, 22 Mar 2020 13:11:29 +0000
Subject: [PATCH] added instrument and pgroup to bsread/dapi counters to
 generate folders, added instrument to config json

---
 alvra.py           | 10 +++-------
 config/config.json |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/alvra.py b/alvra.py
index ebf9bbc..ffb36c9 100755
--- a/alvra.py
+++ b/alvra.py
@@ -27,11 +27,7 @@ channels = Channels(fn_channels)
 
 check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3)
 
-bsdaqJF = DIACounter(#TODO: gain and pedestal?
-    instrument="alvra",
-    pgroup=cfg.pgroup,
-    default_channels=channels
-)
+bsdaqJF = DIACounter(cfg.instrument, cfg.pgroup, default_channels=channels)
 
 scansJF = Scanner(
     data_base_dir="scan_data",
@@ -43,7 +39,7 @@ scansJF = Scanner(
 )
 
 
-bsdaq = BSCounter(channels)
+bsdaq = BSCounter(cfg.instrument, cfg.pgroup, default_channels=channels)
 
 scansBSreadLocal = Scanner(
 #    data_base_dir="/sf/alvra/data/{}/res/scan_data".format(cfg.pgroup),
@@ -55,7 +51,7 @@ scansBSreadLocal = Scanner(
 )
 
 
-bsdaqDB = DBCounter(channels)
+bsdaqDB = DBCounter(cfg.instrument, cfg.pgroup, default_channels=channels)
 
 
 
diff --git a/config/config.json b/config/config.json
index 141961a..bd348ec 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,5 +1,6 @@
 
 {
+    "instrument": "alvra",
     "elog_url": "https://elog-gfa.psi.ch/Alvra",
     "user": "gac-alvra",
     "screenshot_directory": "/sf/alvra/config/screenshots",