schain-jc Commit - r1206:59caf7a2130e

Writing Unit for Madrigal decorated (just for python 2x)

George Yong -

r1206:59caf7a2130e

parent child

Context file:

r1206:59caf7a2130e

Collapse all files

schainpy/model/io/jroIO_madrigal.py +24 -21

             import numpy
             import h5py
+            from schainpy.model.io.jroIO_base import LOCALTIME, JRODataReader, JRODataWriter
-            from schainpy.model.io.jroIO_base import JRODataReader
             from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation, MPDecorator
             from schainpy.model.data.jrodata import Parameters
             from schainpy.utils import log
             DEF_CATALOG = {
                 'principleInvestigator': 'Marco Milla',
-                'expPurpose': None,
+                'expPurpose': '',
-                'cycleTime': None,
+                'cycleTime': '',
-                'correlativeExp': None,
+                'correlativeExp': '',
-                'sciRemarks': None,
+                'sciRemarks': '',
-                'instRemarks': None
+                'instRemarks': ''
                 }
             DEF_HEADER = {
-                'kindatDesc': None,
+                'kindatDesc': '',
                 'analyst': 'Jicamarca User',
-                'comments': None,
+                'comments': '',
-                'history': None
+                'history': ''
                 }
             MNEMONICS = {
 : 'jro',
 : 'jbr',
 : 'pbr',
 : 'hbr',
 : 'obr',
+: 'clr'
             }
             UT1970 = datetime.datetime(1970, 1, 1) - datetime.timedelta(seconds=time.timezone)
                     iterable = obj
                 if isinstance(iterable, dict):
-                    return {str(k): load_json(v) if isinstance(v, dict) else str(v) if isinstance(v, str) else v
+                    return {str(k): load_json(v) if isinstance(v, dict) else str(v) if isinstance(v, (str,unicode)) else v
                         for k, v in list(iterable.items())}
                 elif isinstance(iterable, (list, tuple)):
                     return [str(v) if isinstance(v, str) else v for v in iterable]
                         self.parameters = one + two
                         self.parameters_d = one_d + two_d
-                    log.success('Parameters found: {}'.format(','.join(str(self.parameters))),
+                    log.success('Parameters found: {}'.format(self.parameters),
                                 'MADReader')
                     if s_parameters:
                         log.success('Spatial parameters: {}'.format(','.join(str(s_parameters))),
                         x = self.parameters.index(param.lower())
                         setattr(self.dataOut, attr, self.buffer[0][x])
                     for param, value in list(self.twoDDict.items()):
                         x = self.parameters.index(param.lower())
                         if self.ext == '.txt':
                             y = self.parameters.index(self.ind2DList[0].lower())
                             ranges = self.buffer[:,y]
-                            if self.ranges.size == ranges.size:
+                            #if self.ranges.size == ranges.size:
-                                continue
+                            #    continue
                             index = numpy.where(numpy.in1d(self.ranges, ranges))[0]
                             dummy = numpy.zeros(self.ranges.shape) + numpy.nan
                             dummy[index] = self.buffer[:,x]
                         else:
                             dummy = self.buffer[x]
                         if isinstance(value, str):
                             if value not in self.ind2DList:
                                 setattr(self.dataOut, value, dummy.reshape(1,-1))
                     return 1
+            @MPDecorator
             class MADWriter(Operation):
                 missing = -32767
-                def __init__(self, **kwargs):
+                def __init__(self):
-                    Operation.__init__(self, **kwargs)
+                    Operation.__init__(self)
                     self.dataOut = Parameters()
                     self.counter = 0
                     self.path = None
                     self.dataOut = dataOut
                     self.putData()
-                    return
+                    return 1
                 def setup(self, path, oneDDict, ind2DList, twoDDict, metadata, format, **kwargs):
                     '''
                     self.fp.append(rec)
                     if self.ext == '.hdf5' and self.counter % 500 == 0 and self.counter > 0:
                         self.fp.dump()
-                    if self.counter % 100 == 0 and self.counter > 0:
+                    if self.counter % 20 == 0 and self.counter > 0:
                         log.log(
                             'Writing {} records'.format(
                                 self.counter),

schainpy/model/proc/jroproc_base.py +11 -5

                             if self.dataIn.error:
                                 self.dataOut.error = self.dataIn.error
                                 self.dataOut.flagNoData = True
                             for op, optype, opId, kwargs in self.operations:
                                 if optype == 'self' and not self.dataOut.flagNoData:
                                     op(**kwargs)
                                 elif optype == 'other' and not self.dataOut.flagNoData:
                                     self.dataOut = op.run(self.dataOut, **kwargs)
                                 elif optype == 'external' and not self.dataOut.flagNoData:
-                                    if not self.dataOut.flagNoData or self.dataOut.error:
+                                    self.publish(self.dataOut, opId)
-                                        self.publish(self.dataOut, opId)
                             if not self.dataOut.flagNoData or self.dataOut.error:
                                 self.publish(self.dataOut, self.id)
+                                for op, optype, opId, kwargs in self.operations:
+                                    if optype == 'self' and self.dataOut.error:
+                                        op(**kwargs)
+                                    elif optype == 'other' and self.dataOut.error:
+                                        self.dataOut = op.run(self.dataOut, **kwargs)
+                                    elif optype == 'external' and self.dataOut.error:
+                                        self.publish(self.dataOut, opId)
                             if self.dataIn.error:
                                 break

schainpy/model/proc/jroproc_parameters.py +3 -2

                     self.dataOut.heightList = self.dataIn.getHeiRange()
                     self.dataOut.frequency = self.dataIn.frequency
                     # self.dataOut.noise = self.dataIn.noise
+                    self.dataOut.error = self.dataIn.error
                 def run(self):
                         # self.dataOut.normFactor = self.dataIn.normFactor
                         self.dataOut.pairsList = self.dataIn.pairsList
                         self.dataOut.groupList = self.dataIn.pairsList
                         self.dataOut.flagNoData = False
                         if hasattr(self.dataIn, 'ChanDist'): #Distances of receiver channels
                             self.dataOut.ChanDist = self.dataIn.ChanDist
                     dataOut.data_param[0]=dBZ
                     dataOut.data_param[1]=V_mean
                     dataOut.data_param[2]=RR
                     return dataOut
                 def dBZeMODE2(self, dataOut): #    Processing for MIRA35C

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