From f0ffc131fc541b81e7a78701ad9f8a721fa81cca Mon Sep 17 00:00:00 2001 From: Martin Gustafsson Date: Wed, 28 Aug 2024 17:09:29 -0400 Subject: [PATCH] Remove irrelevant edits --- src/auspex/instruments/agilent.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/auspex/instruments/agilent.py b/src/auspex/instruments/agilent.py index 94cf16bf..a3e8e27e 100644 --- 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", formatter="{:.0f}") - frequency_stop = FloatCommand(scpi_string=":SENSe:FREQuency:STOP", formatter="{:.0f}") - frequency_span = FloatCommand(scpi_string=":SENSe:FREQuency:SPAN", formatter="{:.0f}") + 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") @@ -788,10 +788,9 @@ def output_enable(self, outp): the port being in `OFF` mode, while `True` corresponds to the port being in `AUTO` mode. """ if isinstance(outp, dict): - for k, v in outp.items(): + for k, v in self.outp.items(): val = "AUTO" if v else "OFF" - self.interface.write(f" {val}") - print(f"Setting port {k} to {val}") + self.interface.write(f"SOUR:POW{k}:MODE {val}") else: val = "AUTO" if outp else "OFF" for p in self.ports: