using lambda read + get(read=read) instead of .value()

slaclab · May 8, 2024 · 345b245 · 345b245
1 parent e4d6e66
commit 345b245
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/python/surf/devices/linear/_Ltc3815.py b/python/surf/devices/linear/_Ltc3815.py
@@ -22,7 +22,7 @@ def __init__(self, **kwargs):
             units        = 'V',
             typeStr      = "Float32",
             disp         = '{:1.3f}',
-            linkedGet    = lambda: self.READ_VIN.value()*4.0E-3, # Conversion factor: 4mV/Bit
+            linkedGet    = lambda read: self.READ_VIN.get(read=read)*4.0E-3, # Conversion factor: 4mV/Bit
             dependencies = [self.READ_VIN],
         ))
 
@@ -32,7 +32,7 @@ def __init__(self, **kwargs):
             units        = 'A',
             typeStr      = "Float32",
             disp         = '{:1.3f}',
-            linkedGet    = lambda: self.READ_IIN.value()*10.0E-3, # Conversion factor: 10mA/Bit
+            linkedGet    = lambda read: self.READ_IIN.get(read=read)*10.0E-3, # Conversion factor: 10mA/Bit
             dependencies = [self.READ_IIN],
         ))
 
@@ -42,7 +42,7 @@ def __init__(self, **kwargs):
             units        = 'V',
             typeStr      = "Float32",
             disp         = '{:1.3f}',
-            linkedGet    = lambda: self.READ_VOUT.value()*0.5E-3, # Conversion factor: 0.5mV/Bit
+            linkedGet    = lambda read: self.READ_VOUT.get(read=read)*0.5E-3, # Conversion factor: 0.5mV/Bit
             dependencies = [self.READ_VOUT],
         ))
 
@@ -52,14 +52,14 @@ def __init__(self, **kwargs):
             units        = 'A',
             typeStr      = "Float32",
             disp         = '{:1.3f}',
-            linkedGet    = lambda: self.READ_IOUT.value()*10.0E-3, # Conversion factor: 10mA/Bit
+            linkedGet    = lambda read: self.READ_IOUT.get(read=read)*10.0E-3, # Conversion factor: 10mA/Bit
             dependencies = [self.READ_IOUT],
         ))
 
         self.add(pr.LinkVariable(
             name         = "DieTempature",
             mode         = 'RO',
-            linkedGet    = lambda: self.READ_TEMPERATURE_1.value()*1.0, # Conversion factor: 1 degC/Bit
+            linkedGet    = lambda read: self.READ_TEMPERATURE_1.get(read=read)*1.0, # Conversion factor: 1 degC/Bit
             typeStr      = "Float32",
             disp         = '{:1.3f}',
             units        = 'degC',
@@ -70,7 +70,7 @@ def __init__(self, **kwargs):
             name         = 'Pin',
             description  = 'Power Measurement',
             mode         = 'RO',
-            linkedGet    = lambda: (self.Vin.value())*(self.Iin.value()),
+            linkedGet    = lambda read: (self.Vin.get(read=read))*(self.Iin.get(read=read)),
             typeStr      = "Float32",
             disp         = '{:1.3f}',
             units        = 'W',
@@ -81,7 +81,7 @@ def __init__(self, **kwargs):
             name         = 'Pout',
             description  = 'Power Measurement',
             mode         = 'RO',
-            linkedGet    = lambda: (self.Vout.value())*(self.Iout.value()),
+            linkedGet    = lambda read: (self.Vout.get(read=read))*(self.Iout.get(read=read)),
             typeStr      = "Float32",
             disp         = '{:1.3f}',
             units        = 'W',
@@ -92,7 +92,7 @@ def __init__(self, **kwargs):
             name         = 'Peff',
             description  = 'Power Conversion Efficiency',
             mode         = 'RO',
-            linkedGet    = lambda: 100.0*(self.Pout.value())/(self.Pin.value()) if self.Pin.value()>0.0 else 0.0,
+            linkedGet    = lambda read: 100.0*(self.Pout.get(read=read))/(self.Pin.get(read=read)) if self.Pin.get(read=read)>0.0 else 0.0,
             typeStr      = "Float32",
             disp         = '{:1.1f}',
             units        = '%',

diff --git a/python/surf/devices/linear/_Ltc4151.py b/python/surf/devices/linear/_Ltc4151.py
@@ -56,7 +56,7 @@ def __init__(self,
             units        = 'A',
             disp         = '{:1.3f}',
             dependencies = [self.SenseMsb,self.SenseLsb],
-            linkedGet    = lambda: (int(self.SenseMsb.value()<<4)|int(self.SenseLsb.value()&0xF))*20.0E-6/self.senseRes
+            linkedGet    = lambda read: (int(self.SenseMsb.get(read=read)<<4)|int(self.SenseLsb.get(read=read)&0xF))*20.0E-6/self.senseRes
         ))
 
         self.add(pr.RemoteVariable(
@@ -90,7 +90,7 @@ def __init__(self,
             units        = 'V',
             disp         = '{:1.3f}',
             dependencies = [self.VinMsb,self.VinLsb],
-            linkedGet    = lambda: (int(self.VinMsb.value()<<4)|int(self.VinLsb.value()&0xF))*25.0E-3
+            linkedGet    = lambda read: (int(self.VinMsb.get(read=read)<<4)|int(self.VinLsb.get(read=read)&0xF))*25.0E-3
         ))
 
         self.add(pr.LinkVariable(
@@ -100,7 +100,7 @@ def __init__(self,
             units        = 'W',
             disp         = '{:1.3f}',
             dependencies = [self.Vin,self.Iin],
-            linkedGet    = lambda: (self.Vin.value())*(self.Iin.value())
+            linkedGet    = lambda read: (self.Vin.get(read=read))*(self.Iin.get(read=read))
         ))
 
         self.add(pr.RemoteVariable(
@@ -134,7 +134,7 @@ def __init__(self,
             units        = 'V',
             disp         = '{:1.3f}',
             dependencies = [self.AdinMsb,self.AdinLsb],
-            linkedGet    = lambda: (int(self.AdinMsb.value()<<4)|int(self.AdinLsb.value()&0xF))*500.0E-6
+            linkedGet    = lambda read: (int(self.AdinMsb.get(read=read)<<4)|int(self.AdinLsb.get(read=read)&0xF))*500.0E-6
         ))
 
         self.add(pr.RemoteVariable(