Changes from experiment (selene)

MATLAB/+qc/daq_operations.m

@@ -20,6 +20,8 @@
 	% --- add ---------------------------------------------------------------
 	if strcmp(ctrl, 'add') % output is operations		 
 		% Call before qc.awg_program('arm')!
+
+
 
 		smdata.inst(instIndex).data.virtual_channel = struct( ...
 			'operations', {a.operations} ...
@@ -57,10 +59,10 @@
 	elseif strcmp(ctrl, 'get length') % output is length
 		% Operations need to have been added beforehand
         mask_maker = py.getattr(daq, '_make_mask');
-		masks = util.py.py2mat(py.getattr(daq, '_registered_programs'));
-		masks = util.py.py2mat(masks.(a.program_name));
-		operations = masks.operations;		
-		masks = util.py.py2mat(masks.masks(mask_maker));
+		programs = util.py.py2mat(py.getattr(daq, '_registered_programs'));
+		program = util.py.py2mat(programs.(a.program_name));
+		operations = program.operations;
+		masks = util.py.py2mat(program.masks(mask_maker));
 
 
 		maskIdsFromOperations = cellfun(@(x)(char(x.maskID)), util.py.py2mat(operations), 'UniformOutput', false);
@@ -81,6 +83,13 @@
 					error('daq_operations assumes that all masks should have the same length if using ComputeRepAverageDefinition.');
 				end				
 				output(k) = n(1);
+            elseif isa(operations{k}, 'py.atsaverage._atsaverage_release.ComputeChunkedAverageDefinition')
+                chunk_size = operations{k}.chunkSize;
+                window_lengths = double(py.numpy.max(py.numpy.asarray(masks{maskIndex}.length, py.numpy.dtype('u8'))));
+                max_chunks_per_window = ceil(window_lengths / chunk_size);
+                n_windows = size(masks{maskIndex}.length);
+
+                output(k) = max_chunks_per_window * n_windows;
 			else
 				error('Operation ''%s'' not yet implemented', class(operations{k}));
 			end

MATLAB/+qc/instantiate_pulse.m

@@ -1,44 +1,46 @@
 function instantiated_pulse = instantiate_pulse(pulse, varargin)
-	% Plug in parameters
-
-	if qc.is_instantiated_pulse(pulse)
-		instantiated_pulse = pulse;
-
-	else
-		default_args = struct(...
-			'parameters', py.None, ...
-			'channel_mapping', py.None, ...
-			'window_mapping' , py.None, ...
-			'global_transformation', [], ...
-			'to_single_waveform', py.set() ...
-			);
-
-		args = util.parse_varargin(varargin, default_args);
-
-		args.channel_mapping = replace_empty_with_pynone(args.channel_mapping);
-		args.window_mapping = replace_empty_with_pynone(args.window_mapping);
-		args.global_transformation = qc.to_transformation(args.global_transformation);
-
-		kwargs = pyargs( ...
-			'parameters' ,     args.parameters, ...
-			'channel_mapping', args.channel_mapping, ...
-			'measurement_mapping' , args.window_mapping, ...
-			'global_transformation', args.global_transformation, ...
-			'to_single_waveform', args.to_single_waveform ...
-			);
-
-		instantiated_pulse = util.py.call_with_interrupt_check(py.getattr(pulse, 'create_program'), kwargs);
-	end
-end
+% Plug in parameters
 
+if qc.is_instantiated_pulse(pulse)
+    instantiated_pulse = pulse;
+
+else
+    default_args = struct(...
+        'parameters', py.None, ...
+        'channel_mapping', py.None, ...
+        'window_mapping' , py.None, ...
+        'global_transformation', [], ...
+        'to_single_waveform', py.set() ...
+        );
+
+    args = util.parse_varargin(varargin, default_args);
+
+    args.channel_mapping = replace_empty_with_pynone(args.channel_mapping);
+    args.window_mapping = replace_empty_with_pynone(args.window_mapping);
+    args.global_transformation = qc.to_transformation(args.global_transformation);
+
+    kwargs = pyargs( ...
+        'parameters' ,     args.parameters, ...
+        'channel_mapping', args.channel_mapping, ...
+        'measurement_mapping' , args.window_mapping, ...
+        'global_transformation', args.global_transformation, ...
+        'to_single_waveform', args.to_single_waveform ...
+        );
+
+    % Matlab crashes with this right now (12/20) 2020a, py37 TH
+    % instantiated_pulse = util.py.call_with_interrupt_check(py.getattr(pulse, 'create_program'), kwargs);
+    instantiated_pulse = pulse.create_program(kwargs);
+
+end
+end
 
 function mappingStruct = replace_empty_with_pynone(mappingStruct)
-	
-	for fn = fieldnames(mappingStruct)'
-		if isempty(mappingStruct.(fn{1}))
-			mappingStruct.(fn{1}) = py.None;
-		end
-	end
-	
+
+for fn = fieldnames(mappingStruct)'
+    if isempty(mappingStruct.(fn{1}))
+        mappingStruct.(fn{1}) = py.None;
+    end
+end
+
 end
 

MATLAB/+qc/operations_to_python.m

@@ -21,6 +21,10 @@
 				pyOp = py.atsaverage.operations.RepAverage(args{:});
 			case 'RepeatedDownsample'
 				pyOp = py.atsaverage.operations.RepeatedDownsample(args{:});
+            case 'ChunkedAverage'
+                assert(numel(args) == 3);
+                args{3} = py.int(args{3});
+                pyOp = py.atsaverage.operations.ChunkedAverage(args{:});
 			otherwise
 			  error('Operation %s not recognized', operations{k}{1});
 		end		

MATLAB/+qc/plot_pulse_4chan.m

@@ -5,76 +5,76 @@
 % (c) 2018/06 Pascal Cerfontaine ([email protected])
 
 defaultArgs = struct(...
-	'charge_diagram_data_structs', {{}},								   ... Should contain 2 structs in a cell array with fields x, y 
-																											   ... and data, where data{1} contains the charge diagram data
-  'plot_charge_diagram',         true,								   ...
-  'lead_points_cell',						 {{}},								   ... Should contain a cell with a lead_points entry for each qubit
-	'special_points_cell',			   {{}},								   ... Should contain a cell with a special_points entry for each qubit
-	'channels',										 {{'W', 'X', 'Y', 'Z'}}, ...
-	'measurements',								 {{'A', 'A', 'B', 'B'}}, ...
-	'markerChannels',							 {{'M1', '', 'M2', ''}}	 ...
-	);
+    'charge_diagram_data_structs', {{}},								   ... Should contain 2 structs in a cell array with fields x, y
+    ... and data, where data{1} contains the charge diagram data
+    'plot_charge_diagram',         true,								   ...
+    'lead_points_cell',						 {{}},								   ... Should contain a cell with a lead_points entry for each qubit
+    'special_points_cell',			   {{}},								   ... Should contain a cell with a special_points entry for each qubit
+    'channels',										 {{'W', 'X', 'Y', 'Z'}}, ...
+    'measurements',								 {{'A', 'A', 'B', 'B'}}, ...
+    'markerChannels',							 {{'M1', '', 'M2', ''}}	 ...
+    );
 args = util.parse_varargin(varargin, defaultArgs);
