schain-jc Commit - r1085:0d7a50b6a171

Fix utc times and bugs in BLTR modules

Juan C. Espinoza -

r1085:0d7a50b6a171

parent child

Context file:

r1085:0d7a50b6a171

Collapse all files

schainpy/model/io/bltrIO_param.py +23 -19

             from schainpy.model.proc.jroproc_base import ProcessingUnit
             from schainpy.model.data.jrodata import Parameters
             from schainpy.model.io.jroIO_base import JRODataReader, isNumber
+            from schainpy.utils import log
             FILE_HEADER_STRUCTURE = numpy.dtype([
                 ('FMN', '<u4'),
                           **kwargs):
                     self.path = path
+                    self.startDate = startDate
+                    self.endDate = endDate
                     self.startTime = startTime
                     self.endTime = endTime
                     self.status_value = status_value
+                    self.datatime = datetime.datetime(1900,1,1)
                     if self.path is None:
                         raise ValueError, "The path is not valid"
                     '''
-                    print 'Searching file in %s ' % (path)
+                    log.success('Searching files in {} '.format(path), 'BLTRParamReader')
                     foldercounter = 0
                     fileList0 = glob.glob1(path, "*%s" % ext)
                     fileList0.sort()
                     file_id = self.fileIndex
                     if file_id == len(self.fileList):
-                        print '\nNo more files in the folder'
+                        log.success('No more files in the folder', 'BLTRParamReader')
-                        print 'Total number of file(s) read : {}'.format(self.fileIndex + 1)
                         self.flagNoMoreFiles = 1
                         return 0
-                    print '\n[Setting file] (%s) ...' % self.fileList[file_id]
+                    log.success('Opening {}'.format(self.fileList[file_id]), 'BLTRParamReader')
                     filename = os.path.join(self.path, self.fileList[file_id])
                     dirname, name = os.path.split(filename)
                         self.readBlock()
-                        if (self.datatime.time() < self.startTime) or (self.datatime.time() > self.endTime):
+                        if (self.datatime < datetime.datetime.combine(self.startDate, self.startTime)) or \
-                            print "[Reading] Record No. %d/%d -> %s [Skipping]" %(
+                           (self.datatime > datetime.datetime.combine(self.endDate, self.endTime)):
+                            log.warning(
+                                'Reading Record No. {}/{} -> {} [Skipping]'.format(
                                     self.counter_records,
                                     self.nrecords,
-                                self.datatime.ctime())
+                                    self.datatime.ctime()),
+                                'BLTRParamReader')
                             continue
                         break
-                    print "[Reading] Record No. %d/%d -> %s" %(
+                    log.log('Reading Record No. {}/{} -> {}'.format(
                         self.counter_records,
                         self.nrecords,
-                        self.datatime.ctime())
+                        self.datatime.ctime()), 'BLTRParamReader')
                     return 1
                     self.height = numpy.empty((self.nmodes, self.nranges))
                     self.snr = numpy.empty((self.nmodes, self.nchannels, self.nranges))
                     self.buffer = numpy.empty((self.nmodes, 3, self.nranges))
+                    self.flagDiscontinuousBlock = 0
                     for mode in range(self.nmodes):
                         self.readHeader()
                     self.antenna = self.header_rec['antenna_coord']
                     self.rx_gains = self.header_rec['rx_gains']
                     self.time = self.header_rec['time'][0]
-                    tseconds = self.header_rec['time'][0]
+                    dt = datetime.datetime.utcfromtimestamp(self.time)
-                    local_t1 = time.localtime(tseconds)
+                    if dt.date()>self.datatime.date():
-                    self.year = local_t1.tm_year
+                        self.flagDiscontinuousBlock = 1
-                    self.month = local_t1.tm_mon
+                    self.datatime = dt
-                    self.day = local_t1.tm_mday
-                    self.t = datetime.datetime(self.year, self.month, self.day)
-                    self.datatime = datetime.datetime.utcfromtimestamp(self.time)
                 def readData(self):
                     '''
                     self.dataOut.data_SNR = self.snr
                     self.dataOut.height = self.height
-                    self.dataOut.data_output = self.buffer
+                    self.dataOut.data = self.buffer
                     self.dataOut.utctimeInit = self.time
                     self.dataOut.utctime = self.dataOut.utctimeInit
                     self.dataOut.useLocalTime = False
                     self.dataOut.lon = self.lon
                     self.dataOut.channelList = range(self.nchannels)
                     self.dataOut.kchan = self.kchan
-                    # self.dataOut.nHeights = self.nranges
                     self.dataOut.delta = self.delta
                     self.dataOut.correction = self.correction
                     self.dataOut.nmodes = self.nmodes
                     self.dataOut.antenna = self.antenna
                     self.dataOut.rx_gains = self.rx_gains
                     self.dataOut.flagNoData = False
+                    self.dataOut.flagDiscontinuousBlock = self.flagDiscontinuousBlock
                 def getData(self):
                     '''
                     '''
                     if self.flagNoMoreFiles:
                         self.dataOut.flagNoData = True
-                        print 'No file left to process'
+                        log.success('No file left to process', 'BLTRParamReader')
                         return 0
                     if not  self.readNextBlock():

schainpy/model/proc/bltrproc_parameters.py +2 -2

                     if self.dataIn.type == 'Parameters':
                         self.dataOut.copy(self.dataIn)
-                    self.dataOut.data_output = self.dataOut.data_output[mode]
+                    self.dataOut.data_param = self.dataOut.data[mode]
                     self.dataOut.heightList = self.dataOut.height[0]
                     self.dataOut.data_SNR = self.dataOut.data_SNR[mode]
                         SNRavg = numpy.average(self.dataOut.data_SNR, axis=0)
                         SNRavgdB = 10*numpy.log10(SNRavg)
                         for i in range(3):
-                            self.dataOut.data_output[i][SNRavgdB <= snr_threshold] = numpy.nan
+                            self.dataOut.data_param[i][SNRavgdB <= snr_threshold] = numpy.nan
             # TODO
             class OutliersFilter(Operation):

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