| @@ -285,20 +285,16 class SpectraProc(ProcessingUnit): | |||||
| 285 | raise ValueError, "Error selecting channels: The value %d in channelIndexList is not valid.\nAvailable channel indexes = " % ( |
|
285 | raise ValueError, "Error selecting channels: The value %d in channelIndexList is not valid.\nAvailable channel indexes = " % ( | |
| 286 | channelIndex, self.dataOut.channelIndexList) |
|
286 | channelIndex, self.dataOut.channelIndexList) | |
| 287 |
|
287 | |||
| 288 | # nChannels = len(channelIndexList) |
|
|||
| 289 |
|
||||
| 290 | data_spc = self.dataOut.data_spc[channelIndexList, :] |
|
288 | data_spc = self.dataOut.data_spc[channelIndexList, :] | |
| 291 | data_dc = self.dataOut.data_dc[channelIndexList, :] |
|
289 | data_dc = self.dataOut.data_dc[channelIndexList, :] | |
| 292 |
|
290 | |||
| 293 | self.dataOut.data_spc = data_spc |
|
291 | self.dataOut.data_spc = data_spc | |
| 294 | self.dataOut.data_dc = data_dc |
|
292 | self.dataOut.data_dc = data_dc | |
| 295 |
|
293 | |||
| 296 | self.dataOut.channelList = [ |
|
294 | # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] | |
| 297 |
|
|
295 | self.dataOut.channelList = range(len(channelIndexList)) | |
| 298 | # self.dataOut.nChannels = nChannels |
|
296 | self.__selectPairsByChannel(channelIndexList) | |
| 299 |
|
297 | |||
| 300 | self.__selectPairsByChannel(self.dataOut.channelList) |
|
|||
| 301 |
|
||||
| 302 | return 1 |
|
298 | return 1 | |
| 303 |
|
299 | |||
| 304 | def selectHeights(self, minHei, maxHei): |
|
300 | def selectHeights(self, minHei, maxHei): | |
| @@ -111,9 +111,9 class VoltageProc(ProcessingUnit): | |||||
| 111 | data = self.dataOut.data[channelIndexList,:] |
|
111 | data = self.dataOut.data[channelIndexList,:] | |
| 112 |
|
112 | |||
| 113 | self.dataOut.data = data |
|
113 | self.dataOut.data = data | |
| 114 | self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] |
|
114 | # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] | |
| 115 |
|
|
115 | self.dataOut.channelList = range(len(channelIndexList)) | |
| 116 |
|
116 | |||
| 117 | return 1 |
|
117 | return 1 | |
| 118 |
|
118 | |||
| 119 | def selectHeights(self, minHei=None, maxHei=None): |
|
119 | def selectHeights(self, minHei=None, maxHei=None): | |
General Comments 0
You need to be logged in to leave comments.
Login now