schain Commit - r1443:ad8b94343301 · Jicamarca Repository

Update PedestalInformation

jespinoza -

r1443:ad8b94343301

parent child

Context file:

r1443:ad8b94343301

schainpy/controller.py +3 -3

                 def addParameter(self, name, value, format=None):
                     '''
                     '''
-                    if os.path.isdir(value):
+                    if format is not None:
-                        self.parameters[name] = value
+                        self.parameters[name] = eval(format)(value)
                     elif isinstance(value, str) and re.search(r'(\d+/\d+/\d+)', value):
                         self.parameters[name] = datetime.date(*[int(x) for x in value.split('/')])
                     elif isinstance(value, str) and re.search(r'(\d+:\d+:\d+)', value):
                     self.datatype = datatype
                     self.err_queue = err_queue
-                    self.addParameter(name='path', value=path)
+                    self.addParameter(name='path', value=path, format='str')
                     self.addParameter(name='startDate', value=startDate)
                     self.addParameter(name='endDate', value=endDate)
                     self.addParameter(name='startTime', value=startTime)

schainpy/model/graphics/jroplot_parameters.py +11 -6

                     self.res_ele = numpy.mean(data['ele'])
                     #################    PLOTEO           ###################
                     for i,ax in enumerate(self.axes):
+                        self.zmin = self.zmin if self.zmin else 20
+                        self.zmax = self.zmax if self.zmax else 80
                         if ax.firsttime:
                             plt.clf()
-                            cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin=20, vmax=80)
+                            cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin=self.zmin, vmax=self.zmax)
                         else:
                             plt.clf()
-                            cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin=20, vmax=80)
+                            cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin=self.zmin, vmax=self.zmax)
                     caax = cgax.parasites[0]
                     paax = cgax.parasites[1]
                     cbar = plt.gcf().colorbar(pm, pad=0.075)
                     caax.set_xlabel('x_range [km]')
                     caax.set_ylabel('y_range [km]')
-                    plt.text(1.0, 1.05, 'Azimuth '+str(thisDatetime)+"  Step   "+str(self.ini)+ " Elev: "+str(round(self.res_ele,2)), transform=caax.transAxes, va='bottom',ha='right')
+                    plt.text(1.0, 1.05, 'Azimuth '+str(thisDatetime)+"  Step   "+str(self.ini)+ " EL: "+str(round(self.res_ele, 1)), transform=caax.transAxes, va='bottom',ha='right')
                     self.ini= self.ini+1
                     self.titles = ['{} Channel {}'.format(self.CODE.upper(), x) for x in range(self.nrows)]
                     print("self.titles",self.titles)
                     self.colorbar=False
-                    self.width   =8
+                    self.width   =12
                     self.height  =8
                     self.ini     =0
                     self.len_azi =0
                     ###print("self.res_ele",self.res_ele)
                     plt.clf()
                     subplots = [121, 122]
+                    cg={'angular_spacing': 20.}
                     if self.ini==0:
                         self.data_ele_tmp = numpy.ones([self.nplots,int(var_ang)])*numpy.nan
                         self.res_weather= numpy.ones([self.nplots,int(var_ang),len(r_mask)])*numpy.nan
                         self.res_azi                   = numpy.mean(data['azi'])
                         if i==0:
                             print("*****************************************************************************to plot**************************",self.res_weather[i].shape)
+                        self.zmin = self.zmin if self.zmin else 20
+                        self.zmax = self.zmax if self.zmax else 80
                         if ax.firsttime:
                             #plt.clf()
-                            cgax, pm = wrl.vis.plot_rhi(self.res_weather[i],r=r,th=self.res_ele,ax=subplots[i], proj='cg',vmin=20, vmax=80)
+                            cgax, pm = wrl.vis.plot_rhi(self.res_weather[i],r=r,th=self.res_ele,ax=subplots[i], proj=cg,vmin=self.zmin, vmax=self.zmax)
                             #fig=self.figures[0]
                         else:
                             #plt.clf()
                             if i==0:
                                 print(self.res_weather[i])
                                 print(self.res_ele)
