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

switched to DetectorConfig; added LXT as PVAdjustable; added a bunch of intensity conditions; enabled append_user_tag_to_data_dir

Browse Source
This commit is contained in:
augustin_s
2022-07-06 18:30:53 +02:00
parent be0a678675
commit 17f3b6ebe4
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
alvra.py
View File

@ -4,7 +4,7 @@ from slic.core.acquisition import SFAcquisition
#from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, SFAcquisition #from slic.core.acquisition import BSAcquisition, DBAcquisition, DIAAcquisition, PVAcquisition, SFAcquisition
#from slic.core.acquisition.bschannels import BSChannels #from slic.core.acquisition.bschannels import BSChannels
from slic.core.scanner import Scanner from slic.core.scanner import Scanner
from slic.core.acquisition import BSChannels, PVChannels from slic.core.acquisition import BSChannels, PVChannels, DetectorConfig
from slic.core.adjustable import DummyAdjustable from slic.core.adjustable import DummyAdjustable
from slic.utils import Config, Elog, Screenshot, load_channels from slic.utils import Config, Elog, Screenshot, load_channels
from slic.core.condition import PVCondition from slic.core.condition import PVCondition
@ -17,6 +17,9 @@ from devices import *
from adhoc import * from adhoc import *
adhoc_lxt = PVAdjustable("SLAAR01-LTIM-PDLY:DELAYNS", pvname_done_moving="SLAAR01-LTIM-PDLY:WAITING", name="adhoc lxt")
#TODO: why do we need this suddenly? #TODO: why do we need this suddenly?
try: try:
from IPython import get_ipython from IPython import get_ipython
@ -51,24 +54,26 @@ pvs = PVChannels.from_file(fn_pvs)
#pvs = Channels(fn_pvs) #pvs = Channels(fn_pvs)
detectors_disable_modules = { detectors_raw = DetectorConfig("JF06T32V02", "JF02T09V03")
"JF02T09V03": {
"disabled_modules": [0, 1, 2, 3, 5, 6, 7, 8], "remove_raw_files": True, detectors_config = DetectorConfig()
}, #detectors_config.add("JF06T32V02")
"JF06T32V02": { detectors_config.add("JF06T08V02")
"disabled_modules": [0, 1], "remove_raw_files": True, #detectors_config.add("JF02T09V03", disabled_modules=[0, 1, 2, 3, 5, 6, 7], remove_raw_files=True)
}
}
#detectors = detectors_disable_modules
detectors = None detectors = None
#detectors = detectors_config
#detectors = detectors_raw
check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=0, vmax=1500, wait_time=0.5, required_fraction=0.8) #check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=0, vmax=1500, wait_time=0.25, required_fraction=0.8)
#check_intensity = PVCondition("SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", vmin=0, vmax=1500, wait_time=0.5, required_fraction=0.8) #check_intensity = PVCondition("SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", vmin=0, vmax=2000, wait_time=0.5, required_fraction=0.8)
#check_intensity = PVCondition("SARFE10-PBPS053:INTENSITY", vmin=0.1,vmax=2, wait_time=0.5, required_fraction=0.8) #check_intensity = PVCondition("SARFE10-PBPS053:INTENSITY", vmin=0.05,vmax=2, wait_time=0.5, required_fraction=0.8)
#check_intensity = PVCondition("SAROP11-PBPS122:INTENSITY", vmin=0.05,vmax=5, wait_time=0.5, required_fraction=0.8) check_intensity = PVCondition("SAROP11-PBPS110:INTENSITY", vmin=0.05,vmax=5, wait_time=0.5, required_fraction=0.8)
#check_intensity = PVCondition("SAROP11-PBPS122:INTENSITY", vmin=0.1,vmax=10, wait_time=0.5, required_fraction=0.8)
daq = SFAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=list(pvs), default_detectors=detectors) daq = SFAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=list(pvs), default_detectors=detectors, append_user_tag_to_data_dir=True)
scan = Scanner( scan = 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),