Merge pull request #503 from BBN-Q/fix/FloatCommand_resolution

Fix/float command resolution
BBN-Q · Aug 28, 2024 · 53e5b3b · 53e5b3b
2 parents c8cd99c + f0ffc13
commit 53e5b3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/auspex/instruments/agilent.py b/src/auspex/instruments/agilent.py
@@ -735,9 +735,9 @@ class _AgilentNetworkAnalyzer(SCPIInstrument):
 
     ##Basic SCPI commands.
     frequency_center    = FloatCommand(scpi_string=":SENSe:FREQuency:CENTer")
-    frequency_start     = FloatCommand(scpi_string=":SENSe:FREQuency:STARt")
-    frequency_stop      = FloatCommand(scpi_string=":SENSe:FREQuency:STOP")
-    frequency_span      = FloatCommand(scpi_string=":SENSe:FREQuency:SPAN")
+    frequency_start     = FloatCommand(scpi_string=":SENSe:FREQuency:STARt", formatter={:.0f})
+    frequency_stop      = FloatCommand(scpi_string=":SENSe:FREQuency:STOP", formatter={:.0f})
+    frequency_span      = FloatCommand(scpi_string=":SENSe:FREQuency:SPAN", formatter={:.0f})
     if_bandwidth        = FloatCommand(scpi_string=":SENSe1:BANDwidth")
     num_points          = IntCommand(scpi_string=":SENSe:SWEep:POINTS")
 

diff --git a/src/auspex/instruments/instrument.py b/src/auspex/instruments/instrument.py
@@ -41,6 +41,9 @@ def parse(self):
                 setattr(self, a, self.kwargs.pop(a))
             else:
                 setattr(self, a, None) # Default to None
+        # Permit overiding the 'formatter' but keep the one defined as class variable if none is given
+        if 'formatter' in self.kwargs:
+            self.formatter = self.kwargs.pop('formatter')
 
         if 'doc' in self.kwargs:
             self.doc = self.kwargs.pop('doc')