Feb 2024 status

This commit is contained in:
gac-furka
2024-02-08 14:01:58 +01:00
parent b6746d317a
commit f7ee0918c3
17 changed files with 758 additions and 47 deletions

46
tth.py
View File

@ -40,8 +40,8 @@ class Coupled_tth(Adjustable):
def __init__(self, ID="tth", units="deg", delta=0, name="" ):
super().__init__(ID, name=name, units=units)
self.SRY = Motor("SATES30-RIXS:MOT_SRY.VAL")
self.DRY = Motor("SATES30-RIXS:MOT_DRY.VAL")
self.SRY = Motor("SATES30-ARES:MOT_SRY.VAL")
self.DRY = Motor("SATES30-ARES:MOT_DRY.VAL")
self.delta = delta
def set_target_value(self, value):
@ -56,7 +56,49 @@ class Coupled_tth(Adjustable):
def is_moving(self):
return any([self.SRY.is_moving(),self.DRY.is_moving()])
class Coupled_tth_RIXSside(Adjustable):
def __init__(self, ID="tth", units="deg", delta=0, name="" ):
super().__init__(ID, name=name, units=units)
self.SRY = Motor("SATES30-ARES:MOT_SRY.VAL")
self.DRY = Motor("SATES30-ARES:MOT_DRY.VAL")
self.delta = delta
def set_target_value(self, value):
s_SRY = value -90 + self.delta
s_DRY = 2*value-199.9
t_SRY = self.SRY.set_target_value(s_SRY)
t_DRY = self.DRY.set_target_value(s_DRY)
t_SRY.wait()
t_DRY.wait()
def get_current_value(self):
return (self.DRY.get_current_value()*(-1)-199.9)*(-.5)
def is_moving(self):
return any([self.SRY.is_moving(),self.DRY.is_moving()])
class Coupled_tth_outer(Adjustable):
def __init__(self, ID="tth", units="deg", delta=0, name="" ):
super().__init__(ID, name=name, units=units)
self.SRY = Motor("SATES30-ARES:MOT_SRY.VAL")
self.twoTRY = Motor("SATES30-ARES:MOT_2TRY.VAL")
self.delta = delta
def set_target_value(self, value):
s_SRY = value-90+self.delta
s_2TRY = 215.435 -2*value
t_SRY = self.SRY.set_target_value(s_SRY)
t_2TRY = self.twoTRY.set_target_value(s_2TRY)
t_SRY.wait()
t_2TRY.wait()
def get_current_value(self):
return (215.435-self.twoTRY.get_current_value())*0.5
def is_moving(self):
return any([self.SRY.is_moving(),self.twoTRY.is_moving()])