-                            cgax, pm = wrl.vis.plot_rhi(self.res_weather[i],r=r,th=self.res_ele,ax=subplots[i], proj='cg',vmin=20, vmax=80)
+                            cgax, pm = wrl.vis.plot_rhi(self.res_weather[i],r=r,th=self.res_ele,ax=subplots[i], proj=cg,vmin=self.zmin, vmax=self.zmax)
                         caax = cgax.parasites[0]
                         paax = cgax.parasites[1]
                         cbar = plt.gcf().colorbar(pm, pad=0.075)

schainpy/model/proc/jroproc_parameters.py +24 -14

                         return False, False
                     fileList = glob.glob(os.path.join(path, '*.h5'))
                     fileList.sort()
-                    for fullname in fileList:
+                    print(fileList)
-                        filename = fullname.split('/')[-1]
+                    return fileList
-                        number = int(filename[4:14])
-                        if number <= timestamp:
-                            return number, fullname
-                    return False, False
                 def find_next_file(self):
                     while True:
+                        if self.utctime < self.utcfile:
+                            self.flagNoData = True
+                            break
+                        self.flagNoData = False
                         file_size = len(self.fp['Data']['utc'])
                         if self.utctime < self.utcfile+file_size*self.interval:
                             break
-                        self.utcfile += file_size*self.interval
+                        dt = datetime.datetime.utcfromtimestamp(self.utcfile)
+                        if dt.second > 0:
+                            self.utcfile -= dt.second
+                        self.utcfile += self.samples*self.interval
                         dt = datetime.datetime.utcfromtimestamp(self.utctime)
                         path = os.path.join(self.path, dt.strftime('%Y-%m-%dT%H-00-00'))
-                        self.filename = os.path.join(path, 'pos@{}.000.h5'.format(self.utcfile))
+                        self.filename = os.path.join(path, 'pos@{}.000.h5'.format(int(self.utcfile)))
+                        print('ACQ time: ', self.utctime, 'POS time: ', self.utcfile)
+                        print('Next file: ', self.filename)
                         if not os.path.exists(self.filename):
                             log.warning('Waiting for position files...', self.name)
                 def get_values(self):
-                    index = int((self.utctime-self.utcfile)/self.interval)
+                    if self.flagNoData:
-                    return self.fp['Data']['azi_pos'][index], self.fp['Data']['ele_pos'][index]
+                        return numpy.nan, numpy.nan
+                    else:
+                        index = int((self.utctime-self.utcfile)/self.interval)
+                        return self.fp['Data']['azi_pos'][index], self.fp['Data']['ele_pos'][index]
                 def setup(self, dataOut, path, conf, samples, interval, wr_exp):
                     self.conf = conf
                     self.samples = samples
                     self.interval = interval
-                    self.utcfile, self.filename = self.find_file(dataOut.utctime)
+                    filelist = self.find_file(dataOut.utctime)
-                    if not self.filename:
+                    if not filelist:
                         log.error('No position files found in {}'.format(path), self.name)
                         raise IOError('No position files found in {}'.format(path))
                     else:
+                        self.filename = filelist[0]
+                        self.utcfile = int(self.filename.split('/')[-1][4:14])
                         log.log('Opening file: {}'.format(self.filename), self.name)
                         self.fp = h5py.File(self.filename, 'r')
-                def run(self, dataOut, path, conf=None, samples=1500, interval=0.04, wr_exp=None):
+                def run(self, dataOut, path, conf=None, samples=1500, interval=0.04, wr_exp=None, offset=0):
                     if not self.isConfig:
                         self.setup(dataOut, path, conf, samples, interval, wr_exp)
                         self.isConfig   = True
-                    self.utctime = dataOut.utctime
+                    self.utctime = dataOut.utctime + offset
                     self.find_next_file()

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