schain-jc Commit - r1191:f1f11d1fc586

Multiprocessing for heispectra (Fits) all working

George Yong -

r1191:f1f11d1fc586

parent child

Context file:

r1191:f1f11d1fc586

Collapse all files

schainpy/controller.py +3 -12

              from schainpy.admin import Alarm, SchainWarning
-             ### Temporary imports!!!
-             # from schainpy.model import *
-             from schainpy.model.io import *
-             from schainpy.model.graphics import *
-             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.model import *
              from schainpy.utils import log
-             ###
              DTYPES = {
                  'Voltage': '.r',
                      '''
                      Instancia de unidades de procesamiento.
                      '''
                      className = eval(self.name)
                      kwargs = self.getKwargs()
                      procUnitObj = className(self.id, self.inputId, self.project_id, **kwargs) # necesitan saber su id y su entrada por fines de ipc

schainpy/model/data/jrodata.py +8 -2

              #        self.nChannels = 0
              #        self.nHeights = 0
                      self.nProfiles = None
-                     self.heightList = Non
+                     self.heightList = None
                      self.channelList = None
              #        self.channelIndexList = None
                      self.flagNoData = True
                      return timeInterval
+                 def get_ippSeconds(self):
+                     '''
+                     '''
+                     return self.ipp_sec
                  datatime = property(getDatatime, "I'm the 'datatime' property")
                  nHeights = property(getNHeights, "I'm the 'nHeights' property.")
                  nChannels = property(getNChannels, "I'm the 'nChannel' property.")
                  ltctime = property(getltctime, "I'm the 'ltctime' property")
                  timeInterval = property(getTimeInterval, "I'm the 'timeInterval' property")
+                 ippSeconds = property(get_ippSeconds, '')
              class Correlation(JROData):

schainpy/model/graphics/jroplot_heispectra.py +20 -4

              from .figure import Figure, isRealtime
              from .plotting_codes import *
+             from schainpy.model.proc.jroproc_base import MPDecorator
+             @MPDecorator
              class SpectraHeisScope_(Figure):
                  HEIGHTPROF = None
                  PREFIX = 'spc'
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Figure.__init__(self, **kwargs)
+                     Figure.__init__(self)#, **kwargs)
                      self.isConfig = False
                      self.__nsubplots = 1
                          ymax            :    None,
                      """
+                     if dataOut.flagNoData:
+                         return dataOut
                      if dataOut.realtime:
                          if not(isRealtime(utcdatatime = dataOut.utctime)):
                              print('Skipping this plot function')
                                wr_period=wr_period,
                                thisDatetime=thisDatetime)
+                     return dataOut
+             @MPDecorator
              class RTIfromSpectraHeis_(Figure):
                  isConfig = None
                  PREFIX = 'rtinoise'
-                 def __init__(self, **kwargs):
-                     Figure.__init__(self, **kwargs)
+                 def __init__(self):#, **kwargs):
+                     Figure.__init__(self)#, **kwargs)
                      self.timerange = 24*60*60
                      self.isConfig = False
                      self.__nsubplots = 1
                          server=None, folder=None, username=None, password=None,
                          ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0):
+                     if dataOut.flagNoData:
+                         return dataOut
                      if channelList == None:
                          channelIndexList = dataOut.channelIndexList
                          channelList = dataOut.channelList
                                wr_period=wr_period,
                                thisDatetime=thisDatetime,
                                update_figfile=update_figfile)
+                     return dataOut
  No newline at end of file

schainpy/model/io/jroIO_heispectra.py +15 -14

              from .jroIO_base import isRadarFolder, isNumber
              from schainpy.model.data.jrodata import Fits
-             from schainpy.model.proc.jroproc_base import Operation, ProcessingUnit
+             from schainpy.model.proc.jroproc_base import Operation, ProcessingUnit, MPDecorator
+             from schainpy.utils import log
              class PyFits(object):
                  name=None
                          self.isConfig = True
                      self.putData()
+             @MPDecorator
              class FitsReader(ProcessingUnit):
              #     __TIMEZONE = time.timezone
                  data = None
                  data_header_dict = None
-                 def __init__(self, **kwargs):
-                     ProcessingUnit.__init__(self, **kwargs)
+                 def __init__(self):#, **kwargs):
+                     ProcessingUnit.__init__(self)#, **kwargs)
                      self.isConfig = False
                      self.ext = '.fits'
                      self.setFile = 0
                      self.dataOut.nCohInt = self.nCohInt
                      self.dataOut.nIncohInt = self.nIncohInt
-                     self.dataOut.ippSeconds = self.ippSeconds
+                     self.dataOut.ipp_sec = self.ippSeconds
                  def readHeader(self):
                      headerObj = self.fitsObj[0]
                      if self.flagNoMoreFiles:
                          self.dataOut.flagNoData = True
-                         print('Process finished')
-                         return 0
+                         return (0, 'No more files')
                      self.flagDiscontinuousBlock = 0
                      self.flagIsNewBlock = 0
                      if not(self.readNextBlock()):
-                         return 0
+                         return (1, 'Error reading data')
                      if self.data is None:
                          self.dataOut.flagNoData = True
-                         return 0
+                         return (0, 'No more data')
                      self.dataOut.data = self.data
                      self.dataOut.data_header = self.data_header_dict
              #         self.dataOut.channelList = self.channelList
              #         self.dataOut.heightList = self.heightList
                      self.dataOut.flagNoData = False
-                     return self.dataOut.data
+                     # return self.dataOut.data
                  def run(self, **kwargs):
                      self.getData()
+             @MPDecorator
              class SpectraHeisWriter(Operation):
              #    set = None
                  setFile = None
                  doypath = None
                  subfolder = None
-                 def __init__(self, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                 def __init__(self):#, **kwargs):
+                     Operation.__init__(self)#, **kwargs)
                      self.wrObj = PyFits()
              #        self.dataOut = dataOut
                      self.nTotalBlocks=0
                          self.isConfig = True
                      self.putData()
+                     return dataOut
  No newline at end of file

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

                              BaseClass.run(self, **self.kwargs)
+                             if self.dataOut.flagNoData:
+                                 continue
                              for op, optype, opId, kwargs in self.operations:
                                  if optype == 'self':
                                      op(**kwargs)
                          time.sleep(1)
                      def run(self):
                          if self.typeProc is "ProcUnit":
                              if self.inputId is not None:
                                  self.subscribe()
                              self.set_publisher()
                              if 'Reader' not in BaseClass.__name__:

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

              import numpy
-             from .jroproc_base import ProcessingUnit, Operation
+             from .jroproc_base import ProcessingUnit, Operation, MPDecorator
              from schainpy.model.data.jrodata import SpectraHeis
+             from schainpy.utils import log
+             @MPDecorator
              class SpectraHeisProc(ProcessingUnit):
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     ProcessingUnit.__init__(self, **kwargs)
+                     ProcessingUnit.__init__(self)#, **kwargs)
              #        self.buffer = None
              #        self.firstdatatime = None
                      return 1
              class IncohInt4SpectraHeis(Operation):
                  isConfig = False
                  n = None
-                 def __init__(self, **kwargs):
+                 def __init__(self):#, **kwargs):
-                     Operation.__init__(self, **kwargs)
+                     Operation.__init__(self)#, **kwargs)
              #         self.isConfig = False
                  def setup(self, n=None, timeInterval=None, overlapping=False):
              #             dataOut.timeInterval = dataOut.ippSeconds * dataOut.nIncohInt
              #            dataOut.timeInterval = self.__timeInterval*self.n
                          dataOut.flagNoData = False
+                     return dataOut
  No newline at end of file

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