-	
-	
-	for chrgInd = 1:2
-		k = chrgInd + double(chrgInd==2);
-		q = 4 - k;
-		
-		if numel(args.charge_diagram_data_structs) >= chrgInd
-			args.charge_diagram_data = args.charge_diagram_data_structs{chrgInd};
-			args.charge_diagram_data = {args.charge_diagram_data.x, args.charge_diagram_data.y, args.charge_diagram_data.data{1}};
-		else
-			args.charge_diagram_data = {};
-		end
-		
-		if numel(args.lead_points_cell) >= chrgInd
-			args.lead_points = args.lead_points_cell{chrgInd};
-			else
-			args.lead_points = {};
-		end
-		
-		if numel(args.special_points_cell) >= chrgInd
-			args.special_points = args.special_points_cell{chrgInd};
-			else
-			args.special_points = {};
-		end
-		
-		args.charge_diagram = args.channels(k:k+1);
-		if args.plot_charge_diagram
-			args.subplots = [220+k 220+k+1];
-		else
-			args.subplots = [210+chrgInd];
-		end
-		args.clear_fig = k==1;
-		[t, channels, measurements, instantiatedPulse] = qc.plot_pulse(pulse, args);			
-		xlabel(args.channels(k));
-		ylabel(args.channels(k+1));
-		
-		if args.plot_charge_diagram
-			subplot(args.subplots(1));
-		end
-		set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.channels{q})), 'Visible', 'off');
-		set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.channels{q+1})), 'Visible', 'off');
-		set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.markerChannels{q})), 'Visible', 'off');
-		set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.markerChannels{q+1})), 'Visible', 'off');
-		set(findall(gca, 'DisplayName', sprintf('Meas: %s', args.measurements{q})), 'Visible', 'off');		
-		set(findall(gca, 'DisplayName', sprintf('Meas: %s', args.measurements{q+1})), 'Visible', 'off');	
-		
-		[hLeg, hObj] = legend(gca);
-		for l = 1:numel(hLeg.String)
-			if strcmp(hLeg.String{l}, sprintf('Chan: %s', args.channels{q})) || ...
-				 strcmp(hLeg.String{l}, sprintf('Chan: %s', args.channels{q+1})) || ...
-				 strcmp(hLeg.String{l}, sprintf('Chan: %s', args.markerChannels{q})) || ...
-				 strcmp(hLeg.String{l}, sprintf('Chan: %s', args.markerChannels{q+1})) || ...
-				 strcmp(hLeg.String{l}, sprintf('Meas: %s', args.measurements{q})) || ...
-				 strcmp(hLeg.String{l}, sprintf('Meas: %s', args.measurements{q+1}))
-			hLeg.String{l} = '';
-		end
-		findobj(hObj, 'type', 'line');
-		set(hObj, 'lineWidth', 2);
-	end
-	
-		
-	
+
+
+for chrgInd = 1:2
+    k = chrgInd + double(chrgInd==2);
+    q = 4 - k;
+    
+    if numel(args.charge_diagram_data_structs) >= chrgInd
+        args.charge_diagram_data = args.charge_diagram_data_structs{chrgInd};
+        args.charge_diagram_data = {args.charge_diagram_data.x, args.charge_diagram_data.y, args.charge_diagram_data.data{1}};
+    else
+        args.charge_diagram_data = {};
+    end
+    
+    if numel(args.lead_points_cell) >= chrgInd
+        args.lead_points = args.lead_points_cell{chrgInd};
+    else
+        args.lead_points = {};
+    end
+    
+    if numel(args.special_points_cell) >= chrgInd
+        args.special_points = args.special_points_cell{chrgInd};
+    else
+        args.special_points = {};
+    end
+    
+    args.charge_diagram = args.channels(k:k+1);
+    if args.plot_charge_diagram
+        args.subplots = [220+k 220+k+1];
+    else
+        args.subplots = [210+chrgInd];
+    end
+    args.clear_fig = k==1;
+    [t, channels, measurements, instantiatedPulse] = qc.plot_pulse(pulse, args);
+    xlabel(args.channels(k));
+    ylabel(args.channels(k+1));
+    
+    if args.plot_charge_diagram
+        subplot(args.subplots(1));
+    end
+    set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.channels{q})), 'Visible', 'off');
+    set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.channels{q+1})), 'Visible', 'off');
+    set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.markerChannels{q})), 'Visible', 'off');
+    set(findall(gca, 'DisplayName', sprintf('Chan: %s', args.markerChannels{q+1})), 'Visible', 'off');
+    set(findall(gca, 'DisplayName', sprintf('Meas: %s', args.measurements{q})), 'Visible', 'off');
+    set(findall(gca, 'DisplayName', sprintf('Meas: %s', args.measurements{q+1})), 'Visible', 'off');
+    
+    [hLeg, hObj] = legend(gca);
+    for l = 1:numel(hLeg.String)
+        if strcmp(hLeg.String{l}, sprintf('Chan: %s', args.channels{q})) || ...
+                strcmp(hLeg.String{l}, sprintf('Chan: %s', args.channels{q+1})) || ...
+                strcmp(hLeg.String{l}, sprintf('Chan: %s', args.markerChannels{q})) || ...
+                strcmp(hLeg.String{l}, sprintf('Chan: %s', args.markerChannels{q+1})) || ...
+                strcmp(hLeg.String{l}, sprintf('Meas: %s', args.measurements{q})) || ...
+                strcmp(hLeg.String{l}, sprintf('Meas: %s', args.measurements{q+1}))
+            hLeg.String{l} = '';
+        end
+        findobj(hObj, 'type', 'line');
+        set(hObj, 'lineWidth', 2);
+    end
+    
+    
+    
 end

