slic/alvra
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
augustin_s
2020-03-22 13:11:29 +00:00
parent 2d80a0e71b
commit 04571575cd
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
alvra.py
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) check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3)
bsdaqJF = DIACounter(#TODO: gain and pedestal? bsdaqJF = DIACounter(cfg.instrument, cfg.pgroup, default_channels=channels)
instrument="alvra",
pgroup=cfg.pgroup,
default_channels=channels
)
scansJF = Scanner( scansJF = Scanner(
data_base_dir="scan_data", 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( scansBSreadLocal = Scanner(
# data_base_dir="/sf/alvra/data/{}/res/scan_data".format(cfg.pgroup), # 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)

1
config/config.json
View File

@ -1,5 +1,6 @@
{ {
"instrument": "alvra",
"elog_url": "https://elog-gfa.psi.ch/Alvra", "elog_url": "https://elog-gfa.psi.ch/Alvra",
"user": "gac-alvra", "user": "gac-alvra",
"screenshot_directory": "/sf/alvra/config/screenshots", "screenshot_directory": "/sf/alvra/config/screenshots",