started working on better slits using adjustables

eco/alvra/config.py

@@ -14,7 +14,7 @@ aliases = {
         "alias": "slitUnd",
         "z_und": 44,
         "desc": "Slit after Undulator",
-        "eco_type": "xoptics.slits.SlitFourBlades",
+        "eco_type": "xoptics.slits.SlitFourBlades_old",
     },
     "SARFE10-PBIG050": {
         "alias": "gasMon",
@@ -76,7 +76,7 @@ aliases = {
         "alias": "slitSwitch",
         "z_und": 104,
         "desc": "Slit in Optics hutch after Photon switchyard and before Alvra mono",
-        "eco_type": "xoptics.slits.SlitBlades",
+        "eco_type": "xoptics.slits.SlitBlades_old",
     },
     "SAROP11-ODCM105": {
         "alias": "mono",
@@ -157,7 +157,7 @@ aliases = {
         "alias": "slitAttExp",
         "z_und": 120,
         "desc": "Slits behind attenuator",
-        "eco_type": "xoptics.slits.SlitPosWidth",
+        "eco_type": "xoptics.slits.SlitPosWidth_old",
     },
     "SAROP11-OLAS120": {
         "alias": "refLaser",

eco/bernina/config.py

@@ -56,7 +56,7 @@ components = [
     },
     {
         "name": "slitUnd",
-        "type": "eco.xoptics.slits:SlitFourBlades",
+        "type": "eco.xoptics.slits:SlitFourBlades_old",
         "args": ["SARFE10-OAPU044"],
         "kwargs": {},
         "desc": "Slit after Undulator",
@@ -97,6 +97,14 @@ components = [
         "name": "slitSwitch",
         "z_und": 92,
         "desc": "Slit in Optics hutch after Photon switchyard and before Bernina optics",
+        "type": "eco.xoptics.slits:SlitBlades_old",
+        "args": ["SAROP21-OAPU092"],
+        "kwargs": {},
+    },
+    {
+        "name": "slitSwitch_test",
+        "z_und": 92,
+        "desc": "Slit in Optics hutch after Photon switchyard and before Bernina optics",
         "type": "eco.xoptics.slits:SlitBlades",
         "args": ["SAROP21-OAPU092"],
         "kwargs": {},
@@ -194,7 +202,7 @@ components = [
         "kwargs": {},
         "z_und": 136,
         "desc": "Slits behind attenuator",
-        "type": "eco.xoptics.slits:SlitPosWidth",
+        "type": "eco.xoptics.slits:SlitPosWidth_old",
     },
     {
         "name": "monAtt",
@@ -242,7 +250,7 @@ components = [
         "kwargs": {"Id": "SARES20"},
         "z_und": 141,
         "desc": "Slits behind Kb",
-        "type": "eco.xoptics.slits:SlitBladesJJ",
+        "type": "eco.xoptics.slits:SlitBladesJJ_old",
     },
     {
         "args": [],

eco/xoptics/slits.py

@@ -1,7 +1,54 @@
 from ..devices_general.motors import MotorRecord
-
+from ..devices_general.adjustable import AdjustableVirtual
+from ..aliases import Alias,append_object_to_object
 
 class SlitBlades:
+    def __init__(self, pvname, name=None, elog=None):
+        self.name = name
+        self.Id = pvname
+        self.alias = Alias(name)
+        append_object_to_object(self,MotorRecord,pvname + ":MOTOR_X1",name='right')
+        append_object_to_object(self,MotorRecord,pvname + ":MOTOR_X2",name='left')
+        append_object_to_object(self,MotorRecord,pvname + ":MOTOR_Y1",name='down')
+        append_object_to_object(self,MotorRecord,pvname + ":MOTOR_Y2",name='up')
+    
+        def getgap(xn,xp): return xp-xn
+        def getpos(xn,xp): return (xn+xp)/2
+        def setwidth(x):
+            return tuple([tx + self.hpos.get_current_value() for tx in [-x/2,x/2]])
+        def setheight(x):
+            return tuple([tx + self.vpos.get_current_value() for tx in [-x/2,x/2]])
+        def sethpos(x):
+            return tuple([tx + self.hgap.get_current_value() for tx in [-x/2,x/2]])
+        def setvpos(x):
+            return tuple([tx + self.vgap.get_current_value() for tw in [-x/2,x/2]])
+
+        append_object_to_object(self,AdjustableVirtual,[self.right,self.left],getgap,setwidth,set_current_value=True,name='hgap')
+        append_object_to_object(self,AdjustableVirtual,[self.down,self.up],getgap,setheight,set_current_value=True,name='vgap')
+        append_object_to_object(self,AdjustableVirtual,[self.right,self.left],getpos,sethpos,set_current_value=True,name='hpos')
+        append_object_to_object(self,AdjustableVirtual,[self.down,self.up],getpos,setvpos,set_current_value=True,name='vpos')
+
+    def  __call__(self,*args):
+        if len(args)==0:
+            return self.hpos.get_current_value(),self.vpos.get_current_value(),self.hgap.get_current_value(),self.vgap.get_current_value()
+        elif len(args)==1:
+            self.hgap.changeTo(args[0])
+            self.vgap.changeTo(args[0])
+        elif len(args)==2:
+            self.hgap.changeTo(args[0])
+            self.vgap.changeTo(args[1])
+        elif len(args)==4:
+            self.hpos.changeTo(args[0])
+            self.vpos.changeTo(args[1])
+            self.hgap.changeTo(args[2])
+            self.vgap.changeTo(args[3])
+        else:
+            raise Exception('wrong number of input arguments!')
+
+
+
+
+class SlitBlades_old:
     def __init__(self, Id, name=None, elog=None):
         self.Id = Id
         self.name = name
@@ -56,7 +103,7 @@ class SlitBlades:
         return "\n".join((string1, string2))
 
 
-class SlitBladesJJ:
+class SlitBladesJJ_old:
     def __init__(self, Id, name=None, elog=None):
         self.Id = Id
         self.name = name
@@ -111,7 +158,7 @@ class SlitBladesJJ:
         return "\n".join((string1, string2))
 
 
-class SlitFourBlades:
+class SlitFourBlades_old:
     def __init__(self, Id, name=None, elog=None):
         self.Id = Id
         self.name = name
@@ -181,7 +228,7 @@ class SlitFourBlades:
         return self.__str__()
 
 
-class SlitPosWidth:
+class SlitPosWidth_old:
     def __init__(self, Id, name=None, elog=None):
         self.Id = Id
         self.name = name