replace .value with .get()

apstools/devices.py

@@ -166,7 +166,7 @@ def use_EPICS_scaler_channels(scaler):
         configuration_attrs = []
         for ch in scaler.channels.component_names:
             nm_pv = scaler.channels.__getattribute__(ch)
-            if nm_pv is not None and len(nm_pv.chname.value.strip()) > 0:
+            if nm_pv is not None and len(nm_pv.chname.get().strip()) > 0:
                 read_attrs.append(ch)
                 configuration_attrs.append(ch)
                 configuration_attrs.append(ch+".chname")
@@ -381,9 +381,9 @@ def state(self):
 
         EXAMPLE::
 
-            if self.signal.value == self.open_value:
+            if self.signal.get() == self.open_value:
                 result = self.valid_open_values[0]
-            elif self.signal.value == self.close_value:
+            elif self.signal.get() == self.close_value:
                 result = self.valid_close_values[0]
             else:
                 result = self.unknown_state
@@ -432,7 +432,7 @@ def set(self, value, **kwargs):
             ignored at this time
 
         """
-        if self.busy.value:
+        if self.busy.get():
             raise RuntimeError("shutter is operating")
 
         __value__ = self.lowerCaseString(value)
@@ -663,7 +663,7 @@ def open(self, timeout=10):
                 time.sleep(self.delay_s)    # blocking call OK here
 
             # reset that signal (if not done by EPICS)
-            if self.open_signal.value == 1:
+            if self.open_signal.get() == 1:
                 self.open_signal.put(0)
 
     def close(self, timeout=10):
@@ -676,7 +676,7 @@ def close(self, timeout=10):
                 time.sleep(self.delay_s)    # blocking call OK here
 
             # reset that signal (if not done by EPICS)
-            if self.close_signal.value == 1:
+            if self.close_signal.get() == 1:
                 self.close_signal.put(0)
 
 
@@ -804,7 +804,7 @@ def open(self, timeout=10):
                 time.sleep(self.delay_s)    # blocking call OK here
 
             # reset that signal (if not done by EPICS)
-            if self.open_signal.value == 1:
+            if self.open_signal.get() == 1:
                 self.open_signal.put(0)
 
     def close(self, timeout=10):
@@ -822,7 +822,7 @@ def close(self, timeout=10):
                 time.sleep(self.delay_s)    # blocking call OK here
 
             # reset that signal (if not done by EPICS)
-            if self.close_signal.value == 1:
+            if self.close_signal.get() == 1:
                 self.close_signal.put(0)
 
 
@@ -1049,7 +1049,7 @@ class EpicsDescriptionMixin(DeviceMixinBase):
 
         class myEpicsMotor(EpicsDescriptionMixin, EpicsMotor): pass
         m1 = myEpicsMotor('xxx:m1', name='m1')
-        print(m1.desc.value)
+        print(m1.desc.get())
 
     more ideas::
 
@@ -1126,7 +1126,7 @@ class MyEpicsMotor(EpicsMotorEnableMixin, EpicsMotor): ...
 
     @property
     def enabled(self):
-        return self.enable_disable.value in (self.MOTOR_ENABLE, "Enabled")
+        return self.enable_disable.get() in (self.MOTOR_ENABLE, "Enabled")
 
     def enable_motor(self):
         """BLOCKING call to enable motor axis"""
@@ -1169,9 +1169,9 @@ def get_lim(self, flag):
         Similar with SPEC command
         """
         if flag > 0:
-            return self.soft_limit_hi.value
+            return self.soft_limit_hi.get()
         elif flag < 0:
