schain Commit - r1534:41e830abc3ce · Jicamarca Repository

update jroIO_base.py se adiciona filter, jroIO_param se adicion atributo dparam para identificar data procesada, leer una sola marca de tiempo y en jroplot_parameters se utiliza como flag el dparam para identificar la data procesada y plotearla

avaldezp -

r1534:41e830abc3ce

parent child

Context file:

r1534:41e830abc3ce

Collapse all files

schainpy/model/graphics/jroplot_parameters.py +7 -1

                     else:
                         factor = 1
+                    if hasattr(dataOut, 'dparam'):
+                        tmp = getattr(dataOut, 'data_param')
+                    else:
                         if 'S' in self.attr_data[0]:
                             tmp = 10*numpy.log10(10.0*getattr(dataOut, 'data_param')[:,0,:]/(factor))
                         else:
                             tmp = getattr(dataOut, 'data_param')[:,vars[self.attr_data[0]],:]
                     if self.mask:
                         mask = dataOut.data_param[:,3,:] < self.mask
                         tmp = numpy.ma.masked_array(tmp, mask=mask)
                     self.zmax = self.zmax if self.zmax else numpy.nanmax(z)
                     self.zmin = self.zmin if self.zmin is not None else numpy.nanmin(z)
+                    if isinstance(data['mode_op'], bytes):
+                        data['mode_op'] = data['mode_op'].decode()
                     if data['mode_op'] == 'RHI':
                         try:
                             if self.data['mode_op'][-2] == 'PPI':

schainpy/model/io/jroIO_base.py +8 -6

                 folderfmt = None
                 open_file = open
                 open_mode = 'rb'
+                filter =None
                 def run(self):
                     return
                 def find_files(self, folders, ext, filefmt, startDate=None, endDate=None,
-                               expLabel='', last=False):
+                               expLabel='', filter=None,last=False):
                     for path in folders:
                         files = glob.glob1(path, '*{}'.format(ext))
                         files.sort()
+                        if filter is not None:
+                            files= [ file for file in files if  os.path.splitext(file)[0][-len(filter):] == filter]
                         if last:
                             if files:
                                 fo = files[-1]
                 def searchFilesOffLine(self, path, startDate, endDate,
                                        expLabel, ext, walk,
-                                       filefmt, folderfmt):
+                                       filefmt, folderfmt,filter):
                     """Search files in offline mode for the given arguments
                     Return:
                         folders = path.split(',')
                     return self.find_files(
-                        folders, ext, filefmt, startDate, endDate, expLabel)
+                        folders, ext, filefmt, startDate, endDate, expLabel,filter)
                 def searchFilesOnLine(self, path, startDate, endDate,
                                       expLabel, ext, walk,
-                                      filefmt, folderfmt):
+                                      filefmt, folderfmt,filter):
                     """Search for the last file of the last folder
                     Arguments:
                     else:
                         folders = path.split(',')
-                    return self.find_files(
+                    return self.find_files(folders, ext, filefmt, startDate, endDate, expLabel, filter,last=True)
-                        folders, ext, filefmt, startDate, endDate, expLabel, last=True)
                 def setNextFile(self):
                     """Set the next file to be readed open it and parse de file header"""

schainpy/model/io/jroIO_param.py +13 -2

                     self.filefmt = "*%Y%j***"
                     self.folderfmt = "*%Y%j"
                     self.utcoffset = 0
+                    self.filter  = None
+                    self.dparam  = None
                 def setup(self, **kwargs):
                         for nTries in range(self.nTries):
                             fullpath = self.searchFilesOnLine(self.path, self.startDate,
                                 self.endDate, self.expLabel, self.ext, self.walk,
-                                self.filefmt, self.folderfmt)
+                                self.filefmt, self.folderfmt,self.filter)
                             try:
                                 fullpath = next(fullpath)
                             except:
                     else:
                         log.log("Searching files in {}".format(self.path), self.name)
                         self.filenameList = self.searchFilesOffLine(self.path, self.startDate,
-                            self.endDate, self.expLabel, self.ext, self.walk, self.filefmt, self.folderfmt)
+                            self.endDate, self.expLabel, self.ext, self.walk, self.filefmt, self.folderfmt,self.filter)
                     self.setNextFile()
                     if 'type' in self.meta:
                         self.dataOut = eval(self.meta['type'])()
+                    if self.dparam:
+                        setattr(self.dataOut, "dparam", 1)
                     for attr in self.meta:
                         setattr(self.dataOut, attr, self.meta[attr])
                     startTime = self.startTime
                     endTime = self.endTime
                     thisUtcTime = self.data['utctime'] + self.utcoffset
+                    try:
                         self.interval = numpy.min(thisUtcTime[1:] - thisUtcTime[:-1])
+                    except:
+                        self.interval = 0
                     thisDatetime = datetime.datetime.utcfromtimestamp(thisUtcTime[0])
                     thisDate = thisDatetime.date()
                         if self.data[attr].ndim == 1:
                             setattr(self.dataOut, attr, self.data[attr][self.blockIndex])
                         else:
+                            if self.dparam:
+                                setattr(self.dataOut, attr, self.data[attr])
+                            else:
                                 setattr(self.dataOut, attr, self.data[attr][:, self.blockIndex])
                     self.dataOut.flagNoData = False

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