##// END OF EJS Templates
Fix pairsList in SpectraProc
jespinoza -
r1341:34c23d10b2ab
parent child
Show More
@@ -44,7 +44,6 class SpectraProc(ProcessingUnit):
44 except:
44 except:
45 pass
45 pass
46 self.dataOut.radarControllerHeaderObj = self.dataIn.radarControllerHeaderObj.copy()
46 self.dataOut.radarControllerHeaderObj = self.dataIn.radarControllerHeaderObj.copy()
47
48 self.dataOut.systemHeaderObj = self.dataIn.systemHeaderObj.copy()
47 self.dataOut.systemHeaderObj = self.dataIn.systemHeaderObj.copy()
49 self.dataOut.channelList = self.dataIn.channelList
48 self.dataOut.channelList = self.dataIn.channelList
50 self.dataOut.heightList = self.dataIn.heightList
49 self.dataOut.heightList = self.dataIn.heightList
@@ -130,6 +129,8 class SpectraProc(ProcessingUnit):
130 if self.dataOut.data_cspc is not None:
129 if self.dataOut.data_cspc is not None:
131 #desplaza a la derecha en el eje 2 determinadas posiciones
130 #desplaza a la derecha en el eje 2 determinadas posiciones
132 self.dataOut.data_cspc = numpy.roll(self.dataOut.data_cspc, shift, axis=1)
131 self.dataOut.data_cspc = numpy.roll(self.dataOut.data_cspc, shift, axis=1)
132 if pairsList:
133 self.__selectPairs(pairsList)
133
134
134 elif self.dataIn.type == "Voltage":
135 elif self.dataIn.type == "Voltage":
135
136
@@ -185,8 +186,9 class SpectraProc(ProcessingUnit):
185 self.__updateSpecFromVoltage()
186 self.__updateSpecFromVoltage()
186 if pairsList == None:
187 if pairsList == None:
187 self.dataOut.pairsList = [pair for pair in itertools.combinations(self.dataOut.channelList, 2)]
188 self.dataOut.pairsList = [pair for pair in itertools.combinations(self.dataOut.channelList, 2)]
189 else:
190 self.dataOut.pairsList = pairsList
188 self.__getFft()
191 self.__getFft()
189
190 self.dataOut.flagNoData = False
192 self.dataOut.flagNoData = False
191 self.firstdatatime = None
193 self.firstdatatime = None
192 self.profIndex = 0
194 self.profIndex = 0
General Comments 0
You need to be logged in to leave comments. Login now