Merge pull request #12 from BogdoKhan/dev-dkc1

Added counts-per-second counter

Author: BogdoKhan

devices/devices.py

@@ -376,10 +376,10 @@ def sendData(self):     #get data from channel widget and send it to board via s
             self.ini_sets.endGroup()
         self.ini_sets.endGroup()
 
-        query = "BIAS1?"
-        self.board.transport.client.write(query)  
-        response = self.board.transport.client.read_raw().decode('utf-8').rstrip()
-        print(response)
+        # query = "BIAS1?"
+        # self.board.transport.client.write(query)  
+        # response = self.board.transport.client.read_raw().decode('utf-8').rstrip()
+        # print(response)
 
 
 #Basic widget for connection to single device

spectrometer/spmeter_base.py

@@ -64,7 +64,7 @@ def processData(self, data):
         self.centroid = str(int(popt[1]))
         print("Center: {0}".format(self.centroid))
         self.integral = np.sum(self.fitData)
-        print("Integral: {0}".format(self.integral))
+        print("Integral: {0}".format(int(self.integral)))
 
 class Spectrometer(QWidget):
     name = 'Spectrometer'
@@ -73,7 +73,7 @@ def __init__(self):
         super().__init__()
         self.m_sp_plotter = PlSpectrometer()
 
-        #self.frameTime = 1.0 #frame time = 1 s by default
+        self.frameTime = 1.0 #frame time = 1 s by default
 
         self.btn_clear = QPushButton("Clear plot")
         self.btn_replot_act = QPushButton("Replot only active")
@@ -86,6 +86,10 @@ def __init__(self):
 
         self.btn_clear.clicked.connect(self.m_sp_plotter.clear)
 
+    def setDaqTime(self, daqTime):
+        self.frameTime = daqTime/1000
+        print("Daq time: {0}".format(self.frameTime))
+
 class PlSpectrometer(PlotWidget):
     clr_cycle = ['#000', '#c77', '#0f0', '#00f','#054', '#d21', '#6c5', '#712', '#912', '#a3e', '#f21', '#840']
 
@@ -156,58 +160,61 @@ def setupUI(self):
 class TrendsParams(QWidget):
     def __init__(self):
         super().__init__()
+        self.lbl_info = QLabel("Info:")
+
         self.setupUI()
     def setupUI(self):
         self.layout = QVBoxLayout()
