schain Commit - r1466:b9d6d6168dce · Jicamarca Repository

Change save format for sophy parameters & fix position files online reading

jespinoza -

r1466:b9d6d6168dce

parent child

Context file:

r1466:b9d6d6168dce

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

                         elif self.var.lower() == 'velRadial_V'.lower():
                             wr_type = 'V'
                         elif self.var.lower() == 'Sigmav_W'.lower():
-                            wr_type = 'S'
+                            wr_type = 'W'
                         elif self.var.lower() == 'dataPP_POWER'.lower():
-                            wr_type = 'Pow'
+                            wr_type = 'S'
                         elif self.var.lower() == 'dataPP_DOP'.lower():
-                            wr_type = 'Dop'
+                            wr_type = 'V'
-                        #Z_SOPHy_El10.0_20200505_14:02:15.h5
+                        #SOPHY_20200505_140215_E10.0_Z.h5
-                        #Z_SOPHy_Az40.0_20200505_14:02:15.h5
+                        #SOPHY_20200505_140215_A40.0_Z.h5
                         if self.dataOut.flagMode == 1: #'AZI' #PPI
-                            ang_type = 'El'
+                            ang_type = 'E'
                             len_aux = int(self.dataOut.data_ele.shape[0]/4)
                             mean = numpy.mean(self.dataOut.data_ele[len_aux:-len_aux])
                             ang_    = round(mean,1)
                         elif self.dataOut.flagMode == 0: #'ELE' #RHI
-                            ang_type = 'Az'
+                            ang_type = 'A'
                             len_aux = int(self.dataOut.data_azi.shape[0]/4)
                             mean = numpy.mean(self.dataOut.data_azi[len_aux:-len_aux])
                             ang_    = round(mean,1)
-                        file = '%s%s%s%2.1f%s%2.2d%2.2d%2.2d%s%2.2d%2.2d%2.2d%s' % (wr_type,
+                        file = '%s_%2.2d%2.2d%2.2d_%2.2d%2.2d%2.2d_%s%2.1f_%s%s' % (
-                                                       '_SOPHy_',
+                            'SOPHY',
-                                                       ang_type,
-                                                       ang_,
-                                                       '_',
                                                        timeTuple.tm_year,
                                                        timeTuple.tm_mon,
                                                        timeTuple.tm_mday,
-                                                       '_',
                                                        timeTuple.tm_hour,
                                                        timeTuple.tm_min,
                                                        timeTuple.tm_sec,
+                                                       ang_type,
+                                                       ang_,
+                                                       wr_type,
                                                        ext )
                     else:

schainpy/model/proc/jroproc_parameters.py +31 -21

                 def __init__(self):
                     Operation.__init__(self)
                     self.filename = False
-                    self.delay = 30
+                    self.delay = 32
                     self.nTries = 3
                 def find_file(self, timestamp):
                     path = os.path.join(self.path, dt.strftime('%Y-%m-%dT%H-00-00'))
                     if not os.path.exists(path):
-                        return False, False
+                        return False
                     fileList = glob.glob(os.path.join(path, '*.h5'))
                     fileList.sort()
                     return fileList
                         if dt.second > 0:
                             self.utcfile -= dt.second
                         self.utcfile += self.samples*self.interval
-                        dt = datetime.datetime.utcfromtimestamp(self.utctime)
+                        dt = datetime.datetime.utcfromtimestamp(self.utcfile)
                         path = os.path.join(self.path, dt.strftime('%Y-%m-%dT%H-00-00'))
                         self.filename = os.path.join(path, 'pos@{}.000.h5'.format(int(self.utcfile)))
-                        for n in range(self.nTries):
+                        for i in range(2):
                             ok = False
-                            try:
+                            for j in range(self.nTries):
-                                if not os.path.exists(self.filename):
+                                ok = False
-                                    log.warning('Waiting {}s for position files...'.format(self.delay), self.name)
+                                try:
+                                    if not os.path.exists(self.filename):
+                                        log.warning('Waiting {}s for position files...'.format(self.delay), self.name)
+                                        time.sleep(self.delay)
+                                        continue
+                                    self.fp.close()
+                                    self.fp = h5py.File(self.filename, 'r')
+                                    log.log('Opening file: {}'.format(self.filename), self.name)
+                                    ok = True
+                                    break
+                                except Exception as e:
+                                    print(e)
+                                    log.warning('Waiting {}s for position file to be ready...'.format(self.delay), self.name)
                                     time.sleep(self.delay)
                                     continue
-                                self.fp.close()
+                            if ok:
-                                self.fp = h5py.File(self.filename, 'r')
-                                log.log('Opening file: {}'.format(self.filename), self.name)
-                                ok = True
                                 break
-                            except:
+                            log.warning('Trying next file...', self.name)
-                                log.warning('Waiting {}s for position file to be ready...'.format(self.delay), self.name)
+                            self.utcfile += self.samples*self.interval
-                                time.sleep(self.delay)
+                            dt = datetime.datetime.utcfromtimestamp(self.utcfime)
-                                continue
+                            path = os.path.join(self.path, dt.strftime('%Y-%m-%dT%H-00-00'))
+                            self.filename = os.path.join(path, 'pos@{}.000.h5'.format(int(self.utcfile)))
                         if not ok:
                             log.error('No new position files found in {}'.format(path))
                             raise IOError('No new position files found in {}'.format(path))
                 def find_mode(self,index):
                     sample_max = 20
                     start = index
                     else:
                         index = int((self.utctime-self.utcfile)/self.interval)
-                        if self.flagAskMode:
+                        #if self.flagAskMode:
-                            mode = self.find_mode(index)
+                        #    mode = self.find_mode(index)
-                        else:
+                        #else:
-                            mode = self.mode
+                        #    mode = self.mode
+                        mode = 'PPI'
                         if mode is not None:
                             return self.fp['Data']['azi_pos'][index], self.fp['Data']['ele_pos'][index], mode
                         else:

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