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

Back to manulal CHIC

Browse Source
This commit is contained in:
gac-furka
2021-08-28 13:46:47 +02:00
parent b5961b7da9
commit 69ba134112
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
furka.py
View File

@ -12,7 +12,7 @@ from slic.gui import GUI
from slic.utils import devices from slic.utils import devices
from undulator import Undulators from undulator import Undulators
from undulator import Mono
dummy = DummyAdjustable(units="au") dummy = DummyAdjustable(units="au")
@ -24,6 +24,7 @@ mot_theta = Motor("SATES30-RETRO:MOT_RY", name="Retro Theta")
#CH0 = PVAdjustable("SATES30-LSCP10-FNS:CH0:VAL_GET") #CH0 = PVAdjustable("SATES30-LSCP10-FNS:CH0:VAL_GET")
und = Undulators(name="Undulators") und = Undulators(name="Undulators")
Mon = Mono("SATOP11-OSGM087")
channels = [ channels = [
@ -57,11 +58,12 @@ pgroup = "p19197" #Commissioning p group
check_intensity = None 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) daqPV = PVAcquisition(instrument, pgroup, default_channels=live_channels)
scan = Scanner(default_acquisitions=[daq, daqPV], 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) scanPV = Scanner(default_acquisitions=[daqPV], condition=check_intensity)
@ -69,6 +71,7 @@ scanPV = Scanner(default_acquisitions=[daqPV], condition=check_intensity)
print("To start the GUI, run: gui()") print("To start the GUI, run: gui()")

33
undulator.py
View File

@ -9,8 +9,8 @@ from slic.core.scanner.scanbackend import wait_for_all #, stop_all
# 14 is the CHIC # 14 is the CHIC
n_unds = [ n_unds = [
6, 13, 6, 7, 8, 9, 10, 11, 12, 13,
15, 16, 17, 18, 19, 20, 21 15, 16, 17, 18, 19, 20, 21, 22
] ]
und_names = [f"SATUN{n:02}-UIND030" for n in n_unds] und_names = [f"SATUN{n:02}-UIND030" for n in n_unds]
@ -64,17 +64,10 @@ 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 is automatic") print("CHIC adjustment follows")
self.chic.set_target_value(value, hold=False).wait() #TODO: test whether an additional sleep is needed
if abs(delta)>0.001 : sleep(10)
print("E changed: waiting 10 sec for CHIC") print("CHIC adjustment done")
sleep(10)
else :
sleep(2)
print("No E change: wainting 2 sec for CHIC")
#self.chic.set_target_value(value, hold=False) #TODO: test whether an additional sleep is needed
#print("CHIC adjustment done")
return self._as_task(change, hold=hold) return self._as_task(change, hold=hold)
@ -180,11 +173,9 @@ class CHIC(PVAdjustable):
def change(): def change():
sleep(1) sleep(1)
print("CHIC setvalue") print("CHIC setvalue")
print(value) self.pvs.setvalue.put(value, wait=True)
self.pvs.setvalue.put(value, wait=False)
sleep(1)
print("CHIC start") print("CHIC start")
self.pvs.start.put(1, wait=False) self.pvs.start.put(1, wait=True)
#TODO: test whether an additional sleep is needed #TODO: test whether an additional sleep is needed
sleep(1) sleep(1)
@ -194,6 +185,14 @@ class CHIC(PVAdjustable):
def get_current_value(self): def get_current_value(self):
return super().get_current_value() * 1000 return super().get_current_value() * 1000
class Mono(PVAdjustable):
def __init__(self, name, accuracy=0.01):
pvname_setvalue = name + ":SetEnergy"
pvname_readback = name + ":photonenergy"
super().__init__(pvname_setvalue, pvname_readback=pvname_readback, accuracy=accuracy, active_move=True, name=name)