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

debug CHIC

Browse Source
This commit is contained in:
gac-furka
2021-07-16 12:08:13 +02:00
parent 22422cd371
commit 67d7d34833
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
furka.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
from slic.core.acquisition import SFAcquisition from slic.core.acquisition import SFAcquisition
from slic.core.acquisition import PVAcquisition
from slic.core.adjustable import PVAdjustable, DummyAdjustable from slic.core.adjustable import PVAdjustable, DummyAdjustable
from slic.core.condition import PVCondition from slic.core.condition import PVCondition
from slic.core.scanner import Scanner from slic.core.scanner import Scanner
@ -37,6 +38,13 @@ pvs = [
"SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG" "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG"
] ]
live_channels = [
"SATES30-LSCP10-FNS:CH0:VAL_GET",
"SATES30-LSCP10-FNS:CH1:VAL_GET",
# "SATES30-LSCP10-FNS:CH4:VAL_GET"
]
instrument = "furka" instrument = "furka"
pgroup = "p19197" pgroup = "p19197"
@ -46,8 +54,15 @@ check_intensity = None
daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, rate_multiplicator=1) daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, rate_multiplicator=1)
scan = Scanner(default_acquisitions=[daq], condition=check_intensity) scan = Scanner(default_acquisitions=[daq], condition=check_intensity)
gui = GUI(scan) gui = GUI(scan)
daqPV = PVAcquisition(instrument, pgroup, default_channels=live_channels)
scanPV = Scanner(default_acquisitions=[daqPV], condition=check_intensity)
print("To start the GUI, run: gui()") print("To start the GUI, run: gui()")

12
undulator.py
View File

@ -64,9 +64,9 @@ class Undulators(Adjustable):
t = a.set_target_value(k_new, hold=False) t = a.set_target_value(k_new, hold=False)
tasks.append(t) tasks.append(t)
wait_for_all(tasks) wait_for_all(tasks)
# print("CHIC adjustment follows") print("CHIC adjustment follows")
# self.chic.set_target_value(value, hold=False).wait() #TODO: test whether an additional sleep is needed self.chic.set_target_value(value, hold=False) #TODO: test whether an additional sleep is needed
# print("CHIC adjustment done") print("CHIC adjustment done")
return self._as_task(change, hold=hold) return self._as_task(change, hold=hold)
@ -172,9 +172,11 @@ class CHIC(PVAdjustable):
def change(): def change():
sleep(1) sleep(1)
print("CHIC setvalue") print("CHIC setvalue")
self.pvs.setvalue.put(value, wait=True) print(value)
self.pvs.setvalue.put(value, wait=False)
sleep(1)
print("CHIC start") print("CHIC start")
self.pvs.start.put(1, wait=True) self.pvs.start.put(1, wait=False)
#TODO: test whether an additional sleep is needed #TODO: test whether an additional sleep is needed
sleep(1) sleep(1)