1 files changed, 25 insertions, 24 deletions
diff --git a/qolab/hardware/rf_generator/agilent_e8257d.py b/qolab/hardware/rf_generator/agilent_e8257d.py
index 4eff0f9..c9df94b 100644
--- a/qolab/hardware/rf_generator/agilent_e8257d.py
+++ b/qolab/hardware/rf_generator/agilent_e8257d.py
@@ -5,7 +5,8 @@ from qolab.hardware.rf_generator import RFGeneratorSCPI
 class AgilentE8257D(RFGeneratorSCPI):
     """Agilent E8257D RF generator.
 
-    Note: Fixed frequency and Center frequency (of sweep)  are different in this model.
+    Note: Fixed frequency and Center frequency (of sweep)
+    are different in this model.
     """
 
     def __init__(self, resource, *args, **kwds):
@@ -31,7 +32,7 @@ class AgilentE8257D(RFGeneratorSCPI):
 
     @BasicInstrument.tsdb_append
     def getFreqFixed(self):
-        qstr = f":FREQuency:Fixed?"
+        qstr = ":FREQuency:Fixed?"
         rstr = self.query(qstr)
         return float(rstr)
 
@@ -42,7 +43,7 @@ class AgilentE8257D(RFGeneratorSCPI):
 
     @BasicInstrument.tsdb_append
     def getSweepCentralFreq(self):
-        qstr = f":FREQuency:CENTer?"
+        qstr = ":FREQuency:CENTer?"
         rstr = self.query(qstr)
         return float(rstr)
 
@@ -53,7 +54,7 @@ class AgilentE8257D(RFGeneratorSCPI):
 
     @BasicInstrument.tsdb_append
     def getSweepSpan(self):
-        qstr = f":FREQuency:SPAN?"
+        qstr = ":FREQuency:SPAN?"
         rstr = self.query(qstr)
         return float(rstr)
 
@@ -71,83 +72,83 @@ class AgilentE8257D(RFGeneratorSCPI):
 
     @BasicInstrument.tsdb_append
     def getModulationState(self):
-        return int(self.query(f":MODulation:STATe?"))
+        return int(self.query(":MODulation:STATe?"))
 
     @BasicInstrument.tsdb_append
     def setModulationState(self, val):
-        rstr = self.write(f":MODulation:STATe {val}")
+        self.write(f":MODulation:STATe {val}")
 
     @BasicInstrument.tsdb_append
     def getRFPowerState(self):
-        return int(self.query(f":OUTPut:STATe?"))
+        return int(self.query(":OUTPut:STATe?"))
 
     @BasicInstrument.tsdb_append
     def setRFPowerState(self, val):
-        rstr = self.write(f":OUTPut:STATe {val}")
+        self.write(f":OUTPut:STATe {val}")
 
     @BasicInstrument.tsdb_append
     def getRFAmplitude(self):
-        return float(self.query(f":POWer:AMPLitude?"))
+        return float(self.query(":POWer:AMPLitude?"))
 
     @BasicInstrument.tsdb_append
     def setRFAmplitude(self, val):
-        rstr = self.write(f":POWer:AMPLitude {val}")
+        self.write(f":POWer:AMPLitude {val}")
 
     @BasicInstrument.tsdb_append
     def getFM1ModulationDepth(self):
-        return float(self.query(f":FM1:Deviation?"))
+        return float(self.query(":FM1:Deviation?"))
 
     @BasicInstrument.tsdb_append
     def setFM1ModulationDepth(self, val):
-        rstr = self.write(f":FM1:Deviation {val}")
+        self.write(f":FM1:Deviation {val}")
 
     @BasicInstrument.tsdb_append
     def getFM2ModulationDepth(self):
-        return float(self.query(f":FM2:Deviation?"))
+        return float(self.query(":FM2:Deviation?"))
 
     @BasicInstrument.tsdb_append
     def setFM2ModulationDepth(self, val):
-        rstr = self.write(f":FM2:Deviation {val}")
+        self.write(f":FM2:Deviation {val}")
 
     @BasicInstrument.tsdb_append
     def getFM1Source(self):
-        return str(self.query(f":FM1:Source?"))
+        return str(self.query(":FM1:Source?"))
 
     @BasicInstrument.tsdb_append
     def setFM1Source(self, val):
-        rstr = self.write(f":FM1:Source {val}")
+        self.write(f":FM1:Source {val}")
 
     @BasicInstrument.tsdb_append
     def getFM2Source(self):
-        return str(self.query(f":FM2:Source?"))
+        return str(self.query(":FM2:Source?"))
 
     @BasicInstrument.tsdb_append
     def setFM2Source(self, val):
-        rstr = self.write(f":FM2:Source {val}")
+        self.write(f":FM2:Source {val}")
 
     @BasicInstrument.tsdb_append
     def getFM1State(self):
-        return int(self.query(f":FM1:State?"))
+        return int(self.query(":FM1:State?"))
 
     @BasicInstrument.tsdb_append
     def setFM1State(self, val):
-        rstr = self.write(f":FM1:State {val}")
+        self.write(f":FM1:State {val}")
 
     @BasicInstrument.tsdb_append
     def getFM2State(self):
-        return int(self.query(f":FM2:State?"))
+        return int(self.query(":FM2:State?"))
 
     @BasicInstrument.tsdb_append
     def setFM2State(self, val):
-        rstr = self.write(f":FM2:State {val}")
+        self.write(f":FM2:State {val}")
 
     @BasicInstrument.tsdb_append
     def getFrequencyMode(self):
-        return str(self.query(f":Frequency:Mode?"))
+        return str(self.query(":Frequency:Mode?"))
 
     @BasicInstrument.tsdb_append
     def setFrequencyMode(self, val):
-        rstr = self.write(f":Frequency:Mode {val}")
+        self.write(f":Frequency:Mode {val}")
 
     @BasicInstrument.tsdb_append
     def startFrequencySweep(self):