schain-jc Commit - r1017:934ca8cba82f

formatting, bug en controller.py

José Chávez -

r1017:934ca8cba82f

parent child

Context file:

r1017:934ca8cba82f

Collapse all files

schainpy/controller.py +1 -6

             import math
             import time
             from multiprocessing import Process, Queue, cpu_count
-            from profilehooks import profile, coverage
             import schainpy
             import schainpy.admin
                     return procUnitObj
-                ## @profile
                 def run(self):
                     is_ok = False
                         #print "\tRunning the '%s' operation with %s" %(opConfObj.name, opConfObj.id)
                         sts = self.procUnitObj.call(opType = opConfObj.type,
                                                     opName = opConfObj.name,
-                                                    opId = opConfObj.id,
+                                                    opId = opConfObj.id)
-                                                    **kwargs)
                         #             total_time = time.time() - ini
                         #
                 def setup(self, id, name, datatype, path='', startDate="", endDate="", startTime="",
                           endTime="", parentId=None, queue=None, server=None, **kwargs):
                     #Compatible with old signal chain version
                     if datatype==None and name==None:
                         raise ValueError, "datatype or name should be defined"
                     self.description = description
                 def addReadUnit(self, id=None, datatype=None, name=None, **kwargs):
                     if id is None:
                         idReadUnit = self.__getNewId()
                     else:

schainpy/model/io/jroIO_base.py +3 -3

                         #   self.getBasicHeader()
-                    if last_set != None:
+                        if last_set != None:
-                        self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock
+                            self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock
-                    return
+                        return
                 def getBasicHeader(self):

schainpy/model/io/jroIO_voltage.py +23 -23

                         if self.waitDataBlock(pointer_location=current_pointer_location):
                             junk = numpy.fromfile( self.fp, self.dtype, self.blocksize )
                             junk = junk.reshape( (self.processingHeaderObj.profilesPerBlock, self.processingHeaderObj.nHeights, self.systemHeaderObj.nChannels) )
-            #             return 0
+                    #             return 0
                     #Dimensions : nChannels, nProfiles, nSamples
                     #Time interval and code are propierties of dataOut. Its value depends of radarControllerHeaderObj.
-            #         self.dataOut.timeInterval = self.radarControllerHeaderObj.ippSeconds * self.processingHeaderObj.nCohInt
+                    #         self.dataOut.timeInterval = self.radarControllerHeaderObj.ippSeconds * self.processingHeaderObj.nCohInt
+                    #
-            #         if self.radarControllerHeaderObj.code is not None:
+                    #         if self.radarControllerHeaderObj.code is not None:
+                    #
-            #             self.dataOut.nCode = self.radarControllerHeaderObj.nCode
+                    #             self.dataOut.nCode = self.radarControllerHeaderObj.nCode
+                    #
-            #             self.dataOut.nBaud = self.radarControllerHeaderObj.nBaud
+                    #             self.dataOut.nBaud = self.radarControllerHeaderObj.nBaud
+                    #
-            #             self.dataOut.code = self.radarControllerHeaderObj.code
+                    #             self.dataOut.code = self.radarControllerHeaderObj.code
                     self.dataOut.dtype = self.dtype
                     self.dtype = datatype_str
                     #self.ippSeconds = 2 * 1000 * self.radarControllerHeaderObj.ipp / self.c
                     self.fileSizeByHeader = self.processingHeaderObj.dataBlocksPerFile * self.processingHeaderObj.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.processingHeaderObj.dataBlocksPerFile - 1)
-            #        self.dataOut.channelList = numpy.arange(self.systemHeaderObj.numChannels)
+                    #        self.dataOut.channelList = numpy.arange(self.systemHeaderObj.numChannels)
-            #        self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
+                    #        self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
                     self.getBlockDimension()
                     self.blockPointer = 0
                     block = self.receiver.recv()
                     self.basicHeaderObj.read(block[self.blockPointer:])
                     self.blockPointer += self.basicHeaderObj.length
                     self.systemHeaderObj.read(block[self.blockPointer:])
                         if self.waitDataBlock(pointer_location=current_pointer_location):
                             junk = numpy.fromstring( block[self.blockPointer:], self.dtype, self.blocksize )
                             junk = junk.reshape( (self.processingHeaderObj.profilesPerBlock, self.processingHeaderObj.nHeights, self.systemHeaderObj.nChannels) )
-            #             return 0
+                    #               return 0
                     #Dimensions : nChannels, nProfiles, nSamples
                         self.profileIndex += 1
-            #         elif self.selBlocksize==None or self.selBlocksize==self.dataOut.nProfiles:
+                    #         elif self.selBlocksize==None or self.selBlocksize==self.dataOut.nProfiles:
-            #             """
+                    #             """
-            #             Return all block
+                    #             Return all block
-            #             """
+                    #             """
-            #             self.dataOut.flagDataAsBlock = True
+                    #             self.dataOut.flagDataAsBlock = True
-            #             self.dataOut.data = self.datablock
+                    #             self.dataOut.data = self.datablock
-            #             self.dataOut.profileIndex = self.dataOut.nProfiles - 1
+                    #             self.dataOut.profileIndex = self.dataOut.nProfiles - 1
+                    #
-            #             self.profileIndex = self.dataOut.nProfiles
+                    #             self.profileIndex = self.dataOut.nProfiles
                     else:
                         """

schainpy/model/proc/jroproc_base.py 0 -1

                     return True
                 def call(self, opType, opName=None, opId=None):
                     """
                     Return True si ejecuta la operacion interna nombrada "opName" o la operacion externa
                     identificada con el id "opId"; con los argumentos "**kwargs".

setup.py +1 -1

             import numpy
             from setuptools import setup, Extension
-            import numpy
+            from schainpy import __version__
             setup(name="schainpy",
                   version=__version__,

schainpy/trash removed 0 -1

NO CONTENT: file was removed

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