diff --git a/schainpy/controller.py b/schainpy/controller.py index 067ef3d..1302ecf 100644 --- a/schainpy/controller.py +++ b/schainpy/controller.py @@ -610,34 +610,46 @@ if __name__ == '__main__': opObj10 = procUnitConfObj0.addOperation(name='selectHeights') opObj10.addParameter(name='minHei', value='90', format='float') - opObj10.addParameter(name='maxHei', value='300', format='float') + opObj10.addParameter(name='maxHei', value='180', format='float') opObj12 = procUnitConfObj0.addOperation(name='CohInt', optype='other') opObj12.addParameter(name='n', value='10', format='int') - opObj12 = procUnitConfObj0.addOperation(name='CohInt', optype='other') - opObj12.addParameter(name='n', value='2', format='int') - opObj12.addParameter(name='overlapping', value='1', format='int') - procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=procUnitConfObj0.getId()) procUnitConfObj1.addParameter(name='nFFTPoints', value='32', format='int') opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other') opObj11.addParameter(name='idfigure', value='1', format='int') - opObj11.addParameter(name='wintitle', value='SpectraPlot', format='str') + opObj11.addParameter(name='wintitle', value='SpectraPlot0', format='str') opObj11.addParameter(name='zmin', value='40', format='int') opObj11.addParameter(name='zmax', value='90', format='int') - opObj11.addParameter(name='showprofile', value='1', format='int') + opObj11.addParameter(name='showprofile', value='1', format='int') + + procUnitConfObj2 = controllerObj.addProcUnit(datatype='Voltage', inputId=procUnitConfObj0.getId()) + + opObj12 = procUnitConfObj2.addOperation(name='CohInt', optype='other') + opObj12.addParameter(name='n', value='2', format='int') + opObj12.addParameter(name='overlapping', value='1', format='int') - opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') - opObj11.addParameter(name='idfigure', value='10', format='int') - opObj11.addParameter(name='wintitle', value='RTI', format='str') -# opObj11.addParameter(name='xmin', value='21', format='float') -# opObj11.addParameter(name='xmax', value='22', format='float') + procUnitConfObj3 = controllerObj.addProcUnit(datatype='Spectra', inputId=procUnitConfObj2.getId()) + procUnitConfObj3.addParameter(name='nFFTPoints', value='32', format='int') + + opObj11 = procUnitConfObj3.addOperation(name='SpectraPlot', optype='other') + opObj11.addParameter(name='idfigure', value='2', format='int') + opObj11.addParameter(name='wintitle', value='SpectraPlot1', format='str') opObj11.addParameter(name='zmin', value='40', format='int') opObj11.addParameter(name='zmax', value='90', format='int') - opObj11.addParameter(name='showprofile', value='1', format='int') - opObj11.addParameter(name='timerange', value=str(60), format='int') +# opObj11.addParameter(name='showprofile', value='1', format='int') + +# opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') +# opObj11.addParameter(name='idfigure', value='10', format='int') +# opObj11.addParameter(name='wintitle', value='RTI', format='str') +## opObj11.addParameter(name='xmin', value='21', format='float') +## opObj11.addParameter(name='xmax', value='22', format='float') +# opObj11.addParameter(name='zmin', value='40', format='int') +# opObj11.addParameter(name='zmax', value='90', format='int') +# opObj11.addParameter(name='showprofile', value='1', format='int') +# opObj11.addParameter(name='timerange', value=str(60), format='int') # opObj10 = procUnitConfObj1.addOperation(name='selectChannels') # opObj10.addParameter(name='channelList', value='0,2,4,6', format='intlist') diff --git a/schainpy/model/jroprocessing.py b/schainpy/model/jroprocessing.py index a9d9c23..97ec0e5 100644 --- a/schainpy/model/jroprocessing.py +++ b/schainpy/model/jroprocessing.py @@ -798,22 +798,24 @@ class IncohInt(Operation): #Overlapping data nChannels, nFFTPoints, nHeis = data_spc.shape data_spc = numpy.reshape(data_spc, (1, nChannels, nFFTPoints, nHeis)) - data_cspc = numpy.reshape(data_cspc, (1, -1, nFFTPoints, nHeis)) - data_dc = numpy.reshape(data_dc, (1, -1, nHeis)) + if data_cspc != None: + data_cspc = numpy.reshape(data_cspc, (1, -1, nFFTPoints, nHeis)) + if data_dc != None: + data_dc = numpy.reshape(data_dc, (1, -1, nHeis)) #If the buffer is empty then it takes the data value if self.__buffer_spc == None: - self.__buffer_spc = data_spc.copy() + self.__buffer_spc = data_spc if data_cspc == None: self.__buffer_cspc = None else: - self.__buffer_cspc += data_cspc.copy() + self.__buffer_cspc += data_cspc if data_dc == None: self.__buffer_dc = None else: - self.__buffer_dc += data_dc.copy() + self.__buffer_dc += data_dc self.__profIndex += 1 return @@ -822,10 +824,10 @@ class IncohInt(Operation): if self.__profIndex < self.n: self.__buffer_spc = numpy.vstack((self.__buffer_spc, data_spc)) - if self.__buffer_cspc != None: + if data_cspc != None: self.__buffer_cspc = numpy.vstack((self.__buffer_cspc, data_cspc)) - if self.__buffer_dc != None: + if data_dc != None: self.__buffer_dc = numpy.vstack((self.__buffer_dc, data_dc)) self.__profIndex += 1 @@ -835,11 +837,13 @@ class IncohInt(Operation): self.__buffer_spc = numpy.roll(self.__buffer_spc, -1, axis=0) self.__buffer_spc[self.n-1] = data_spc - self.__buffer_cspc = numpy.roll(self.__buffer_cspc, -1, axis=0) - self.__buffer_cspc[self.n-1] = data_cspc + if data_cspc != None: + self.__buffer_cspc = numpy.roll(self.__buffer_cspc, -1, axis=0) + self.__buffer_cspc[self.n-1] = data_cspc - self.__buffer_dc = numpy.roll(self.__buffer_dc, -1, axis=0) - self.__buffer_dc[self.n-1] = data_dc + if data_dc != None: + self.__buffer_dc = numpy.roll(self.__buffer_dc, -1, axis=0) + self.__buffer_dc[self.n-1] = data_dc self.__profIndex = self.n return