added instrument and pgroup to bsread/dapi counters to generate folders, added instrument to config json

This commit is contained in:
2020-03-22 13:11:29 +00:00
parent 2d80a0e71b
commit 04571575cd
2 changed files with 4 additions and 7 deletions

View File

@@ -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)