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 +13 -7

                         'P' : 6,
                         'R' : 7,
                     }
                     data = {}
                     meta = {}
                     if hasattr(dataOut, 'nFFTPoints'):
                         factor = dataOut.normFactor
                     else:
                         factor = 1
-                    if 'S' in self.attr_data[0]:
+                    if hasattr(dataOut, 'dparam'):
-                        tmp = 10*numpy.log10(10.0*getattr(dataOut, 'data_param')[:,0,:]/(factor))
+                        tmp = getattr(dataOut, 'data_param')
                     else:
-                        tmp = getattr(dataOut, 'data_param')[:,vars[self.attr_data[0]],:]
+                        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
                     el = numpy.repeat(data['ele'], data['data'].shape[1])
                     # lla = georef.spherical_to_proj(r, data['azi'], data['ele'], (-75.295893, -12.040436, 3379.2147))
                     latlon = antenna_to_geographic(r, az, el, (-75.295893, -12.040436))
                     if self.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 +22 -11

                     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
-                    self.interval = numpy.min(thisUtcTime[1:] - thisUtcTime[:-1])
+                    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:
-                            setattr(self.dataOut, attr, self.data[attr][:, self.blockIndex])
+                            if self.dparam:
+                                setattr(self.dataOut, attr, self.data[attr])
+                            else:
+                                setattr(self.dataOut, attr, self.data[attr][:, self.blockIndex])
                     self.dataOut.flagNoData = False
                     self.blockIndex += 1
                     tableList = []
                     dsList = []
                     for i in range(len(self.dataList)):
                         dsDict = {}
                         if hasattr(self.dataOut, self.dataList[i]):
                         return False
                 def run(self, dataOut, path, blocksPerFile=10, metadataList=None,
                         dataList=[], setType=None, description={}, mode= None,
                         type_data=None, Reset = False,**kwargs):
                     if Reset:
                     type_data = self.type_data
                     timeTuple = time.localtime(self.dataOut.utctime)
                     if self.setType == 'weather':
                         subfolder = '%4.4d-%2.2d-%2.2dT%2.2d-00-00' % (timeTuple.tm_year,
                                                        timeTuple.tm_mon,
                                                        timeTuple.tm_mday,
                                                        timeTuple.tm_hour,
                                                        )
                     else:
                         subfolder = 'd%4.4d%3.3d' % (timeTuple.tm_year,timeTuple.tm_yday)
                     fullpath = os.path.join(path, subfolder)
                     if os.path.exists(fullpath):
                     return
                 def putData(self):
                     if (self.blockIndex == self.blocksPerFile) or self.timeFlag():
                         self.closeFile()
                         self.setNextFile()
                                 tmp = getattr(self.dataOut, attr)[:,self.weather_vars[self.weather_var],:][ch]
                                 if self.mask:
                                     tmp[mask] = numpy.nan
                                 ds[:] = tmp
                             else:
                                 ds[self.blockIndex] = getattr(self.dataOut, attr)[ch]

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