Fixed bug in time trace with parameter sweeps

pulse_lib/acquisition/measurement_converter.py

@@ -311,7 +311,7 @@ class MeasurementConverter:
             if m.interval is not None and m.aggregate_func is None:
                 n_samples = m.n_samples
                 if not isinstance(n_samples, Number):
-                    n_samples = max(n_samples)
+                    n_samples = np.max(n_samples)
                 if m.f_sweep is None:
                     time = tuple(np.arange(n_samples, dtype=float) * m.interval)
                     sp_raw.append(time, 'time', 'time', 'ns')
@@ -381,7 +381,7 @@ class MeasurementConverter:
                     n_samples = m.n_samples
                     if not isinstance(n_samples, Number):
                         # NOTE: n_samples is an array (loop_obj)
-                        shape = channel_data.shape[:-1]+(max(n_samples),)
+                        shape = channel_data.shape[:-1]+(np.max(n_samples),)
                         channel_raw = np.full(shape, np.nan)
                         n_samples = n_samples[tuple(index)]
                         channel_raw[..., :n_samples] = channel_data[..., data_offset:data_offset+n_samples]

pulse_lib/sequencer.py

@@ -406,7 +406,7 @@ class sequencer():
                     else:
                         m.n_samples = np.zeros(t_measure.shape, dtype=int)
                         for i, t in enumerate(t_measure.flat):
-                            m.n_samples[i], m.interval = \
+                            m.n_samples.flat[i], m.interval = \
                                 self.uploader.actual_acquisition_points(m.acquisition_channel,
                                                                         t, sample_rate)
                 else:
@@ -418,7 +418,7 @@ class sequencer():
                 m.aggregate_func = self._acquisition_conf.aggregate_func
             else:
                 m.n_samples = 1
-            if m.n_samples > 0 and self._acquisition_conf.f_sweep is not None:
+            if self._acquisition_conf.f_sweep is not None and np.all(m.n_samples > 0):
                 m.f_sweep = self._acquisition_conf.f_sweep
 
     def get_measurement_param(self, name='seq_measurements', upload=None,