Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/float command resolution #503

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Fix/float command resolution #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76c16ff
Allow FloatCommands to have per-instance formatters. For high-resolut…
Aug 28, 2024
f0ffc13
Remove irrelevant edits
Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/auspex/instruments/agilent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 3 additions & 0 deletions src/auspex/instruments/instrument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Loading