| @@ -76,17 +76,23 class SpectraPlot(Figure): | |||
|
|
76 | 76 | """ |
|
|
77 | 77 | |
|
|
78 | 78 | if channelList == None: |
|
|
79 | channelList = dataOut.channelList | |
|
|
79 | channelIndexList = dataOut.channelIndexList | |
|
|
80 | else: | |
|
|
81 | channelIndexList = [] | |
|
|
82 | for channel in channelList: | |
|
|
83 | if channel not in dataOut.channelList: | |
|
|
84 | raise ValueError, "Channel %d is not in dataOut.channelList" | |
|
|
85 | channelIndexList.append(channel) | |
|
|
80 | 86 | |
|
|
81 | 87 | x = dataOut.getVelRange(1) |
|
|
82 | 88 | y = dataOut.heightList |
|
|
83 | z = 10.*numpy.log10(dataOut.data_spc[channelList,:,:]) | |
|
|
89 | z = 10.*numpy.log10(dataOut.data_spc[channelIndexList,:,:]) | |
|
|
84 | 90 | |
|
|
85 | 91 | noise = dataOut.getNoise() |
|
|
86 | 92 | |
|
|
87 | 93 | if not self.__isConfig: |
|
|
88 | 94 | |
|
|
89 | nplots = len(channelList) | |
|
|
95 | nplots = len(channelIndexList) | |
|
|
90 | 96 | |
|
|
91 | 97 | self.setup(idfigure=idfigure, |
|
|
92 | 98 | nplots=nplots, |
| @@ -110,7 +116,7 class SpectraPlot(Figure): | |||
|
|
110 | 116 | self.setWinTitle(title) |
|
|
111 | 117 | |
|
|
112 | 118 | for i in range(self.nplots): |
|
|
113 | title = "Channel %d: %4.2fdB" %(channelList[i], noise[i]) | |
|
|
119 | title = "Channel %d: %4.2fdB" %(dataOut.channelList[i], noise[i]) | |
|
|
114 | 120 | zchannel = z[i,:,:] |
|
|
115 | 121 | |
|
|
116 | 122 | axes = self.axesList[i] |
General Comments 0
You need to be logged in to leave comments.
Login now