merge upstream

Merge branch 'main' of gitea.pkm.physik.tu-darmstadt.de:IPKM/python3-damaris

src/damaris/data/ADC_Result.py

@@ -98,6 +98,7 @@ class ADC_Result(Resultable, Drawable, DamarisFFT, Signalpath):
             self.y.append(numpy.zeros((samples,), dtype="int16"))
 
         self.x = numpy.zeros((samples,), dtype="float32")
+        self.nChannels = channels
 
         self.index.append((0, samples-1))
         self.cont_data = True
@@ -231,6 +232,8 @@ class ADC_Result(Resultable, Drawable, DamarisFFT, Signalpath):
                 job_id=self.job_id,
                 job_date=self.job_date,
             )
+            r.nChannels = self.nChannels
+            r.is_clipped = self.is_clipped
         finally:
             self.lock.release()
 
@@ -274,6 +277,8 @@ class ADC_Result(Resultable, Drawable, DamarisFFT, Signalpath):
             tmp_y.append(self.y[i][start:end+1].copy())
 
         r = ADC_Result(x = tmp_x, y = tmp_y,  index = [(0,len(tmp_y[0])-1)], sampl_freq = self.sampling_rate, desc = self.description.copy() if self.description is not None else None, job_id = self.job_id, job_date = self.job_date)
+        r.nChannels = self.nChannels
+        r.is_clipped = self.is_clipped
         self.lock.release()
         return r
 

src/damaris/data/Accumulation.py

@@ -111,21 +111,22 @@ class Accumulation(Errorable, Drawable, DamarisFFT, Signalpath):
             self.lock.release()
             raise
 
-        tmp_x = self.x[start:end+1]
+        tmp_x = self.x[start:end+1].copy()
         tmp_y = []
 
         for i in range(self.get_number_of_channels()):
-            tmp_y.append(self.y[i][start:end+1])
+            tmp_y.append(self.y[i][start:end+1].copy())
 
-        r = Accumulation(x = tmp_x, y = tmp_y, n = self.n, index = [(0,len(tmp_y[0])-1)], sampl_freq = self.sampling_rate, error = self.use_error)            
+        r = Accumulation(x = tmp_x, y = tmp_y, n = self.n, index = [(0,len(tmp_y[0])-1)], sampl_freq = self.sampling_rate, error = self.use_error)
         if self.uses_statistics():
             r.y_square = []
             for i in range(self.get_number_of_channels()):
-                r.y_square.append(self.y_square[i][start:end+1])
+                r.y_square.append(self.y_square[i][start:end+1].copy())
         if self.common_descriptions is not None:
             r.common_descriptions = self.common_descriptions.copy()
         r.time_period = self.time_period[:]
         r.job_ids = self.job_ids.copy()
+        r.is_clipped = self.is_clipped
         self.lock.release()
         return r
 

src/damaris/gui/ResultReader.py

@@ -231,7 +231,6 @@ class ResultReader:
                 for i in range(nChannels):
                     # split interleaved data
                     self.result.y[i][tmp_index:tmp_index+tmp_size] = tmp_part[i::nChannels]
-                    self.result.y[i][tmp_index:tmp_index+tmp_size] = tmp_part[i::nChannels]
 
                 if self.result.index != []:
                     self.result.index.append((tmp_index, tmp_index+tmp_size-1))