Browse Source

DataSet is now always initialized with tRev=config.tRev, bunchesPerTurn=config.bunches_per_turn

Matze 4 years ago
parent
commit
a313c57d7b

+ 1 - 1
KCG/base/LeftBar.py

@@ -523,7 +523,7 @@ class LeftBar(kcgw.KCGWidgets):
         :return: -
         """
         if d_type == FILE:
-            self.Data[uid] = DataSet(file_name, shiftFMC2=config.shiftFMC2)
+            self.Data[uid] = DataSet(file_name, tRev=config.tRev, bunchesPerTurn=config.bunches_per_turn, shiftFMC2=config.shiftFMC2)
         else:
             self.Data[uid] = bif.livePlotData
 

+ 1 - 1
KCG/base/backend/constants.py

@@ -1,6 +1,6 @@
 import scipy.constants
 
-
+#is used for default. Inside the KCG the DataSet is always initialized with DataSet(..., tRev=config.tRev, bunchesPerTurn=config.bunches_per_turn)
 class KARA:
     circumference = 110.4  # Meter
     h = 184

+ 1 - 1
KCG/base/backendinterface.py

@@ -554,7 +554,7 @@ def _bif_read_and_update(board_id, read_type, dataOrName):
     if read_type == 0:
         data = DataSet(stringData=dataOrName, delays=delays, tRev=config.tRev, bunchesPerTurn=config.bunches_per_turn, shiftFMC2=config.shiftFMC2)
     else:
-        data = DataSet(filename=dataOrName, delays=delays, shiftFMC2=config.shiftFMC2)
+        data = DataSet(filename=dataOrName, delays=delays, tRev=config.tRev, bunchesPerTurn=config.bunches_per_turn, shiftFMC2=config.shiftFMC2)
 
     if live_plot_windows.hasWindows(board_id):
         

+ 1 - 1
KCG/widgets/PlotWidget.py

@@ -816,7 +816,7 @@ class PlotWidget(kcgw.KCGWidgets):
         else:
             live_plot_windows.addWindow(board_id, self)
             if board.get_board_status(board_id).last_file is not None:
-                self.data = DataSet(board.get_board_status(board_id).last_file, shiftFMC2=config.shiftFMC2)
+                self.data = DataSet(board.get_board_status(board_id).last_file, tRev=config.tRev, bunchesPerTurn=config.bunches_per_turn, shiftFMC2=config.shiftFMC2)
                 self.plot(type)
 
     def initUI(self):

+ 1 - 1
KCG/widgets/TimescanWidget.py

@@ -196,7 +196,7 @@ class ScanThread(QtCore.QObject):
                 data_raw = np.memmap(f_name, dtype='uint32')
             
         
-            data = DataSet(rawData=data_raw, shiftFMC2=config.shiftFMC2)
+            data = DataSet(rawData=data_raw, tRev=config.tRev, bunchesPerTurn=config.bunches_per_turn, shiftFMC2=config.shiftFMC2)
             
             #print('{:4.3f} emit Plot'.format(time.time()-self.startTime))
             self.plotSignal.emit(data)