MATLAB/+qc/resolve_mappings.m

@@ -0,0 +1,52 @@
+function resolved = resolve_mappings(varargin)
+% Takes a variable number of parameter mappings (structs) and resolves them
+% sequentially. Eg. if the first maps A to B and the second B to C, returns
+% a mapping A to C. Goes left-to-right (first to last).
+%
+% >> qc.resolve_mappings(struct('a', 'b'), struct('b', 'c', 'x', 'y'), ...
+%                        struct('c', 'd'), struct('x', 'z', 'asdf', 'jkl'), ...
+%                        struct('z', 'a', 'bla', 'foo'))
+% 
+% Warning: Field clash. Value to the right supercedes. 
+% > In qc.resolve_mappings (line 14) 
+% 
+% ans = 
+% 
+%   struct with fields:
+% 
+%        a: 'd'
+%        x: 'a'
+%     asdf: 'jkl'
+%      bla: 'foo'
+% =========================================================================
+resolved = varargin{1};
+varargin = varargin(2:end);
+
+while ~isempty(varargin)
+    visited_fields = {};
+    for f = fieldnames(resolved)'
+        field = f{1};
+        value = resolved.(field);
+        if isfield(varargin{1}, field)
+            warning('Field clash. Value to the right supercedes.')
+            resolved.(field) = varargin{1}.(field);
+            visited_fields = [visited_fields field];
+        elseif isfield(varargin{1}, value)
+            resolved.(field) = varargin{1}.(value);
+            visited_fields = [visited_fields value];
+        end
+    end
+
+    % Add unchanged new fields from varargin{1}
+    for f = fieldnames(varargin{1})'
+        field = f{1};
+        value = varargin{1}.(field);
+        if ~ismember(visited_fields, field)
+            resolved.(field) = value;
+        end
+    end
+
+    varargin = varargin(2:end);
+end
+
+end

