|
@@ -834,8 +834,11 @@ class ApplicationWindow(QtWidgets.QMainWindow):
|
834
|
834
|
self.ui.lcdTotalDeadTime.display( 1e3*self.RAWDataProc.DATADICT["INFO"]["deadTime"] )
|
835
|
835
|
self.ui.headerFileTextBrowser.clear( )
|
836
|
836
|
self.ui.headerFileTextBrowser.append( self.RAWDataProc.DATADICT["INFO"]["headerstr"] )
|
837
|
|
-
|
838
|
|
- self.ui.lcdNumberFID1Length.display(self.RAWDataProc.DATADICT["Pulse 1"]["TIMES"][-1]- self.RAWDataProc.DATADICT["Pulse 1"]["TIMES"][0])
|
|
837
|
+
|
|
838
|
+ if u"Pulse 1" in self.RAWDataProc.DATADICT.keys():
|
|
839
|
+ self.ui.lcdNumberFID1Length.display(self.RAWDataProc.DATADICT["Pulse 1"]["TIMES"][-1]- self.RAWDataProc.DATADICT["Pulse 1"]["TIMES"][0])
|
|
840
|
+ if u"Pulse 2" in self.RAWDataProc.DATADICT.keys():
|
|
841
|
+ self.ui.lcdNumberFID1Length.display(self.RAWDataProc.DATADICT["Pulse 2"]["TIMES"][-1]- self.RAWDataProc.DATADICT["Pulse 2"]["TIMES"][0])
|
839
|
842
|
|
840
|
843
|
# Update info from the header into the GUI
|
841
|
844
|
self.ui.pulseTypeTextBrowser.clear()
|
|
@@ -1351,8 +1354,14 @@ class ApplicationWindow(QtWidgets.QMainWindow):
|
1351
|
1354
|
# self.ui.CentralVSpinBox.value(), \
|
1352
|
1355
|
# str(self.ui.windowTypeComboBox.currentText()), \
|
1353
|
1356
|
# self.ui.mplwidget ))
|
|
1357
|
+
|
|
1358
|
+ mPulse = "None"
|
|
1359
|
+ if u"Pulse 1" in self.RAWDataProc.DATADICT.keys():
|
|
1360
|
+ mPulse = u"Pulse 1"
|
|
1361
|
+ elif u"Pulse 2" in self.RAWDataProc.DATADICT.keys():
|
|
1362
|
+ mPulse = u"Pulse 2"
|
1354
|
1363
|
a,b,c,d,dead = self.RAWDataProc.computeWindow( \
|
1355
|
|
- "Pulse 1",
|
|
1364
|
+ mPulse,
|
1356
|
1365
|
self.ui.windowBandwidthSpinBox.value(), \
|
1357
|
1366
|
self.ui.CentralVSpinBox.value(), \
|
1358
|
1367
|
str(self.ui.windowTypeComboBox.currentText()), \
|