##// END OF EJS Templates
schain-jc
RSS
Verificacion de la existencia de datos cspc y dc al realizar la integracion incoherente.
Miguel Valdez -
r222:6159533d3812
parent child
Show More
Show file before | Show file after | Hide comments
@@ -610,34 +610,46 if __name__ == '__main__':
610
610
611 opObj10 = procUnitConfObj0.addOperation(name='selectHeights')
611 opObj10 = procUnitConfObj0.addOperation(name='selectHeights')
612 opObj10.addParameter(name='minHei', value='90', format='float')
612 opObj10.addParameter(name='minHei', value='90', format='float')
613 opObj10.addParameter(name='maxHei', value='300', format='float')
613 opObj10.addParameter(name='maxHei', value='180', format='float')
614
614
615 opObj12 = procUnitConfObj0.addOperation(name='CohInt', optype='other')
615 opObj12 = procUnitConfObj0.addOperation(name='CohInt', optype='other')
616 opObj12.addParameter(name='n', value='10', format='int')
616 opObj12.addParameter(name='n', value='10', format='int')
617
617
618 opObj12 = procUnitConfObj0.addOperation(name='CohInt', optype='other')
619 opObj12.addParameter(name='n', value='2', format='int')
620 opObj12.addParameter(name='overlapping', value='1', format='int')
621
622 procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=procUnitConfObj0.getId())
618 procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=procUnitConfObj0.getId())
623 procUnitConfObj1.addParameter(name='nFFTPoints', value='32', format='int')
619 procUnitConfObj1.addParameter(name='nFFTPoints', value='32', format='int')
624
620
625 opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other')
621 opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other')
626 opObj11.addParameter(name='idfigure', value='1', format='int')
622 opObj11.addParameter(name='idfigure', value='1', format='int')
627 opObj11.addParameter(name='wintitle', value='SpectraPlot', format='str')
623 opObj11.addParameter(name='wintitle', value='SpectraPlot0', format='str')
628 opObj11.addParameter(name='zmin', value='40', format='int')
624 opObj11.addParameter(name='zmin', value='40', format='int')
629 opObj11.addParameter(name='zmax', value='90', format='int')
625 opObj11.addParameter(name='zmax', value='90', format='int')
630 opObj11.addParameter(name='showprofile', value='1', format='int')
626 opObj11.addParameter(name='showprofile', value='1', format='int')
627
628 procUnitConfObj2 = controllerObj.addProcUnit(datatype='Voltage', inputId=procUnitConfObj0.getId())
629
630 opObj12 = procUnitConfObj2.addOperation(name='CohInt', optype='other')
631 opObj12.addParameter(name='n', value='2', format='int')
632 opObj12.addParameter(name='overlapping', value='1', format='int')
631
633
632 opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other')
634 procUnitConfObj3 = controllerObj.addProcUnit(datatype='Spectra', inputId=procUnitConfObj2.getId())
633 opObj11.addParameter(name='idfigure', value='10', format='int')
635 procUnitConfObj3.addParameter(name='nFFTPoints', value='32', format='int')
634 opObj11.addParameter(name='wintitle', value='RTI', format='str')
636
635 # opObj11.addParameter(name='xmin', value='21', format='float')
637 opObj11 = procUnitConfObj3.addOperation(name='SpectraPlot', optype='other')
636 # opObj11.addParameter(name='xmax', value='22', format='float')
638 opObj11.addParameter(name='idfigure', value='2', format='int')
639 opObj11.addParameter(name='wintitle', value='SpectraPlot1', format='str')
637 opObj11.addParameter(name='zmin', value='40', format='int')
640 opObj11.addParameter(name='zmin', value='40', format='int')
638 opObj11.addParameter(name='zmax', value='90', format='int')
641 opObj11.addParameter(name='zmax', value='90', format='int')
639 opObj11.addParameter(name='showprofile', value='1', format='int')
642 # opObj11.addParameter(name='showprofile', value='1', format='int')
640 opObj11.addParameter(name='timerange', value=str(60), format='int')
643
644 # opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other')
645 # opObj11.addParameter(name='idfigure', value='10', format='int')
646 # opObj11.addParameter(name='wintitle', value='RTI', format='str')
647 ## opObj11.addParameter(name='xmin', value='21', format='float')
648 ## opObj11.addParameter(name='xmax', value='22', format='float')
649 # opObj11.addParameter(name='zmin', value='40', format='int')
650 # opObj11.addParameter(name='zmax', value='90', format='int')
651 # opObj11.addParameter(name='showprofile', value='1', format='int')
652 # opObj11.addParameter(name='timerange', value=str(60), format='int')
641
653
642 # opObj10 = procUnitConfObj1.addOperation(name='selectChannels')
654 # opObj10 = procUnitConfObj1.addOperation(name='selectChannels')
643 # opObj10.addParameter(name='channelList', value='0,2,4,6', format='intlist')
655 # opObj10.addParameter(name='channelList', value='0,2,4,6', format='intlist')
Show file before | Show file after | Hide comments
@@ -798,22 +798,24 class IncohInt(Operation):
798 #Overlapping data
798 #Overlapping data
799 nChannels, nFFTPoints, nHeis = data_spc.shape
799 nChannels, nFFTPoints, nHeis = data_spc.shape
800 data_spc = numpy.reshape(data_spc, (1, nChannels, nFFTPoints, nHeis))
800 data_spc = numpy.reshape(data_spc, (1, nChannels, nFFTPoints, nHeis))
801 data_cspc = numpy.reshape(data_cspc, (1, -1, nFFTPoints, nHeis))
801 if data_cspc != None:
802 data_dc = numpy.reshape(data_dc, (1, -1, nHeis))
802 data_cspc = numpy.reshape(data_cspc, (1, -1, nFFTPoints, nHeis))
803 if data_dc != None:
804 data_dc = numpy.reshape(data_dc, (1, -1, nHeis))
803
805
804 #If the buffer is empty then it takes the data value
806 #If the buffer is empty then it takes the data value
805 if self.__buffer_spc == None:
807 if self.__buffer_spc == None:
806 self.__buffer_spc = data_spc.copy()
808 self.__buffer_spc = data_spc
807
809
808 if data_cspc == None:
810 if data_cspc == None:
809 self.__buffer_cspc = None
811 self.__buffer_cspc = None
810 else:
812 else:
811 self.__buffer_cspc += data_cspc.copy()
813 self.__buffer_cspc += data_cspc
812
814
813 if data_dc == None:
815 if data_dc == None:
814 self.__buffer_dc = None
816 self.__buffer_dc = None
815 else:
817 else:
816 self.__buffer_dc += data_dc.copy()
818 self.__buffer_dc += data_dc
817
819
818 self.__profIndex += 1
820 self.__profIndex += 1
819 return
821 return
@@ -822,10 +824,10 class IncohInt(Operation):
822 if self.__profIndex < self.n:
824 if self.__profIndex < self.n:
823 self.__buffer_spc = numpy.vstack((self.__buffer_spc, data_spc))
825 self.__buffer_spc = numpy.vstack((self.__buffer_spc, data_spc))
824
826
825 if self.__buffer_cspc != None:
827 if data_cspc != None:
826 self.__buffer_cspc = numpy.vstack((self.__buffer_cspc, data_cspc))
828 self.__buffer_cspc = numpy.vstack((self.__buffer_cspc, data_cspc))
827
829
828 if self.__buffer_dc != None:
830 if data_dc != None:
829 self.__buffer_dc = numpy.vstack((self.__buffer_dc, data_dc))
831 self.__buffer_dc = numpy.vstack((self.__buffer_dc, data_dc))
830
832
831 self.__profIndex += 1
833 self.__profIndex += 1
@@ -835,11 +837,13 class IncohInt(Operation):
835 self.__buffer_spc = numpy.roll(self.__buffer_spc, -1, axis=0)
837 self.__buffer_spc = numpy.roll(self.__buffer_spc, -1, axis=0)
836 self.__buffer_spc[self.n-1] = data_spc
838 self.__buffer_spc[self.n-1] = data_spc
837
839
838 self.__buffer_cspc = numpy.roll(self.__buffer_cspc, -1, axis=0)
840 if data_cspc != None:
839 self.__buffer_cspc[self.n-1] = data_cspc
841 self.__buffer_cspc = numpy.roll(self.__buffer_cspc, -1, axis=0)
842 self.__buffer_cspc[self.n-1] = data_cspc
840
843
841 self.__buffer_dc = numpy.roll(self.__buffer_dc, -1, axis=0)
844 if data_dc != None:
842 self.__buffer_dc[self.n-1] = data_dc
845 self.__buffer_dc = numpy.roll(self.__buffer_dc, -1, axis=0)
846 self.__buffer_dc[self.n-1] = data_dc
843
847
844 self.__profIndex = self.n
848 self.__profIndex = self.n
845 return
849 return
General Comments 0
You need to be logged in to leave comments. Login now