Fix fundamental bug in measurement window assignment

Author: maxbeer99

qupulse/hardware/dacs/atssimple.py

@@ -248,18 +248,16 @@ def measure_program(
 
         # Sort results by window
         total_samples = 0
+        window_boundries = numpy.insert(numpy.cumsum(self._armed_sample_windows[:, 0]), 0, 0)
         for i, window_name in enumerate(self._armed_window_names):
-            n_samples = int(
-                self._armed_sample_windows[i, 0] * self._armed_sample_windows[i, 1]
-            )
-            samples = self._samples_raw[total_samples : total_samples + n_samples :]
-            results = self._results_raw[:, total_samples : total_samples + n_samples :]
+            samples = self._samples_raw[numpy.where((self._samples_raw >= window_boundries[i]) * (self._samples_raw < window_boundries[i+1]))[0]]
+            results = self._results_raw[:, numpy.where((self._samples_raw >= window_boundries[i]) * (self._samples_raw < window_boundries[i+1]))[0]]
 
             if self._results.get(window_name) == None:
                 self._results[window_name] = []
 
             self._results[window_name] += [[samples, results]]
-            total_samples += n_samples
+            total_samples += len(samples)
 
         # Compile result dict
         result_dict = {}