-        self.groupBox_PeakStab = QtWidgets.QGroupBox()
-        #self.groupBox_PeakStab.setTitle("Peak stabilization")
-        self.gridLayout_PeakStab = QtWidgets.QGridLayout(self.groupBox_PeakStab)
-
-        #Peak in area
-        self.m_label_peak_stabil2 = QtWidgets.QLabel(self.groupBox_PeakStab)
-        self.m_label_peak_stabil2.setText("Peak in area")
-        self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil2, 1, 0, 1, 1)
-        self.m_spin_area_to_track = QtWidgets.QSpinBox(self.groupBox_PeakStab)
-        self.m_spin_area_to_track.setRange(1,3)
-        self.m_spin_area_to_track.setProperty("value", 2)
-        self.gridLayout_PeakStab.addWidget(self.m_spin_area_to_track, 1, 1, 1, 1)
-
-        #Step size
-        self.m_label_peak_stabil_step_size = QtWidgets.QLabel(self.groupBox_PeakStab)
-        self.m_label_peak_stabil_step_size.setText("Step size")
-        self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil_step_size, 2, 0, 1, 1)
-        self.m_spin_peak_stabil_step_size = QtWidgets.QSpinBox(self.groupBox_PeakStab)
-        self.m_spin_peak_stabil_step_size.setMinimum(1)
-        self.m_spin_peak_stabil_step_size.setMaximum(32)
-        self.gridLayout_PeakStab.addWidget(self.m_spin_peak_stabil_step_size, 2, 1, 1, 1)
-
-        #Avg frames for search
-        self.m_label_peak_stabil1 = QtWidgets.QLabel(self.groupBox_PeakStab)
-        self.m_label_peak_stabil1.setText("Avg frames for search")
-        self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil1, 1, 2, 1, 1)
-        self.m_spin_compensate_avg_frames = QtWidgets.QSpinBox(self.groupBox_PeakStab)
-        self.m_spin_compensate_avg_frames.setMaximum(600)
-        self.m_spin_compensate_avg_frames.setProperty("value", 60)
-        self.gridLayout_PeakStab.addWidget(self.m_spin_compensate_avg_frames, 1, 3, 1, 1)
-
-        #keep on channel
-        self.m_label_peak_stabil3 = QtWidgets.QLabel(self.groupBox_PeakStab)
-        self.m_label_peak_stabil3.setText("keep on channel")
-        self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil3, 2, 2, 1, 1)
-        self.m_spin_keep_channel = QtWidgets.QSpinBox(self.groupBox_PeakStab)
-        self.m_spin_keep_channel.setMaximum(1023)
-        self.m_spin_keep_channel.setProperty("value", 150)
-        self.gridLayout_PeakStab.addWidget(self.m_spin_keep_channel, 2, 3, 1, 1)
-
-        #Peak found on channel
-        self.m_label_peak_stabil4 = QtWidgets.QLabel(self.groupBox_PeakStab)
-        self.m_label_peak_stabil4.setText("Peak found on channel")
-        self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil4, 0, 1, 1, 1)
-        self.m_label_peak_stabil_channel = QtWidgets.QLabel(self.groupBox_PeakStab)
-        self.m_label_peak_stabil_channel.setText("0.00")
-        self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil_channel, 0, 2, 1, 1)
-
-        self.layout.addWidget(self.groupBox_PeakStab)
+        self.layout.addWidget(self.lbl_info)
+        # self.groupBox_PeakStab = QtWidgets.QGroupBox()
+        # #self.groupBox_PeakStab.setTitle("Peak stabilization")
+        # self.gridLayout_PeakStab = QtWidgets.QGridLayout(self.groupBox_PeakStab)
+
+        # #Peak in area
+        # self.m_label_peak_stabil2 = QtWidgets.QLabel(self.groupBox_PeakStab)
+        # self.m_label_peak_stabil2.setText("Peak in area")
+        # self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil2, 1, 0, 1, 1)
+        # self.m_spin_area_to_track = QtWidgets.QSpinBox(self.groupBox_PeakStab)
+        # self.m_spin_area_to_track.setRange(1,3)
+        # self.m_spin_area_to_track.setProperty("value", 2)
+        # self.gridLayout_PeakStab.addWidget(self.m_spin_area_to_track, 1, 1, 1, 1)
+
+        # #Step size
+        # self.m_label_peak_stabil_step_size = QtWidgets.QLabel(self.groupBox_PeakStab)
+        # self.m_label_peak_stabil_step_size.setText("Step size")
+        # self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil_step_size, 2, 0, 1, 1)
+        # self.m_spin_peak_stabil_step_size = QtWidgets.QSpinBox(self.groupBox_PeakStab)
+        # self.m_spin_peak_stabil_step_size.setMinimum(1)
+        # self.m_spin_peak_stabil_step_size.setMaximum(32)
+        # self.gridLayout_PeakStab.addWidget(self.m_spin_peak_stabil_step_size, 2, 1, 1, 1)
+
+        # #Avg frames for search
+        # self.m_label_peak_stabil1 = QtWidgets.QLabel(self.groupBox_PeakStab)
+        # self.m_label_peak_stabil1.setText("Avg frames for search")
+        # self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil1, 1, 2, 1, 1)
+        # self.m_spin_compensate_avg_frames = QtWidgets.QSpinBox(self.groupBox_PeakStab)
+        # self.m_spin_compensate_avg_frames.setMaximum(600)
+        # self.m_spin_compensate_avg_frames.setProperty("value", 60)
+        # self.gridLayout_PeakStab.addWidget(self.m_spin_compensate_avg_frames, 1, 3, 1, 1)
+
+        # #keep on channel
+        # self.m_label_peak_stabil3 = QtWidgets.QLabel(self.groupBox_PeakStab)
+        # self.m_label_peak_stabil3.setText("keep on channel")
+        # self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil3, 2, 2, 1, 1)
+        # self.m_spin_keep_channel = QtWidgets.QSpinBox(self.groupBox_PeakStab)
+        # self.m_spin_keep_channel.setMaximum(1023)
+        # self.m_spin_keep_channel.setProperty("value", 150)
+        # self.gridLayout_PeakStab.addWidget(self.m_spin_keep_channel, 2, 3, 1, 1)
+
+        # #Peak found on channel
+        # self.m_label_peak_stabil4 = QtWidgets.QLabel(self.groupBox_PeakStab)
+        # self.m_label_peak_stabil4.setText("Peak found on channel")
+        # self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil4, 0, 1, 1, 1)
+        # self.m_label_peak_stabil_channel = QtWidgets.QLabel(self.groupBox_PeakStab)
+        # self.m_label_peak_stabil_channel.setText("0.00")
+        # self.gridLayout_PeakStab.addWidget(self.m_label_peak_stabil_channel, 0, 2, 1, 1)
+
+        # self.layout.addWidget(self.groupBox_PeakStab)
         self.setLayout(self.layout)
         self.setMaximumHeight(400)
 
