##// END OF EJS Templates
schain
RSS
Fix select channels
Juan C. Espinoza -
r1223:c641cc2f3cd0
parent child
Show More
Side by Side Unified
Context file:
r1223:c641cc2f3cd0 Loading diff...:
Show file before | Show file after | Hide comments
@@ -285,19 +285,15 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 self.dataOut.channelList[i] for i in channelIndexList]
295 self.dataOut.channelList = range(len(channelIndexList))
298 # self.dataOut.nChannels = nChannels
296 self.__selectPairsByChannel(channelIndexList)
299
300 self.__selectPairsByChannel(self.dataOut.channelList)
301
297
302 return 1
298 return 1
303
299
Show file before | Show file after | Hide comments
@@ -111,8 +111,8 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 # self.dataOut.nChannels = nChannels
115 self.dataOut.channelList = range(len(channelIndexList))
116
116
117 return 1
117 return 1
118
118
General Comments 0
You need to be logged in to leave comments. Login now