Browse Source

Fix of displayed dead time

tags/1.6.1
Trevor Irons 5 years ago
parent
commit
fcf8aa5bc0
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      akvo/gui/akvoGUI.py

+ 3
- 2
akvo/gui/akvoGUI.py View File

737
         INFO["headerstr"] = str(self.headerstr)
737
         INFO["headerstr"] = str(self.headerstr)
738
         INFO["nDAQVersion"] = self.RAWDataProc.nDAQVersion
738
         INFO["nDAQVersion"] = self.RAWDataProc.nDAQVersion
739
         INFO["log"] = yaml.dump( self.YamlNode )  #self.logText  #MAK 20170127
739
         INFO["log"] = yaml.dump( self.YamlNode )  #self.logText  #MAK 20170127
740
-          
741
 
740
 
742
         self.RAWDataProc.DATADICT["INFO"] = INFO 
741
         self.RAWDataProc.DATADICT["INFO"] = INFO 
743
 
742
 
851
         self.ui.lcdNumberResampFreq.setEnabled(1)
850
         self.ui.lcdNumberResampFreq.setEnabled(1)
852
         self.ui.lcdTotalDeadTime.setEnabled(1)
851
         self.ui.lcdTotalDeadTime.setEnabled(1)
853
         
852
         
854
-        self.ui.lcdTotalDeadTime.display( 1e3*self.RAWDataProc.DATADICT["INFO"]["deadTime"] )
853
+        #self.ui.lcdTotalDeadTime.display( 1e3*self.RAWDataProc.DATADICT["INFO"]["deadTime"] )
854
+        self.ui.lcdTotalDeadTime.display( 1e3 * (self.RAWDataProc.DATADICT["Pulse 1"]["TIMES"][0]-self.RAWDataProc.DATADICT["Pulse 1"]["PULSE_TIMES"][-1]) )
855
+
855
         self.ui.headerFileTextBrowser.clear( ) 
856
         self.ui.headerFileTextBrowser.clear( ) 
856
         self.ui.headerFileTextBrowser.append( self.RAWDataProc.DATADICT["INFO"]["headerstr"] )
857
         self.ui.headerFileTextBrowser.append( self.RAWDataProc.DATADICT["INFO"]["headerstr"] )
857
         
858
         

Loading…
Cancel
Save