MATLAB/+qc/setup_alazar_measurements.m

@@ -47,8 +47,8 @@
 	nQubits = args.nQubits;
 	nMeasPerQubit = args.nMeasPerQubit;
 
-	py.setattr(hws, '_measurement_map', py.dict);
-	py.setattr(daq, '_mask_prototypes', py.dict);
+	py.getattr(hws, '_measurement_map').clear();
+	py.getattr(daq, '_mask_prototypes').clear();
 	warning('Removing measurement_map and measurement_map might break stuff if previously set. Needs testing.');
 
 	for q = 1:nQubits
@@ -81,12 +81,12 @@
 
 			% Q1 A1           qubitIndex, measIndex, hwChannel, auxFlag1, secondQubitIndex, secondHwChannel, auxFlag2
 			add_meas_and_mask(1,          m,         2,         false,    1,                0              , true);
-      % Q1 A2           qubitIndex, measIndex, hwChannel, auxFlag1, secondQubitIndex, secondHwChannel, auxFlag2
+            % Q1 A2           qubitIndex, measIndex, hwChannel, auxFlag1, secondQubitIndex, secondHwChannel, auxFlag2
 			add_meas_and_mask(1,          m,         2,         false,    2,                1              , true);
 
 			% Q2 A1           qubitIndex, measIndex, hwChannel, auxFlag1, secondQubitIndex, secondHwChannel, auxFlag2
 			add_meas_and_mask(2,          m,         3,         false,    1,                0              , true);
-      % Q2 A2           qubitIndex, measIndex, hwChannel, auxFlag1, secondQubitIndex, secondHwChannel, auxFlag2
+            % Q2 A2           qubitIndex, measIndex, hwChannel, auxFlag1, secondQubitIndex, secondHwChannel, auxFlag2
 			add_meas_and_mask(2,          m,         3,         false,    2,                1              , true);
 		end
 	end

qupulse/_program/_loop.py

@@ -208,10 +208,6 @@ def _get_repr(self, first_prefix, other_prefixes) -> Generator[str, None, None]:
                 yield from cast(Loop, elem)._get_repr(other_prefixes + '  ->', other_prefixes + '    ')
 
     def __repr__(self) -> str:
-        is_circular = is_tree_circular(self)
-        if is_circular:
-            return '{}: Circ {}'.format(id(self), is_circular)
-
         str_len = 0
         repr_list = []
         for sub_repr in self._get_repr('', ''):

qupulse/_program/seqc.py

@@ -101,7 +101,7 @@ def markers_ch1(self):
 
     @property
     def markers_ch2(self):
-        return np.bitwise_and(self.marker_data, 0b1100)
+        return np.right_shift(np.bitwise_and(self.marker_data, 0b1100), 2)
 
     @classmethod
     def from_sampled(cls, ch1: Optional[np.ndarray], ch2: Optional[np.ndarray],

qupulse/expressions.py

@@ -63,6 +63,8 @@ def _parse_evaluate_numeric_result(self,
         if isinstance(result, tuple):
             result = numpy.array(result)
         if isinstance(result, numpy.ndarray):
+            if result.shape == ():
+                return self._parse_evaluate_numeric_result(result[()], call_arguments)
             if issubclass(result.dtype.type, allowed_types):
                 return result
             else: