diff --git a/furka.py b/furka.py index 71144aa..09c197b 100644 --- a/furka.py +++ b/furka.py @@ -31,16 +31,20 @@ channels = [ "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", "SATES30-LSCP10-FNS:CH0:VAL_GET", "SATES30-LSCP10-FNS:CH1:VAL_GET", - "SATES30-LSCP10-FNS:CH4:VAL_GET" + "SATES30-LSCP10-FNS:CH4:VAL_GET", +# "SATES30-LSCP10-FNS:CH0:WFM" ] pvs = [ - "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG" + "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", + "SATES30-RETRO:MOT_RY.RVB", + "SATES30-RETRO:MOT_Y.RVB" ] live_channels = [ "SATES30-LSCP10-FNS:CH0:VAL_GET", "SATES30-LSCP10-FNS:CH1:VAL_GET", +# "SATES30-LSCP10-FNS:CH0:WFM" # "SATES30-LSCP10-FNS:CH4:VAL_GET" ] diff --git a/undulator.py b/undulator.py index da80dd7..e287048 100644 --- a/undulator.py +++ b/undulator.py @@ -64,9 +64,10 @@ class Undulators(Adjustable): t = a.set_target_value(k_new, hold=False) tasks.append(t) wait_for_all(tasks) - print("CHIC adjustment follows") - self.chic.set_target_value(value, hold=False) #TODO: test whether an additional sleep is needed - print("CHIC adjustment done") + print("CHIC adjustment is automatic") + sleep(10) + #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)