From 39595284a2e2ab26be1badd273ef851175457295 Mon Sep 17 00:00:00 2001 From: gac-furka Date: Wed, 29 Jan 2025 12:35:46 +0100 Subject: [PATCH] changed Coupled_tth_outer -> Coupled_tth_outer_RixsSide --- tth.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tth.py b/tth.py index c16bcd4..8a439e3 100644 --- a/tth.py +++ b/tth.py @@ -78,7 +78,7 @@ class Coupled_tth_RIXSside(Adjustable): 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="" ): @@ -88,15 +88,15 @@ class Coupled_tth_outer(Adjustable): self.delta = delta def set_target_value(self, value): - s_SRY = value-90+self.delta - s_2TRY = 215.435 -2*value + s_SRY =-(90-value)+self.delta + s_2TRY = 124.4 -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 + return (124.4-self.twoTRY.get_current_value())*0.5 def is_moving(self): return any([self.SRY.is_moving(),self.twoTRY.is_moving()])