changed Coupled_tth_outer -> Coupled_tth_outer_RixsSide
This commit is contained in:
8
tth.py
8
tth.py
@ -78,7 +78,7 @@ class Coupled_tth_RIXSside(Adjustable):
|
|||||||
return any([self.SRY.is_moving(),self.DRY.is_moving()])
|
return any([self.SRY.is_moving(),self.DRY.is_moving()])
|
||||||
|
|
||||||
|
|
||||||
class Coupled_tth_outer(Adjustable):
|
class Coupled_tth_outer_RixsSide(Adjustable):
|
||||||
|
|
||||||
|
|
||||||
def __init__(self, ID="tth", units="deg", delta=0, name="" ):
|
def __init__(self, ID="tth", units="deg", delta=0, name="" ):
|
||||||
@ -88,15 +88,15 @@ class Coupled_tth_outer(Adjustable):
|
|||||||
self.delta = delta
|
self.delta = delta
|
||||||
|
|
||||||
def set_target_value(self, value):
|
def set_target_value(self, value):
|
||||||
s_SRY = value-90+self.delta
|
s_SRY =-(90-value)+self.delta
|
||||||
s_2TRY = 215.435 -2*value
|
s_2TRY = 124.4 -2*value
|
||||||
|
|
||||||
t_SRY = self.SRY.set_target_value(s_SRY)
|
t_SRY = self.SRY.set_target_value(s_SRY)
|
||||||
t_2TRY = self.twoTRY.set_target_value(s_2TRY)
|
t_2TRY = self.twoTRY.set_target_value(s_2TRY)
|
||||||
t_SRY.wait()
|
t_SRY.wait()
|
||||||
t_2TRY.wait()
|
t_2TRY.wait()
|
||||||
def get_current_value(self):
|
def get_current_value(self):
|
||||||
return (215.435-self.twoTRY.get_current_value())*0.5
|
return (124.4-self.twoTRY.get_current_value())*0.5
|
||||||
def is_moving(self):
|
def is_moving(self):
|
||||||
return any([self.SRY.is_moving(),self.twoTRY.is_moving()])
|
return any([self.SRY.is_moving(),self.twoTRY.is_moving()])
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user