schain-jc Commit - r1173:0148df60175f

Multiprocessing for voltage (all operations) working

George Yong -

r1173:0148df60175f

parent child

Context file:

r1173:0148df60175f

Collapse all files

schainpy/controller.py +1 0

              from schainpy.model.proc.jroproc_base import *
              from schainpy.model.proc.bltrproc_parameters import *
              from schainpy.model.proc.jroproc_spectra import *
+             from schainpy.model.proc.jroproc_voltage import *
              from schainpy.model.proc.jroproc_parameters import *
              from schainpy.model.utils.jroutils_publish import *
              from schainpy.utils import log

schainpy/model/graphics/jroplot_voltage.py +11 -4

              import os
              import datetime
              import numpy
+             from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation, MPDecorator  #YONG
+             from schainpy.utils import log
              from .figure import Figure
+             @MPDecorator
              class Scope(Figure):
                  isConfig = None
-                 def __init__(self, **kwargs):
-                     Figure.__init__(self, **kwargs)
+                 def __init__(self):#, **kwargs):          #YONG
+                     Figure.__init__(self)#, **kwargs)
                      self.isConfig = False
                      self.WIDTH = 300
                      self.HEIGHT = 200
                          ymin            :    None,
                          ymax            :    None,
                      """
+                     if dataOut.flagNoData:
+                         return dataOut
                      if channelList == None:
                          channelIndexList = dataOut.channelIndexList
                                save=save,
                                ftp=ftp,
                                wr_period=wr_period,
-                               thisDatetime=thisDatetime)
  No newline at end of file
+                               thisDatetime=thisDatetime)
+                     return dataOut                
  No newline at end of file

schainpy/model/io/jroIO_voltage.py +6 -5

              import numpy
              from .jroIO_base import LOCALTIME, JRODataReader, JRODataWriter
-             from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation
+             from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation, MPDecorator
              from schainpy.model.data.jroheaderIO import PROCFLAG, BasicHeader, SystemHeader, RadarControllerHeader, ProcessingHeader
              from schainpy.model.data.jrodata import Voltage
              import zmq
              from io import StringIO
              # from _sha import blocksize
+             @MPDecorator
              class VoltageReader(JRODataReader, ProcessingUnit):
                  """
                  Esta clase permite leer datos de voltage desde archivos en formato rawdata (.r). La lectura
                  optchar = "D"
                  dataOut = None
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
                      """
                      Inicializador de la clase VoltageReader para la lectura de datos de voltage.
                          None
                      """
-                     ProcessingUnit.__init__(self, **kwargs)
+                     ProcessingUnit.__init__(self)#, **kwargs)
                      self.isConfig = False
                      self.processingHeaderObj.processFlags = self.getProcessFlags()
-                     self.setBasicHeader()
  No newline at end of file
+                     self.setBasicHeader()
+  No newline at end of file

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

                              if self.dataOut.flagNoData:
                                  continue
-                             print("Publishing data...")
+                             #print("Publishing data...")
                              self.publishProc(self.socket_p, self.dataOut)
                              # time.sleep(2)
                          while True:
                              self.dataIn = self.listenProc(self.socket_l)
-                             print("%s received data" %BaseClass.__name__)
+                             #print("%s received data" %BaseClass.__name__)
                              if self.dataIn == "Finish":
                                  break

schainpy/model/proc/jroproc_voltage.py +45 -31

              from scipy import interpolate
              #TODO
              #from schainpy import cSchain
-             from .jroproc_base import ProcessingUnit, Operation
+             from schainpy.model.proc.jroproc_base import ProcessingUnit, MPDecorator, Operation
              from schainpy.model.data.jrodata import Voltage
-             from time import time
              from schainpy.utils import log
+             from time import time
+             @MPDecorator
              class VoltageProc(ProcessingUnit):
+                 METHODS = {} #yong
+                 def __init__(self):#, **kwargs):    #yong
-                 def __init__(self, **kwargs):
-                     ProcessingUnit.__init__(self, **kwargs)
+                     ProcessingUnit.__init__(self)#, **kwargs)
                      #         self.objectDict = {}
                      self.dataOut = Voltage()
                      self.flip = 1
+                     self.setupReq = False  #yong
                  def run(self):
                      if self.dataIn.type == 'AMISR':
                          self.__updateObjFromAmisrInput()
                          self.dataOut.data[:,:,botLim:topLim+1]  = ynew
                  # import collections
+             @MPDecorator
              class CohInt(Operation):
                  isConfig = False
                  __dataToPutStride = False
                  n = None
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
                      #   self.isConfig = False
                      return avgdata, avgdatatime
                  def run(self, dataOut, n=None, timeInterval=None, stride=None, overlapping=False, byblock=False, **kwargs):
                      if not self.isConfig:
                          self.setup(n=n, stride=stride, timeInterval=timeInterval, overlapping=overlapping, byblock=byblock, **kwargs)
                          self.isConfig = True
                          # raise
                          #   dataOut.timeInterval = dataOut.ippSeconds * dataOut.nCohInt
                          dataOut.flagNoData = False
+                     return dataOut
+             @MPDecorator
              class Decoder(Operation):
                  isConfig = False
                  nCode = None
                  nBaud = None
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
                      self.times = None
                      self.osamp = None
                  #         self.__setValues = False
-                     self.isConfig = False
+                 #    self.isConfig = False
+                     self.setupReq = False
                  def setup(self, code, osamp, dataOut):
                      self.__profIndex = 0
                      if self.__profIndex == self.nCode-1:
                          self.__profIndex = 0
-                         return 1
+                         return dataOut
                      self.__profIndex += 1
-                     return 1
+                     return dataOut
                  #        dataOut.flagDeflipData = True #asumo q la data no esta sin flip
+             @MPDecorator
              class ProfileConcat(Operation):
                  isConfig = False
                  buffer = None
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
                      self.profileIndex = 0
                  def reset(self):
                              xf = dataOut.heightList[0] + dataOut.nHeights * deltaHeight * m
                              dataOut.heightList = numpy.arange(dataOut.heightList[0], xf, deltaHeight)
                              dataOut.ippSeconds *= m
+                     return dataOut
+             @MPDecorator
              class ProfileSelector(Operation):
                  profileIndex = None
                  # Tamanho total de los perfiles
                  nProfiles = None
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
                      self.profileIndex = 0
                  def incProfileIndex(self):
                      raise ValueError("ProfileSelector needs profileList, profileRangeList or rangeList parameter")
-                     return False
+                     #return False
+                     return dataOut
+             @MPDecorator
              class Reshaper(Operation):
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
                      self.__buffer = None
                      self.__nitems = 0
                      dataOut.ippSeconds /= self.__nTxs
+                     return dataOut
+             @MPDecorator
              class SplitProfiles(Operation):
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
                  def run(self, dataOut, n):
                          if shape[2] % n != 0:
                              raise ValueError("Could not split the data, n=%d has to be multiple of %d" %(n, shape[2]))
                          new_shape = shape[0], shape[1]*n, int(shape[2]/n)
                          dataOut.data = numpy.reshape(dataOut.data, new_shape)
                          dataOut.flagNoData = False
                      dataOut.ippSeconds /= n
+                     return dataOut
+             @MPDecorator
              class CombineProfiles(Operation):
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
                      self.__remData = None
                      self.__profileIndex = 0
                      dataOut.ippSeconds *= n
+                     return dataOut
              # import collections
              # from scipy.stats import mode
              #
              #
              #         self.__startIndex += self.__newNSamples
              #
-             #         return
  No newline at end of file
+             #         return

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