Clean up

Author: rassouly

exopy_pulses/pulses/shapes/gaussian_shape.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# Copyright 2015-2021 by ExopyPulses Authors, see AUTHORS for more details.
+# Copyright 2021 by ExopyPulses Authors, see AUTHORS for more details.
 #
 # Distributed under the terms of the BSD license.
 #

exopy_pulses/tasks/tasks/instrs/views/transfer_pulse_loop_task_view.enaml

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# Copyright 2015-2018 by ExopyPulses Authors, see AUTHORS for more details.
+# Copyright 2015-2021 by ExopyPulses Authors, see AUTHORS for more details.
 #
 # Distributed under the terms of the BSD license.
 #
@@ -65,7 +65,7 @@ enamldef VarEditor(Container):
         text := model.value
         entries_updater << model.task.list_accessible_database_entries
         tool_tip = EVALUATER_TOOLTIP
-        
+
 enamldef LoopEditor(Container):
     """ Fields allowing to edit the sweep of a sequence.
 
@@ -76,21 +76,11 @@ enamldef LoopEditor(Container):
     padding = 1
     constraints = [hbox(loop_name,
                               param_start, param_start_val, param_stop,
-                              param_stop_val, param_points, param_points_val), align('v_center', loop_name, param_start)]
-#    Label: lab:
-#        hug_width = 'strong'
-#        text << model.key
-#    QtLineCompleter: val:
-#        text := model.value
-#        entries_updater << model.task.list_accessible_database_entries
-#        tool_tip = EVALUATER_TOOLTIP
-        
+                              param_stop_val, param_points, param_points_val),
+                   align('v_center', loop_name, param_start)]
+
     Field: loop_name:
         text := model.key
-#        print(model)
-#        items << list(task.sequence_vars.keys())
-#        selected := task.loop_name
-#        tool_tip = ("Name a variable to loop")
 
     Label: param_start:
         text = 'Start value'
@@ -126,7 +116,7 @@ enamldef LoopEditor(Container):
 
 
 enamldef ObjectComboFieldCompleterEditor(Container):
-    """ 
+    """
 
     """
     #: Reference to the object holding the completion information.
@@ -335,7 +325,7 @@ enamldef TransferPulseLoopView(InstrTaskView): view:
                         tstmp = os.path.getmtime(path)
                         task.sequence_timestamp = tstmp
                         task.sequence_path = path
-                        
+
     Label: operation_lab:
         text = 'Operation :'
     ObjectCombo: operation_val:
@@ -344,7 +334,7 @@ enamldef TransferPulseLoopView(InstrTaskView): view:
         tool_tip = ("Clean: delete all previously loaded waveforms\n"
                     "Load: load waveforms in the waveform list of the AWG \n"
                     "Enqueue: build a sequence from loaded waveforms")
-        
+
     DictListEditor(LoopEditor): parameter:
         parameter.mapping := task.parameters
         parameter.operations = ['add','remove']
@@ -355,15 +345,15 @@ enamldef TransferPulseLoopView(InstrTaskView): view:
     ObjectCombo: run_mode_val:
         items << list(task.get_member('run_mode').items)
         selected := task.run_mode
-        
+
     Label: trig_period_lab:
         text = 'Int trigger period (us)'
     QtLineCompleter: trig_period_val:
         entries_updater << task.list_accessible_database_entries
         text := task.trigger_period
         tool_tip = EVALUATER_TOOLTIP
         enabled << (task.run_mode=='Int Trig')
-        
+
     Notebook: nb:
         tabs_closable = False
         visible << bool(task.sequence)

exopy_pulses/tasks/tasks/instrs/views/transfer_sequence_task_view.enaml

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------------------------
-# Copyright 2015-2018 by ExopyPulses Authors, see AUTHORS for more details.
+# Copyright 2015-2021 by ExopyPulses Authors, see AUTHORS for more details.
 #
 # Distributed under the terms of the BSD license.
 #
@@ -69,33 +69,31 @@ enamldef VarEditor(Container):
 
 enamldef SequenceWindow(Window): seqwin:
     #attr task
-    
+
     title = 'Sequences'
-     
+
     initial_size = (1500,1000)
-    
+
     Container:
         ScrollArea:
             Container:
                 constraints = [vbox(ed, update, check,  plot)]
-                
+
                 DictEditor(VarEditor): ed:
                     ed.mapping = task.sequence_vars
                     ed.attributes << {'task': task}
-                    
+
                 PushButton: update:
                     text = 'Update Plot'
                     clicked ::
                         variables = ed.mapping
-                        #canvas.figure = plot_sequences(task,variables)
                         canvas.figure = task.compile_and_plot(variables)
-                        
+
                 CheckBox: check:
                     text = 'Toolbar Visible'
-                    checked := canvas.toolbar_visible 
+                    checked := canvas.toolbar_visible
                 Container: plot:
                     MPLCanvas: canvas:
-                        #figure = plot_sequences(task,ed.mapping)
                         figure = task.compile_and_plot(ed.mapping)
 
 def validate_context_driver_pair(core, context, task, parent=None):