From 160447a71c8887faa52216cb4cb839b6739725d6 Mon Sep 17 00:00:00 2001 From: Lisa Zacarias Date: Thu, 4 Apr 2024 15:53:54 -0700 Subject: [PATCH] I think I finall got pycharm to stop fighting me? --- lcls_tools/common/controls/pyepics/utils.py | 46 ++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lcls_tools/common/controls/pyepics/utils.py b/lcls_tools/common/controls/pyepics/utils.py index af7037f6..2ddb495f 100644 --- a/lcls_tools/common/controls/pyepics/utils.py +++ b/lcls_tools/common/controls/pyepics/utils.py @@ -28,15 +28,15 @@ def __init__( access_callback=None, ): super().__init__( - pvname=pvname, - connection_timeout=connection_timeout, - callback=callback, - form=form, - verbose=verbose, - auto_monitor=auto_monitor, - count=count, - connection_callback=connection_callback, - access_callback=access_callback, + pvname=pvname, + connection_timeout=connection_timeout, + callback=callback, + form=form, + verbose=verbose, + auto_monitor=auto_monitor, + count=count, + connection_callback=connection_callback, + access_callback=access_callback, ) def __str__(self): @@ -52,11 +52,11 @@ def caget(self, count=None, as_string=False, as_numpy=True, use_monitor=True): if attempt > 3: raise PVInvalidError(f"{self} caget failed 3 times, aborting") value = epics_caget( - self.pvname, - as_string=as_string, - count=count, - as_numpy=as_numpy, - use_monitor=use_monitor, + self.pvname, + as_string=as_string, + count=count, + as_numpy=as_numpy, + use_monitor=use_monitor, ) if value is not None: @@ -91,21 +91,21 @@ def get( ): if use_caget: return self.caget( - as_string=as_string, as_numpy=as_numpy, use_monitor=use_monitor + as_string=as_string, as_numpy=as_numpy, use_monitor=use_monitor ) else: self.connect() value = super().get( - count, as_string, as_numpy, timeout, with_ctrlvars, use_monitor + count, as_string, as_numpy, timeout, with_ctrlvars, use_monitor ) if value is not None: return value else: print(f"{self} get failed, trying caget instead") return self.caget( - as_string=as_string, as_numpy=as_numpy, use_monitor=use_monitor + as_string=as_string, as_numpy=as_numpy, use_monitor=use_monitor ) def put( @@ -123,12 +123,12 @@ def put( return self.caput(value) status = super().put( - value, - wait=wait, - timeout=timeout, - use_complete=use_complete, - callback=callback, - callback_data=callback_data, + value, + wait=wait, + timeout=timeout, + use_complete=use_complete, + callback=callback, + callback_data=callback_data, ) if retry and (status != 1):