@@ -288,12 +295,15 @@ def setupUI(self):
 class SpectraDAQ(QObject):
     finished = pyqtSignal()
     signal_dataReady = pyqtSignal(object, int)
+    signal_ChanCPFReady = pyqtSignal(object, int)
+    signal_totCPFReady = pyqtSignal(int)
     nEntries = 10
     def __init__(self, devicesMap, isCont):
         super().__init__()
         self.devicesMap = devicesMap
         self.isContinuous = isCont
         self.setStop = False
+        self.daqTime = 1.0
 
     @pyqtSlot()
     def run(self):
@@ -302,8 +312,6 @@ def run(self):
         print("Data acquisition finished")
         self.finished.emit()
 
-
-
     def get_spectrum(self, nEntries):
         data = dict()
         self.settings = {'ip':'192.168.0.20', 'port':5000}
@@ -323,12 +331,12 @@ def get_spectrum(self, nEntries):
                     dataChunk = data[device.ip][chan*1027:(chan+1)*1027-3]
                     chanIntegral = np.sum(dataChunk)    #calculate number of events per frame for each channel
                     nCountsPerSecondTotal += chanIntegral
-                    print("Channel {0} CPF: {1}".format(device.channels[chan].name, chanIntegral))
+                    self.signal_ChanCPFReady.emit(device.channels[chan].name, chanIntegral)
                     if self.isContinuous:
                         device.channels[chan].data = np.add(device.channels[chan].data, dataChunk)
                     else:
                         device.channels[chan].data = dataChunk
-            print("Total CPF: {0}".format(nCountsPerSecondTotal))
+            self.signal_totCPFReady.emit(nCountsPerSecondTotal)
             self.signal_dataReady.emit(self.devicesMap, (entry+1))
 
             if self.setStop:                          

spectrometer/spmeters.py

@@ -35,10 +35,13 @@ class ChanSpectrometer(Spectrometer):
     def __init__(self):
         super().__init__()
         #self.frameTime = 1.0 #frame time = 1 s by default
+        self.chanInfo = QLabel("Channel info: ")
+        self.chanInfo1 = QLabel("Channel info: ")
+
+
         self.setupUI()
 
         self.btn_replot_act.clicked.connect(self.replot)
-
         self.devicesMap = None
         self.useSum = True
 
@@ -51,6 +54,9 @@ def setupUI(self):
         self.layout_btns.addWidget(self.lbl_entries)
 
         self.layout.addLayout(self.layout_btns)
+        self.layout.addWidget(self.chanInfo)
+        self.layout.addWidget(self.chanInfo1)
+
         self.layout.addWidget(self.m_sp_plotter)
         self.setLayout(self.layout)
 
@@ -66,6 +72,8 @@ def slot_on_spec_update(self, devicesMap, entry, useSum):
         self.m_sp_plotter.clear()
 
         plotIndex = 0
+        nCountsPerSecondTotal = 0
+
         for device in self.devicesMap.values():
             for chan in device.channels:
                 if chan.isActive:
@@ -75,6 +83,16 @@ def slot_on_spec_update(self, devicesMap, entry, useSum):
         self.lbl_entries.setText("{0} frames".format(entry))
         self.btn_replot_act.setEnabled(True)
 
