schain Commit - r1280:3e5818298b5e · Jicamarca Repository

act online

joabAM -

r1280:3e5818298b5e

parent child

Context file:

r1280:3e5818298b5e

Collapse all files

schainpy/model/graphics/jroplot_data.py +43 -43

                     else:
                         x = self.data.xrange[2]
                         self.xlabel = "Velocity (m/s)"
                     self.titles = []
                     y = self.data.heights
                         pair = self.data.pairs[n]
                         ax = self.axes[4 * n]
                         spc0 = 10.*numpy.log10(spc[pair[0]]/self.data.factor)
                         if ax.firsttime:
                             self.xmax = self.xmax if self.xmax else numpy.nanmax(x)
                             self.xmin = self.xmin if self.xmin else -self.xmax
                             self.zmin = self.zmin if self.zmin else numpy.nanmin(spc)
                             self.zmax = self.zmax if self.zmax else numpy.nanmax(spc)
                             ax.plt = ax.pcolormesh(x , y , spc0.T,
                                                    vmin=self.zmin,
                                                    vmax=self.zmax,
                                                    cmap=plt.get_cmap(self.colormap)
+                                                   )
                         else:
                             ax.plt.set_array(spc0.T.ravel())
                         self.titles.append('CH {}: {:3.2f}dB'.format(pair[0], noise))
                                                    vmax=self.zmax,
                                                    cmap=plt.get_cmap(self.colormap)
                                                    )
                         else:
                             ax.plt.set_array(spc1.T.ravel())
                         self.titles.append('CH {}: {:3.2f}dB'.format(pair[1], noise))
                         out = cspc[n] / numpy.sqrt(spc[pair[0]] * spc[pair[1]])
                         coh = numpy.abs(out)
                         phase = numpy.arctan2(out.imag, out.real) * 180 / numpy.pi
                             ax.plt.set_array(coh.T.ravel())
                         self.titles.append(
                             'Coherence Ch{} * Ch{}'.format(pair[0], pair[1]))
                         ax = self.axes[4 * n + 3]
                         if ax.firsttime:
                             ax.plt = ax.pcolormesh(x, y, phase.T,
                                                    vmin=-180,
                                                    vmax=180,
                                                    cmap=plt.get_cmap(self.colormap_phase)
                                                    )
                         else:
                             ax.plt.set_array(phase.T.ravel())
             class NoisePlot(Plot):
                 '''
                 Plot for noise
                 '''
                 CODE = 'noise'
                 '''
                    Plot for Scope
                 '''
                 CODE = 'scope'
                 plot_name = 'Scope'
                 plot_type = 'scatter'
                 def setup(self):
                     self.xaxis = 'Range (Km)'
                     rowspan = 1
                 def plot_iq(self, x, y, channelIndexList, thisDatetime, wintitle):
                     yreal = y[channelIndexList,:].real
                     yimag = y[channelIndexList,:].imag
                     title = wintitle + " Scope: %s" %(thisDatetime.strftime("%d-%b-%Y"))
                     self.xlabel = "Range (Km)"
                     self.ylabel = "Intensity - IQ"
                     self.y = yreal
                     self.x = x
                     self.xmin = min(x)
                     self.xmax = max(x)
-                    self.titles[0] = title
+                    self.titles[0] = title
                     for i,ax in enumerate(self.axes):
                         title = "Channel %d" %(i)
                             #pass
                             ax.plt_r.set_data(x, yreal[i,:])
                             ax.plt_i.set_data(x, yimag[i,:])
                 def plot_power(self, x, y, channelIndexList, thisDatetime, wintitle):
                     y = y[channelIndexList,:] * numpy.conjugate(y[channelIndexList,:])
                     yreal = y.real
                     self.ylabel = "Intensity"
                     self.xmin = min(x)
                     self.xmax = max(x)
                     self.titles[0] = title
                     for i,ax in enumerate(self.axes):
                         title = "Channel %d" %(i)
                         ychannel = yreal[i,:]
                         if ax.firsttime:
                             ax.plt_r = ax.plot(x, ychannel)[0]
                         else:
                             #pass
                             ax.plt_r.set_data(x, ychannel)
                 def plot(self):
                     if self.channels:
                         channels = self.channels
                     else:
                         channels = self.data.channels
                     thisDatetime = datetime.datetime.utcfromtimestamp(self.data.times[-1])
                     scope = self.data['scope']
                     if self.data.flagDataAsBlock:
                         for i in range(self.data.nProfiles):
                             wintitle1 = " [Profile = %d] " %i
                             if self.type == "power":
                                 self.plot_power(self.data.heights,
                                                 scope[:,i,:],
                                                 channels,
                                                 thisDatetime,
                                                 wintitle1
                                                 )
                             if self.type == "iq":
                                 self.plot_iq(self.data.heights,
                                              scope[:,i,:],
                                              channels,
                                              thisDatetime,
                                              wintitle1
                                             )
                     else:
                         wintitle = " [Profile = %d] " %self.data.profileIndex
                         if self.type == "power":
                              self.plot_power(self.data.heights,
                                         scope,
                                         channels,
                                         thisDatetime,
                                         wintitle
                                         )
                         if self.type == "iq":
                             self.plot_iq(self.data.heights,
                                         scope,
                                         channels,
                                         thisDatetime,

schainpy/model/io/jroIO_kamisr.py +3 -2

                     else:
                         #get the last file - 1
                         self.filenameList = [self.filenameList[-2]]
                     new_dirnameList = []
                     for dirname in self.dirnameList:
                         junk = numpy.array([dirname in x for x in self.filenameList])
                         if not(idFile < len(self.filenameList)):
                             self.flagNoMoreFiles = 1
                             print("No more Files")
-                            self.dataOut.error = True
                             return 0
                         filename = self.filenameList[idFile]
                         self.__selectDataForTimes(online=True)
                         filename = self.filenameList[0]
                         wait = 0
+                        #self.__waitForNewFile=5 ## DEBUG:
                         while self.__filename_online == filename:
                             print('waiting %d seconds to get a new file...'%(self.__waitForNewFile))
                             if wait == 5:
+                                self.flagNoMoreFiles = 1
                                 return 0
                             sleep(self.__waitForNewFile)
                             self.__selectDataForTimes(online=True)
                         newFile = self.__setNextFileOnline()
                     if not(newFile):
+                        self.dataOut.error = True
                         return 0
                     #if self.__firstFile:
                     self.readAMISRHeader(self.amisrFilePointer)

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