-            return self.soft_limit_lo.value
+            return self.soft_limit_lo.get()
 
     def set_lim(self, low, high):
         """
@@ -1412,7 +1412,7 @@ def rampUp_rampDown():
             yield from controller.set_target(25, timeout=180)
             controller.report_interval_s = 10    # change report interval to 10s
             for i in range(10, 0, -1):
-                print(f"hold at {self.value:.2f}{self.units.value}, time remaining: {i}s")
+                print(f"hold at {self.get():.2f}{self.units.get()}, time remaining: {i}s")
                 yield from bps.sleep(1)
             yield from controller.set_target(0, timeout=180)
 
@@ -1431,15 +1431,15 @@ def rampUp_rampDown():
 
     def record_signal(self):
         """write signal to the console"""
-        msg = f"{self.controller_name} signal: {self.value:.2f}{self.units.value}"
+        msg = f"{self.controller_name} signal: {self.get():.2f}{self.units.get()}"
         print(msg)
         return msg
 
     def set_target(self, target, wait=True, timeout=None, timeout_fail=False):
         """plan: change controller to new signal set point"""
         yield from bps.mv(self.target, target)
 
-        msg = f"Set {self.controller_name} target to {target:.2f}{self.units.value}"
+        msg = f"Set {self.controller_name} target to {target:.2f}{self.units.get()}"
         print(msg)
 
         if wait:
@@ -1455,8 +1455,8 @@ def value(self):
     @property
     def settled(self):
         """Is signal close enough to target?"""
-        diff = abs(self.signal.get() - self.target.value)
-        return diff <= self.tolerance.value
+        diff = abs(self.signal.get() - self.target.get())
+        return diff <= self.tolerance.get()
 
     def wait_until_settled(self, timeout=None, timeout_fail=False):
         """
@@ -1484,17 +1484,17 @@ def changing_cb(*args, **kwargs):
                 if timeout is not None and elapsed > timeout:
                     _st._finished(success=self.settled)
                     msg = f"{self.controller_name} Timeout after {elapsed:.2f}s"
-                    msg += f", target {self.target.value:.2f}{self.units.value}"
-                    msg += f", now {self.signal.get():.2f}{self.units.value}"
+                    msg += f", target {self.target.get():.2f}{self.units.get()}"
+                    msg += f", now {self.signal.get():.2f}{self.units.get()}"
                     print(msg)
                     if timeout_fail:
                         raise TimeoutError(msg)
                     continue
                 if elapsed >= report:
                     report += self.report_interval_s
                     msg = f"Waiting {elapsed:.1f}s"
-                    msg += f" to reach {self.target.value:.2f}{self.units.value}"
-                    msg += f", now {self.signal.get():.2f}{self.units.value}"
+                    msg += f" to reach {self.target.get():.2f}{self.units.get()}"
+                    msg += f", now {self.signal.get():.2f}{self.units.get()}"
                     print(msg)
                 yield from bps.sleep(self.poll_s)
 
@@ -1614,8 +1614,8 @@ def AD_warmed_up(detector):
     HDF5 plugin "Capture" is set to 1 (Start).  In such case,
     first acquire at least one image with the HDF5 plugin enabled.
     """
-    old_capture = detector.hdf1.capture.value
-    old_file_write_mode = detector.hdf1.file_write_mode.value
+    old_capture = detector.hdf1.capture.get()
+    old_file_write_mode = detector.hdf1.file_write_mode.get()
     if old_capture == 1:
         return True
 
@@ -1744,11 +1744,11 @@ def make_filename(self):
         overrides default behavior: Get info from EPICS HDF5 plugin.
         """
         # start of the file name, file number will be appended per template
-        filename = self.file_name.value
+        filename = self.file_name.get()
 
         # this is where the HDF5 plugin will write the image, 
         # relative to the IOC's filesystem
-        write_path = self.file_path.value
+        write_path = self.file_path.get()
 
         # this is where the DataBroker will find the image, 
         # on a filesystem accessible to BlueSky

apstools/plans.py

@@ -313,7 +313,7 @@ def _internal(blocking_function, *args, **kwargs):
 #     if hasattr(axis, "position"):
 #         old_position = axis.position
 #     else:
-#         old_position = axis.value
+#         old_position = axis.get()
 
 #     def peak_analysis():
 #         aligned = False
@@ -1075,7 +1075,7 @@ def report(self, title=None):
                 t.addLabel("key")
                 t.addLabel("result")
                 for key in keys:
-                    v = getattr(self, key).value
+                    v = getattr(self, key).get()
                     t.addRow((key, str(v)))
                 if title is not None:
                     print(title)
@@ -1118,7 +1118,7 @@ def _scan(md=None):
                     v = np.array(v)
                 getattr(results, key).put(v)
 
-            if results.tune_ok.value:
+            if results.tune_ok.get():
                 yield from bps.create(name=stream_name)
                 try:
                     yield from bps.read(results)

apstools/suspenders.py

@@ -46,7 +46,7 @@ def __init__(self, signal, *,
                 sleep=0, pre_plan=None, post_plan=None, tripped_message='',
                 **kwargs):
 
-        self.expected_value = expected_value or signal.value
+        self.expected_value = expected_value or signal.get()
         self.allow_resume = allow_resume
         super().__init__(signal, 
             sleep=sleep,