schain Commit - r1386:029f5a79c540 · Jicamarca Repository

Se cambió los títulos en SpectraPlot y RTIPlot para que muestre los canales reales luego de la operación selectChannels

joabAM -

r1386:029f5a79c540

parent child

Context file:

r1386:029f5a79c540

Collapse all files

schainpy/model/graphics/jroplot_spectra.py +13 -4

                 colormap = 'jet'
                 plot_type = 'pcolor'
                 buffering = False
+                channelList = None
                 def setup(self):
                     self.nplots = len(self.data.channels)
                     self.ncols = int(numpy.sqrt(self.nplots) + 0.9)
                     self.nrows = int((1.0 * self.nplots / self.ncols) + 0.9)
                     self.height = 2.6 * self.nrows
                     self.cb_label = 'dB'
                     if self.showprofile:
                         self.width = 4 * self.ncols
                     self.ylabel = 'Range [km]'
                 def update(self, dataOut):
+                    if self.channelList == None:
+                        self.channelList = dataOut.channelList
                     data = {}
                     meta = {}
                     spc = 10*numpy.log10(dataOut.data_spc/dataOut.normFactor)
                                 ax.plt_noise.set_data(numpy.repeat(noise, len(y)), y)
                             if self.CODE == 'spc_moments':
                                 ax.plt_mean.set_data(mean, y)
-                        self.titles.append('CH {}: {:3.2f}dB'.format(n, noise))
+                        self.titles.append('CH {}: {:3.2f}dB'.format(self.channelList[n], noise))
             class CrossSpectraPlot(Plot):
                 CODE = 'rti'
                 colormap = 'jet'
                 plot_type = 'pcolorbuffer'
+                titles = None
+                channelList = None
                 def setup(self):
                     self.xaxis = 'time'
                     self.cb_label = 'dB'
                     self.plots_adjust.update({'hspace':0.8, 'left': 0.1, 'bottom': 0.08, 'right':0.95})
                     self.titles = ['{} Channel {}'.format(
-                        self.CODE.upper(), x) for x in range(self.nrows)]
+                        self.CODE.upper(), x) for x in range(self.nplots)]
                 def update(self, dataOut):
+                    if self.channelList == None:
+                        self.channelList = dataOut.channelList
                     data = {}
                     meta = {}
                     data['rti'] = dataOut.getPower()
                     self.y = self.data.yrange
                     self.z = self.data[self.CODE]
                     self.z = numpy.ma.masked_invalid(self.z)
+                    if self.channelList != None:
+                        self.titles = ['{} Channel {}'.format(
+                            self.CODE.upper(), x) for x in self.channelList]
                     if self.decimation is None:
                         x, y, z = self.fill_gaps(self.x, self.y, self.z)

schainpy/model/proc/jroproc_spectra.py +15 -16

                     self.buffer = 0
                     self.buffer2 = 0
                     self.buffer3 = 0
-                    #self.min_hei = None
-                    #self.max_hei = None
                 def setup(self,dataOut,min_hei,max_hei,n, timeInterval,factor_stdv):
                     self.currentTime = self.__initime
                     self.pairsArray = numpy.array(dataOut.pairsList)
                     self.factor_stdv = factor_stdv
+                    print("CHANNELS: ",[x for x in self.channels])
                     if n != None :
                         self.byProfiles = True
                     dataOut.data_dc = self.buffer3
                     dataOut.nIncohInt *= self.nIntProfiles
                     dataOut.utctime = self.currentTime             #tiempo promediado
-                    print("Time: ",time.localtime(dataOut.utctime))
+                    #print("Time: ",time.localtime(dataOut.utctime))
                     # dataOut.data_spc = sat_spectra
                     # dataOut.data_cspc = sat_cspectra
                     self.buffer = 0
                                     if len(noval[0]) > 0: #forma de array (N,) es igual a longitud (N)
                                         novall = ((func2clean - mode) >= (factor_stdv*stdv)).nonzero()
                                         #print(novall)
-                                        #print("   ")
+                                        #print("   ",self.pairsArray[ii])
                                         cross_pairs = self.pairsArray[ii]
                                             #Getting coherent echoes which are removed.
-                                        if len(novall[0]) > 0:
+                                        # if len(novall[0]) > 0:
+                                        #
-                                            val_spc[novall[0],cross_pairs[0],ifreq,ih] = 1
+                                        #     val_spc[novall[0],cross_pairs[0],ifreq,ih] = 1
-                                            val_spc[novall[0],cross_pairs[1],ifreq,ih] = 1
+                                        #     val_spc[novall[0],cross_pairs[1],ifreq,ih] = 1
-                                            val_cspc[novall[0],ii,ifreq,ih] = 1
+                                        #     val_cspc[novall[0],ii,ifreq,ih] = 1
                                             #print("OUT NOVALL 1")
                                             #Removing coherent from ISR data
+                                        chA = self.channels.index(cross_pairs[0])
+                                        chB = self.channels.index(cross_pairs[1])
-                                        #print(spectra[:,ii,ifreq,ih])
                                         new_a = numpy.delete(cspectra[:,ii,ifreq,ih], noval[0])
                                         mean_cspc = numpy.mean(new_a)
-                                        new_b = numpy.delete(spectra[:,cross_pairs[0],ifreq,ih], noval[0])
+                                        new_b = numpy.delete(spectra[:,chA,ifreq,ih], noval[0])
                                         mean_spc0 = numpy.mean(new_b)
-                                        new_c = numpy.delete(spectra[:,cross_pairs[1],ifreq,ih], noval[0])
+                                        new_c = numpy.delete(spectra[:,chB,ifreq,ih], noval[0])
                                         mean_spc1 = numpy.mean(new_c)
-                                        spectra[noval,cross_pairs[0],ifreq,ih] = mean_spc0
+                                        spectra[noval,chA,ifreq,ih] = mean_spc0
-                                        spectra[noval,cross_pairs[1],ifreq,ih] = mean_spc1
+                                        spectra[noval,chB,ifreq,ih] = mean_spc1
                                         cspectra[noval,ii,ifreq,ih] = mean_cspc
                                     '''

schainpy/model/proc/jroproc_voltage.py +1 -1

                         self.dataOut.data_dc = data_dc
                         # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList]
-                        self.dataOut.channelList = range(len(channelIndexList))
+                        self.dataOut.channelList = channelIndexList
                         self.__selectPairsByChannel(channelIndexList)
                     return 1

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages