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

changes for actually running at Alvra

Browse Source
This commit is contained in:
gac-alvra
2020-07-03 17:12:23 +02:00
parent 69e521ca67
commit 91c4dd1372
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
alvra.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/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.core.scanner import Scanner
from slic.utils import Channels, Config, Elog, Screenshot, PV from slic.utils import Channels, Config, Elog, Screenshot, PV
from slic.core.condition import PVCondition from slic.core.condition import PVCondition
@ -12,25 +12,26 @@ from adhoc import *
#fn_cfg = "/sf/alvra/config/exp/current_experiment.json" #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) cfg = Config(fn_cfg)
elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="supercorrect") #TODO: remove fake password elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="supercorrect") #TODO: remove fake password
screenshot = Screenshot(cfg.screenshot_directory) screenshot = Screenshot(cfg.screenshot_directory)
#fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list" fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
fn_channels = "./alvra/config/channel_list" #fn_channels = "/sf/alvra/config/src/python/slic/alvra/config/channel_list"
channels = Channels(fn_channels) channels = Channels(fn_channels)
check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3, required_fraction=0.8) 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( scansJF = Scanner(
# scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup), scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
scan_info_dir="./", # scan_info_dir="./",
default_acquisitions=[bsdaqJF], default_acquisitions=[bsdaqJF],
condition=check_intensity, condition=check_intensity,
) )

2
config/config.json
View File

@ -4,7 +4,7 @@
"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",
"pgroup": "p17983" "pgroup": "p17589"
} }

8
devices.py
View File

@ -156,10 +156,10 @@ slitSwitch = sd.xoptics.slits.SlitBlades_old(
description="Slit in Optics hutch after Photon switchyard and before Alvra mono" description="Slit in Optics hutch after Photon switchyard and before Alvra mono"
) )
slitUnd = sd.xoptics.slits.SlitFourBlades_old( #slitUnd = sd.xoptics.slits.SlitFourBlades_old(
"SARFE10-OAPU044", # "SARFE10-OAPU044",
description="Slit after Undulator" # description="Slit after Undulator"
) #)
slitAttExp = sd.xoptics.slits.SlitPosWidth_old( slitAttExp = sd.xoptics.slits.SlitPosWidth_old(
"SAROP11-OAPU120", "SAROP11-OAPU120",