+    @pyqtSlot(object, int)              #counts per second
+    def slot_chanCPF(self, chan_name, chan_CPF):
+        chan_CPS = chan_CPF / self.frameTime
+        print("Channel {0} CPS: {1}".format(chan_name, chan_CPS))
+        if (chan_name == "Channel0"):
+            self.chanInfo.setText("Info: channel {0} CPS: {1}".format(chan_name, chan_CPS))
+        elif (chan_name == "Channel1"):
+            self.chanInfo1.setText("Info: channel {0} CPS: {1}".format(chan_name, chan_CPS))
+
+
     def update_plot(self):
         self.m_sp_plotter.clear()
 
@@ -193,7 +211,6 @@ def slot_on_spec_update(self, devicesMap, entry, useSum):
                 self.trendFramesX.append(entry)
                 try:
                     self.integrator.processData(counts)
-                    print(self.integrator.integral)
                 except:
                     self.trendFramesY.append(0)
                     self.trends.pl_trends.plot(self.trendFramesX, self.trendFramesY, pen=self.trends.pl_trends.pen)
@@ -211,6 +228,12 @@ def slot_on_spec_update(self, devicesMap, entry, useSum):
         self.lbl_entries.setText("{0} frames".format(entry))
         self.btn_replot_act.setEnabled(True)
 
+    @pyqtSlot(object, int)          #counts per second
+    def slot_totCPF(self, tot_CPF):
+        tot_CPS = tot_CPF / self.frameTime
+        print("Total CPS: {0}".format(tot_CPS))
+        self.trends.tabwid.tab_TrendsParams.lbl_info.setText("Info: {0} CPS".format(tot_CPS))
+
     def update_plot(self):
         dataSum = 0
         self.m_sp_plotter.clear()

test.py

@@ -73,12 +73,18 @@ def __init__(self):
 
         self.worker.signal_dataReady.connect(lambda devicesMap, entry, useSum=True: self.m_sumSpectrometer.slot_on_spec_update(devicesMap, entry, useSum))
         self.worker.signal_dataReady.connect(lambda devicesMap, entry, useSum=False: self.m_specWidget.slot_on_spec_update(devicesMap, entry, useSum))
+
+        self.worker.signal_ChanCPFReady.connect(lambda chan_name, chan_CPF: self.m_specWidget.slot_chanCPF(chan_name, chan_CPF))
+        self.worker.signal_totCPFReady.connect(lambda chan_CPF: self.m_sumSpectrometer.slot_totCPF(chan_CPF))
+
         self.worker.finished.connect(self.thr_daq.terminate)
 
         self.thr_daq.started.connect(self.worker.run)
         self.daqwidget.btn_get_single_spectrum.clicked.connect(self.get_single_spectrum)     
         self.daqwidget.btn_get_full_spectrum.clicked.connect(self.get_series_of_spectra)    
         self.daqwidget.btn_get_full_spectrum.clicked.connect(self.m_sumSpectrometer.clear_data)     
+
+        self.daqwidget.btn_updAcqTime.clicked.connect(self.sendDaqTimeToSpectrometer)
 
         self.daqwidget.btn_interrupt.clicked.connect(self.setStop)     
             #create connections for spectrometer widgets
@@ -99,8 +105,17 @@ def get_single_spectrum(self):  #shoot only one frame of spectrum
         self.thr_daq.start()
 
     def get_series_of_spectra(self):    #shoot many frames of spectrum during the data acquisition time
+        self.sendDaqTimeToSpectrometer()
+        self.daqwidget.setAcqTime()
+        
         self.worker.nEntries = self.daqwidget.nFrames
         self.thr_daq.start()
+
+    def sendDaqTimeToSpectrometer(self):        #send frame time for calc counts per second for each frame
+        daqTime = float(self.daqwidget.lne_single_daq_time.text())
+        self.m_specWidget.setDaqTime(daqTime)
+        self.m_sumSpectrometer.setDaqTime(daqTime)
+
         #ocsope connections for wave dumping
     def slot_dump_wave_done(self):
         self.daq_cont['dumping_wave'] = False