From 934ca8cba82f33e32f2a1f739b6a75fe0c0aadc0 2017-08-28 20:30:20 From: José Chávez Date: 2017-08-28 20:30:20 Subject: [PATCH] formatting, bug en controller.py --- diff --git a/schainpy/controller.py b/schainpy/controller.py index d295720..e16f526 100644 --- a/schainpy/controller.py +++ b/schainpy/controller.py @@ -10,7 +10,6 @@ import traceback import math import time from multiprocessing import Process, Queue, cpu_count -from profilehooks import profile, coverage import schainpy import schainpy.admin @@ -694,7 +693,6 @@ class ProcUnitConf(): return procUnitObj - ## @profile def run(self): is_ok = False @@ -713,8 +711,7 @@ class ProcUnitConf(): #print "\tRunning the '%s' operation with %s" %(opConfObj.name, opConfObj.id) sts = self.procUnitObj.call(opType = opConfObj.type, opName = opConfObj.name, - opId = opConfObj.id, - **kwargs) + opId = opConfObj.id) # total_time = time.time() - ini # @@ -766,7 +763,6 @@ class ReadUnitConf(ProcUnitConf): 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" @@ -987,7 +983,6 @@ class Project(): self.description = description def addReadUnit(self, id=None, datatype=None, name=None, **kwargs): - if id is None: idReadUnit = self.__getNewId() else: diff --git a/schainpy/model/io/jroIO_base.py b/schainpy/model/io/jroIO_base.py index 2b4315b..5a84195 100644 --- a/schainpy/model/io/jroIO_base.py +++ b/schainpy/model/io/jroIO_base.py @@ -1380,9 +1380,9 @@ class JRODataReader(JRODataIO): # self.getBasicHeader() - if last_set != None: - self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock - return + if last_set != None: + self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock + return def getBasicHeader(self): diff --git a/schainpy/model/io/jroIO_voltage.py b/schainpy/model/io/jroIO_voltage.py index 629b49b..6c6a23f 100644 --- a/schainpy/model/io/jroIO_voltage.py +++ b/schainpy/model/io/jroIO_voltage.py @@ -237,7 +237,7 @@ class VoltageReader(JRODataReader, ProcessingUnit): 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 @@ -267,15 +267,15 @@ class VoltageReader(JRODataReader, ProcessingUnit): #Time interval and code are propierties of dataOut. Its value depends of radarControllerHeaderObj. -# self.dataOut.timeInterval = self.radarControllerHeaderObj.ippSeconds * self.processingHeaderObj.nCohInt -# -# if self.radarControllerHeaderObj.code is not None: -# -# self.dataOut.nCode = self.radarControllerHeaderObj.nCode -# -# self.dataOut.nBaud = self.radarControllerHeaderObj.nBaud -# -# self.dataOut.code = self.radarControllerHeaderObj.code + # self.dataOut.timeInterval = self.radarControllerHeaderObj.ippSeconds * self.processingHeaderObj.nCohInt + # + # if self.radarControllerHeaderObj.code is not None: + # + # self.dataOut.nCode = self.radarControllerHeaderObj.nCode + # + # self.dataOut.nBaud = self.radarControllerHeaderObj.nBaud + # + # self.dataOut.code = self.radarControllerHeaderObj.code self.dataOut.dtype = self.dtype @@ -340,8 +340,8 @@ class VoltageReader(JRODataReader, ProcessingUnit): 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.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels) + # self.dataOut.channelList = numpy.arange(self.systemHeaderObj.numChannels) + # self.dataOut.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels) self.getBlockDimension() @@ -355,7 +355,7 @@ class VoltageReader(JRODataReader, ProcessingUnit): self.blockPointer = 0 block = self.receiver.recv() - + self.basicHeaderObj.read(block[self.blockPointer:]) self.blockPointer += self.basicHeaderObj.length self.systemHeaderObj.read(block[self.blockPointer:]) @@ -378,7 +378,7 @@ class VoltageReader(JRODataReader, ProcessingUnit): 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 @@ -473,15 +473,15 @@ class VoltageReader(JRODataReader, ProcessingUnit): self.profileIndex += 1 -# elif self.selBlocksize==None or self.selBlocksize==self.dataOut.nProfiles: -# """ -# Return all block -# """ -# self.dataOut.flagDataAsBlock = True -# self.dataOut.data = self.datablock -# self.dataOut.profileIndex = self.dataOut.nProfiles - 1 -# -# self.profileIndex = self.dataOut.nProfiles + # elif self.selBlocksize==None or self.selBlocksize==self.dataOut.nProfiles: + # """ + # Return all block + # """ + # self.dataOut.flagDataAsBlock = True + # self.dataOut.data = self.datablock + # self.dataOut.profileIndex = self.dataOut.nProfiles - 1 + # + # self.profileIndex = self.dataOut.nProfiles else: """ diff --git a/schainpy/model/proc/jroproc_base.py b/schainpy/model/proc/jroproc_base.py index 55f3afd..3b87703 100644 --- a/schainpy/model/proc/jroproc_base.py +++ b/schainpy/model/proc/jroproc_base.py @@ -200,7 +200,6 @@ class ProcessingUnit(object): 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". diff --git a/schainpy/trash b/schainpy/trash deleted file mode 100644 index 384299d..0000000 --- a/schainpy/trash +++ /dev/null @@ -1 +0,0 @@ -You should install "digital_rf_hdf5" module if you want to read USRP data diff --git a/setup.py b/setup.py index 39f5d50..76f0f24 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ Created on Jul 16, 2014 import numpy from setuptools import setup, Extension -import numpy +from schainpy import __version__ setup(name="schainpy", version=__version__,