schain-jc Commit - r1185:3cc57dcc4bfb

Multiprocessing for BLTR (all operations) working

George Yong -

r1185:3cc57dcc4bfb

parent child

Context file:

r1185:3cc57dcc4bfb

Collapse all files

schainpy/model/io/bltrIO_param.py +11 -9

             import numpy
-            from schainpy.model.proc.jroproc_base import ProcessingUnit
+            from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation, MPDecorator
             from schainpy.model.data.jrodata import Parameters
             from schainpy.model.io.jroIO_base import JRODataReader, isNumber
             from schainpy.utils import log
                 ('sea_algorithm', '<u4')
             ])
+            @MPDecorator
             class BLTRParamReader(JRODataReader, ProcessingUnit):
                 '''
                 Boundary Layer and Tropospheric Radar (BLTR) reader, Wind velocities and SNR from *.sswma files
                 ext = '.sswma'
-                def __init__(self, **kwargs):
+                def __init__(self):
-                    ProcessingUnit.__init__(self, **kwargs)
+                    ProcessingUnit.__init__(self)
                     self.dataOut = Parameters()
                     self.counter_records = 0
                     self.nranges = header_rec['nranges'][0]
                     self.fp.seek(pointer)
                     self.height = numpy.empty((self.nmodes, self.nranges))
-                    self.snr = numpy.empty((self.nmodes, self.nchannels, self.nranges))
+                    self.snr = numpy.empty((self.nmodes, int(self.nchannels), self.nranges))
                     self.buffer = numpy.empty((self.nmodes, 3, self.nranges))
                     self.flagDiscontinuousBlock = 0
                     header_structure = numpy.dtype(
                         REC_HEADER_STRUCTURE.descr + [
-                            ('antenna_coord', 'f4', (2, self.nchannels)),
+                            ('antenna_coord', 'f4', (2, int(self.nchannels))),
-                            ('rx_gains', 'u4', (self.nchannels,)),
+                            ('rx_gains', 'u4', (int(self.nchannels),)),
-                            ('rx_analysis', 'u4', (self.nchannels,))
+                            ('rx_analysis', 'u4', (int(self.nchannels),))
                         ]
                     )
                         status_value - Array data is set to NAN for values that are not equal to status_value
                     '''
+                    self.nchannels = int(self.nchannels)
                     data_structure = numpy.dtype(
                         DATA_STRUCTURE.descr + [
                     self.set_output()
-                    return 1
  No newline at end of file
+                    return 1
+  No newline at end of file

schainpy/model/proc/bltrproc_parameters.py +10 -6

             from numpy import transpose
-            from .jroproc_base import ProcessingUnit, Operation
+            from .jroproc_base import ProcessingUnit, MPDecorator, Operation
             from schainpy.model.data.jrodata import Parameters
+            @MPDecorator
+            class BLTRParametersProc(ProcessingUnit):
-            class BLTRParametersProc(ProcessingUnit):
+                METHODS = {}
                 '''
                 Processing unit for BLTR parameters data (winds)
                     self.dataOut.year - Experiment year
                 '''
-                def __init__(self, **kwargs):
+                def __init__(self):
                     '''
                     Inputs: None
                     '''
-                    ProcessingUnit.__init__(self, **kwargs)
+                    ProcessingUnit.__init__(self)
+                    self.setupReq = False
                     self.dataOut = Parameters()
                     self.isConfig = False
                             self.dataOut.data_param[i][SNRavgdB <= snr_threshold] = numpy.nan
             # TODO
+            @MPDecorator
             class OutliersFilter(Operation):
-                def __init__(self, **kwargs):
+                def __init__(self):
                     '''
                     '''
-                    Operation.__init__(self, **kwargs)
+                    Operation.__init__(self)
                 def run(self, svalue2, method, factor, filter, npoints=9):
                     '''

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