mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-12-16 01:21:20 +01:00
solved merge conflict
This commit is contained in:
@@ -113,6 +113,7 @@ class SignalsTab(QtWidgets.QWidget):
|
|||||||
if not isPlottedArray[i]:
|
if not isPlottedArray[i]:
|
||||||
offset += nbitsPerDBit
|
offset += nbitsPerDBit
|
||||||
arr[idx, :] = np.nan
|
arr[idx, :] = np.nan
|
||||||
|
|
||||||
continue
|
continue
|
||||||
for iSample in range(dSamples):
|
for iSample in range(dSamples):
|
||||||
# all samples for digital bit together from slsReceiver
|
# all samples for digital bit together from slsReceiver
|
||||||
|
|||||||
Reference in New Issue
Block a user