Merge remote-tracking branch 'qutech-lab/triton_200/master'

qutech · Feb 26, 2021 · db28104 · db28104
2 parents f95487c + 2797472
commit db28104
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/MATLAB/+qc/daq_operations.m b/MATLAB/+qc/daq_operations.m
@@ -56,10 +56,12 @@
   % --- get length --------------------------------------------------------
 	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);
+		masks = util.py.py2mat(masks.masks(mask_maker));
+
 
 		maskIdsFromOperations = cellfun(@(x)(char(x.maskID)), util.py.py2mat(operations), 'UniformOutput', false);
 		maskIdsFromMasks = cellfun(@(x)(char(x.identifier)), util.py.py2mat(masks), 'UniformOutput', false);