PEP8 conversions

BBN-Q · Oct 14, 2016 · 242b24b · 242b24b
1 parent 392cc1a
commit 242b24b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ChannelsViews.enaml b/ChannelsViews.enaml
@@ -73,7 +73,7 @@ enamldef PhysicalMarkerChannelView(GroupBox): curView:
             index ::
                 chan.AWG = selected_item
                 chan.translator = instrumentLib[selected_item].translator
-                chan.samplingRate = instrumentLib[selected_item].samplingRate
+                chan.sampling_rate = instrumentLib[selected_item].sampling_rate
 
 enamldef PhysicalQuadratureChannelView(GroupBox): curView:
     attr chan
@@ -89,7 +89,7 @@ enamldef PhysicalQuadratureChannelView(GroupBox): curView:
             index ::
                 chan.AWG = selected_item
                 chan.translator = instrumentLib[selected_item].translator
-                chan.samplingRate = instrumentLib[selected_item].samplingRate
+                chan.sampling_rate = instrumentLib[selected_item].sampling_rate
         Label:
             text = 'Source'
         ComboBox:
@@ -109,7 +109,7 @@ enamldef PhysicalQuadratureChannelView(GroupBox): curView:
             text = 'Phase Skew (deg.)'
         FloatField:
             value := chan.phaseSkew
-        
+
 
 enamldef LogicalQuadratureView(GroupBox): curView:
     attr chan
@@ -196,7 +196,7 @@ enamldef LogicalQuadratureView(GroupBox): curView:
                     index << psList.index(chan.pulseParams[loop_item])
                     index ::
                         chan.pulseParams[loop_item] = psList[index]
-        
+
 
 enamldef EmptyChannelView(Container):
     attr chan

diff --git a/instruments/drivers/APS2.py b/instruments/drivers/APS2.py
@@ -2,10 +2,10 @@
 from atom.api import Int, Constant, Enum
 
 class APS2(AWG):
-	numChannels = Int(default=2)
-	seqFileExt = Constant('.h5')
+	num_channels = Int(default=2)
+	seq_file_ext = Constant('.h5')
 	translator = Constant('APS2Pattern')
-	triggerSource = Enum('Internal', 'External', 'System').tag(desc='Source of trigger')
+	trigger_source = Enum('Internal', 'External', 'System').tag(desc='Source of trigger')
 
 	naming_convention = ['12', '12m1', '12m2', '12m3', '12m4']