From e4f5cab494681104c094d123e2287f7c85b18603 2017-10-18 14:27:13 From: José Chávez Date: 2017-10-18 14:27:13 Subject: [PATCH] formatting --- diff --git a/schainpy/model/io/bltrIO_param.py b/schainpy/model/io/bltrIO_param.py index 3c834d0..5c95782 100644 --- a/schainpy/model/io/bltrIO_param.py +++ b/schainpy/model/io/bltrIO_param.py @@ -82,6 +82,7 @@ DATA_STRUCTURE = numpy.dtype([ ('sea_algorithm', ' dateFile) or (endDate < dateFile): continue - + self.fileList.append(thisFile) self.dateFileList.append(dateFile) @@ -181,22 +182,23 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): if file_id == len(self.fileList): print '\nNo more files in the folder' - print 'Total number of file(s) read : {}'.format(self.fileIndex + 1) + 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] filename = os.path.join(self.path, self.fileList[file_id]) dirname, name = os.path.split(filename) - self.siteFile = name.split('.')[0] # 'peru2' ---> Piura - 'peru1' ---> Huancayo or Porcuya + # 'peru2' ---> Piura - 'peru1' ---> Huancayo or Porcuya + self.siteFile = name.split('.')[0] if self.filename is not None: self.fp.close() self.filename = filename self.fp = open(self.filename, 'rb') self.header_file = numpy.fromfile(self.fp, FILE_HEADER_STRUCTURE, 1) self.nrecords = self.header_file['nrec'][0] - self.sizeOfFile = os.path.getsize(self.filename) + self.sizeOfFile = os.path.getsize(self.filename) self.counter_records = 0 self.flagIsNewFile = 0 self.fileIndex += 1 @@ -205,23 +207,23 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): def readNextBlock(self): - while True: + while True: if self.counter_records == self.nrecords: self.flagIsNewFile = 1 if not self.setNextFile(): return 0 - + self.readBlock() - + if (self.datatime.time() < self.startTime) or (self.datatime.time() > self.endTime): - print "[Reading] Record No. %d/%d -> %s [Skipping]" %( + print "[Reading] Record No. %d/%d -> %s [Skipping]" % ( self.counter_records, self.nrecords, self.datatime.ctime()) continue break - print "[Reading] Record No. %d/%d -> %s" %( + print "[Reading] Record No. %d/%d -> %s" % ( self.counter_records, self.nrecords, self.datatime.ctime()) @@ -232,7 +234,7 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): pointer = self.fp.tell() header_rec = numpy.fromfile(self.fp, REC_HEADER_STRUCTURE, 1) - self.nchannels = header_rec['nchan'][0]/2 + self.nchannels = header_rec['nchan'][0] / 2 self.kchan = header_rec['nrxs'][0] self.nmodes = header_rec['nmodes'][0] self.nranges = header_rec['nranges'][0] @@ -242,7 +244,7 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): self.buffer = numpy.empty((self.nmodes, 3, self.nranges)) for mode in range(self.nmodes): - self.readHeader() + self.readHeader() data = self.readData() self.height[mode] = (data[0] - self.correction) / 1000. self.buffer[mode] = data[1] @@ -256,7 +258,7 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): ''' RecordHeader of BLTR rawdata file ''' - + header_structure = numpy.dtype( REC_HEADER_STRUCTURE.descr + [ ('antenna_coord', 'f4', (2, self.nchannels)), @@ -270,9 +272,9 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): self.lon = self.header_rec['lon'][0] self.delta = self.header_rec['delta_r'][0] self.correction = self.header_rec['dmode_rngcorr'][0] - self.imode = self.header_rec['dmode_index'][0] + self.imode = self.header_rec['dmode_index'][0] self.antenna = self.header_rec['antenna_coord'] - self.rx_gains = self.header_rec['rx_gains'] + self.rx_gains = self.header_rec['rx_gains'] self.time = self.header_rec['time'][0] tseconds = self.header_rec['time'][0] local_t1 = time.localtime(tseconds) @@ -281,7 +283,7 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): 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): ''' Reading and filtering data block record of BLTR rawdata file, filtering is according to status_value. @@ -304,22 +306,23 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): data = numpy.fromfile(self.fp, data_structure, self.nranges) height = data['range'] - winds = numpy.array((data['zonal'], data['meridional'], data['vertical'])) + winds = numpy.array( + (data['zonal'], data['meridional'], data['vertical'])) snr = data['rx_snr'].T - winds[numpy.where(winds == -9999.)] = numpy.nan + winds[numpy.where(winds == -9999.)] = numpy.nan winds[:, numpy.where(data['status'] != self.status_value)] = numpy.nan snr[numpy.where(snr == -9999.)] = numpy.nan snr[:, numpy.where(data['status'] != self.status_value)] = numpy.nan - snr = numpy.power(10, snr / 10) - + snr = numpy.power(10, snr / 10) + return height, winds, snr def set_output(self): ''' Storing data from databuffer to dataOut object ''' - + self.dataOut.data_SNR = self.snr self.dataOut.height = self.height self.dataOut.data_output = self.buffer @@ -329,7 +332,7 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): self.dataOut.paramInterval = 157 self.dataOut.timezone = self.timezone self.dataOut.site = self.siteFile - self.dataOut.nrecords = self.nrecords/self.nmodes + self.dataOut.nrecords = self.nrecords / self.nmodes self.dataOut.sizeOfFile = self.sizeOfFile self.dataOut.lat = self.lat self.dataOut.lon = self.lon @@ -353,7 +356,7 @@ class BLTRParamReader(JRODataReader, ProcessingUnit): print 'No file left to process' return 0 - if not self.readNextBlock(): + if not self.readNextBlock(): self.dataOut.flagNoData = True return 0