Skip to content

Commit 1c475d7

Browse files
committed
03-11-2022; Several minor fixes
1) awg_pulse(): increment keyword is changed to length_increment in M4I_6631_X8 module 2) text label in plot_1d is corrected 3) Liveplot client warning message is turned off 4) Tektronix_3000_Series test_stop value is corrected
1 parent ff51350 commit 1c475d7

File tree

5 files changed

+28
-8
lines changed

5 files changed

+28
-8
lines changed

atomize/device_modules/Spectrum_M4I_6631_X8.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ def awg_pulse(self, name = 'P0', channel = 'CH0', func = 'SINE', frequency = '20
544544
"""
545545
if self.test_flag != 'test':
546546
pulse = {'name': name, 'channel': channel, 'function': func, 'frequency': frequency, 'phase' : phase,\
547-
'delta_phase': delta_phase, 'length': length, 'sigma': sigma, 'length_increment': increment, 'start': start,\
547+
'delta_phase': delta_phase, 'length': length, 'sigma': sigma, 'length_increment': length_increment, 'start': start,\
548548
'delta_start': delta_start, 'amp': d_coef, 'phase_list': phase_list, 'n': n }
549549

550550
self.pulse_array.append( pulse )
@@ -568,7 +568,7 @@ def awg_pulse(self, name = 'P0', channel = 'CH0', func = 'SINE', frequency = '20
568568

569569
elif self.test_flag == 'test':
570570
pulse = {'name': name, 'channel': channel, 'function': func, 'frequency': frequency, 'phase' : phase,\
571-
'delta_phase' : delta_phase, 'length': length, 'sigma': sigma, 'length_increment': increment, 'start': start,\
571+
'delta_phase' : delta_phase, 'length': length, 'sigma': sigma, 'length_increment': length_increment, 'start': start,\
572572
'delta_start': delta_start, 'amp': d_coef, 'phase_list': phase_list, 'n': n }
573573

574574
if channel == 'CH0':
@@ -646,7 +646,7 @@ def awg_pulse(self, name = 'P0', channel = 'CH0', func = 'SINE', frequency = '20
646646
assert( p_length >= p_sigma ), 'Pulse length should be longer or equal to sigma'
647647

648648
# increment
649-
temp_increment = increment.split(" ")
649+
temp_increment = length_increment.split(" ")
650650
if temp_increment[1] in self.timebase_dict:
651651
coef = self.timebase_dict[temp_increment[1]]
652652
p_increment = coef*float(temp_increment[0])

atomize/device_modules/Tektronix_3000_Series.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def __init__(self):
8888

8989
elif self.test_flag == 'test':
9090
self.test_start = 1
91-
self.test_stop = 1000
91+
self.test_stop = 10000
9292
self.test_record_length = 10000
9393
self.test_impedance = '1 M'
9494
self.test_acquisition_type = 'Normal'

atomize/main/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,4 @@ def remove(self, name=None):
226226

227227
def disconnect_received(self):
228228
self.is_connected = False
229-
warnings.warn('Disconnected from LivePlotter server, plotting has been disabled')
229+
#warnings.warn('Disconnected from LivePlotter server, plotting has been disabled')

atomize/main/widgets.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ def plot(self, *args, **kwargs):
255255
else:
256256
kwargs['pen'] = self.used_colors[name]
257257
self.curves[name].setData(*args, **kwargs)
258+
# Text label above the graph
259+
temp = kwargs.get('text', '')
260+
if temp != '':
261+
self.setTitle( temp )
258262

259263
# vertical lines
260264
if vline_arg != 'False':
@@ -325,7 +329,11 @@ def plot(self, *args, **kwargs):
325329
else:
326330
kwargs['pen'] = self.used_colors[name] = self.avail_colors.pop()
327331
self.curves[name] = self.plot_widget.plot(*args, **kwargs)
328-
332+
# Text label above the graph
333+
temp = kwargs.get('text', '')
334+
if temp != '':
335+
self.setTitle( temp )
336+
329337
# vertical lines
330338
if vline_arg != 'False':
331339
try:

atomize/tests/consecutive_script_test.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1+
import os
12
import runpy
3+
import atomize.general_modules.general_functions as general
4+
import atomize.tests.nutations as nut
5+
6+
path_to_main = os.path.abspath( os.getcwd() )
7+
path_to_folder = os.path.join( path_to_main, '..', '..', 'Experimental_Data/Kuznetsov/auto_test' )
8+
9+
filename = str( 9594 ) + ' MHz.csv'
10+
path = os.path.join( path_to_folder, filename )
11+
12+
#round( , 3 )
13+
#int( )
14+
15+
nut.experiment( MW_freq = int(9594), MF = 3463, Averages = 120, path_to_file = path )
216

3-
runpy.run_path(path_name='atomize/tests/liveplot_1D_test.py')
4-
runpy.run_path(path_name='atomize/tests/liveplot_2D_multi_test.py')

0 commit comments

Comments
 (0)