schain Commit - r89:b509e99f0d8d · Jicamarca Repository

Se ha reordenado las variables

Miguel Valdez -

r89:b509e99f0d8d

parent child

Context file:

r89:b509e99f0d8d

Collapse all files

schainpy/Graphics/SpectraPlot.py +1 -1

             '''
             Created on Feb 7, 2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import numpy
             import datetime
             import plplot
             path = os.path.split(os.getcwd())[0]
             sys.path.append(path)
             from Graphics.BaseGraph import *
             from Model.Spectra import Spectra
             class Spectrum():
                 def __init__(self, Spectra, index=0):
                     """
                     Inputs:
                         type:   "power" ->> Potencia
                                 "iq"    ->> Real + Imaginario
                     """
                     self.__isPlotConfig = False
                     self.__isPlotIni = False
                     self.__xrange = None
                     self.__yrange = None
                     self.nGraphs = 0
                     self.indexPlot = index
                     self.graphObjList = []
                     self.m_Spectra = Spectra
                 def __addGraph(self, subpage, title="", xlabel="", ylabel="", showColorbar=False, showPowerProfile=True, XAxisAsTime=False):
                     graphObj = ColorPlot()
                     graphObj.setup(subpage,
                                    title,
                                    xlabel,
                                    ylabel,
                                    showColorbar=showColorbar,
                                    showPowerProfile=showPowerProfile,
                                    XAxisAsTime=XAxisAsTime)
                     self.graphObjList.append(graphObj)
                 def setup(self, titleList=None, xlabelList=None, ylabelList=None, showColorbar=False, showPowerProfile=True, XAxisAsTime=False):
                     nChan = int(self.m_Spectra.m_SystemHeader.numChannels)
                     channels = range(nChan)
                     myXlabel = "Radial Velocity (m/s)"
                     myYlabel = "Range (km)"
                     for i in channels:
                         if titleList != None:
                             myTitle = titleList[i]
                             myXlabel = xlabelList[i]
                             myYlabel = ylabelList[i]
             #            if self.m_Spectra.m_NoiseObj != None:
             #                noise = '%4.2fdB' %(self.m_Spectra.m_NoiseObj[i])
             #            else:
                         noise = '--'
                         myTitle = "Channel: %d - Noise: %s" %(i, noise)
                         self.__addGraph(i+1,
                                         title=myTitle,
                                         xlabel=myXlabel,
                                         ylabel=myYlabel,
                                         showColorbar=showColorbar,
                                         showPowerProfile=showPowerProfile,
                                         XAxisAsTime=XAxisAsTime)
                     self.nGraphs = nChan
                     self.__isPlotConfig = True
                 def iniPlot(self, winTitle=""):
                     nx = int(numpy.sqrt(self.nGraphs)+1)
                     #ny = int(self.nGraphs/nx)
                     plplot.plsstrm(self.indexPlot)
                     plplot.plparseopts([winTitle], plplot.PL_PARSE_FULL)
                     plplot.plsetopt("geometry", "%dx%d" %(300*nx, 240*nx))
                     plplot.plsdev("xwin")
                     plplot.plscolbg(255,255,255)
                     plplot.plscol0(1,0,0,0)
                     plplot.plinit()
                     plplot.plspause(False)
                     plplot.pladv(0)
                     plplot.plssub(nx, nx)
                     self.__nx = nx
                     self.__ny = nx
                     self.__isPlotIni = True
                 def plotData(self, xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, titleList=None, xlabelList=None, ylabelList=None, showColorbar=False, showPowerProfile=True, XAxisAsTime=False, winTitle="Spectra"):
                     if not(self.__isPlotConfig):
                         self.setup(titleList,
                                    xlabelList,
                                    ylabelList,
                                    showColorbar,
                                    showPowerProfile,
                                    XAxisAsTime)
                     if not(self.__isPlotIni):
                         self.iniPlot(winTitle)
                     plplot.plsstrm(self.indexPlot)
                     data = 10.*numpy.log10(self.m_Spectra.data_spc)
                     #data.shape = Channels x Heights x Profiles
             #        data = numpy.transpose( data, (0,2,1) )
                     #data.shape = Channels x Profiles x Heights
                     nChan, nX, nY = numpy.shape(data)
                     x = numpy.arange(nX)
-                    y = self.m_Spectra.heights
+                    y = self.m_Spectra.heightList
                     thisDatetime = datetime.datetime.fromtimestamp(self.m_Spectra.m_BasicHeader.utc)
                     txtDate = "Self Spectra - Date: %s" %(thisDatetime.strftime("%d-%b-%Y %H:%M:%S"))
                     if xmin == None: xmin = x[0]
                     if xmax == None: xmax = x[-1]
                     if ymin == None: ymin = y[0]
                     if ymax == None: ymax = y[-1]
                     if zmin == None: zmin = numpy.nanmin(abs(data))
                     if zmax == None: zmax = numpy.nanmax(abs(data))
                     plplot.plbop()
                     plplot.plssub(self.__nx, self.__ny)
                     for i in range(self.nGraphs):
                         self.graphObjList[i].iniSubpage()
                         self.graphObjList[i].plotData(data[i,:,:],
                                                       x,
                                                       y,
                                                       xmin=xmin,
                                                       xmax=xmax,
                                                       ymin=ymin,
                                                       ymax=ymax,
                                                       zmin=zmin,
                                                       zmax=zmax)
                     plplot.plssub(1,0)
                     plplot.pladv(0)
                     plplot.plvpor(0., 1., 0., 1.)
                     plplot.plmtex("t",-1., 0.5, 0.5, txtDate)
                     plplot.plflush()
                     plplot.pleop()
                 def end(self):
                     plplot.plend()
             if __name__ == '__main__':
                 pass

schainpy/IO/CorrelationIO.py +14 -1

             '''
             Created on 23/01/2012
             @author $Author$
             @version $Id$
             '''
             from DataIO import DataReader
             from DataIO import DataWriter
             class CorrelationReader(DataReader):
                 def __init__(self):
                     pass
             class CorrelationWriter(DataWriter):
                 def __init__(self):
-                    pass
  No newline at end of file
+                    pass
+                def puData(self):
+                    pass
+                def writeBlock(self):
+                    pass
+  No newline at end of file

schainpy/IO/JRODataIO.py ~~schainpy/IO/DataIO.py~~ renamed +176 -232

             '''
             Created on 23/01/2012
             @author $Author$
             @version $Id$
             @version $Id$
             '''
             import os, sys
             import glob
             import time
             import numpy
             import fnmatch
             import time, datetime
             path = os.path.split(os.getcwd())[0]
             sys.path.append(path)
             from Model.JROHeader import *
             from Model.JROData import JROData
             def checkForRealPath(path, year, doy, set, ext):
                 """
                 Por ser Linux Case Sensitive entonces checkForRealPath encuentra el nombre correcto de un path,
                 Prueba por varias combinaciones de nombres entre mayusculas y minusculas para determinar
                 el path exacto de un determinado file.
                 Example    :
                     nombre correcto del file es  .../.../D2009307/P2009307367.ext
                     Entonces la funcion prueba con las siguientes combinaciones
                         .../.../x2009307/y2009307367.ext
                         .../.../x2009307/Y2009307367.ext
                         .../.../X2009307/y2009307367.ext
                         .../.../X2009307/Y2009307367.ext
                     siendo para este caso, la ultima combinacion de letras, identica al file buscado
                 Return:
                     Si encuentra la cobinacion adecuada devuelve el path completo y el nombre del file
                     caso contrario devuelve None como path y el la ultima combinacion de nombre en mayusculas
                     para el filename
                 """
                 filepath = None
                 find_flag = False
                 filename = None
                 if ext.lower() == ".r": #voltage
                     header1 = "dD"
                     header2 = "dD"
                 elif ext.lower() == ".pdata": #spectra
                     header1 = "dD"
                     header2 = "pP"
                 else:
                     return None, filename
                 for dir in header1: #barrido por las dos combinaciones posibles de "D"
                     for fil in header2: #barrido por las dos combinaciones posibles de "D"
                         doypath = "%s%04d%03d" % ( dir, year, doy ) #formo el nombre del directorio xYYYYDDD (x=d o x=D)
                         filename = "%s%04d%03d%03d%s" % ( fil, year, doy, set, ext ) #formo el nombre del file xYYYYDDDSSS.ext
                         filepath = os.path.join( path, doypath, filename ) #formo el path completo
                         if os.path.exists( filepath ): #verifico que exista
                             find_flag = True
                             break
                     if find_flag:
                         break
                 if not(find_flag):
                     return None, filename
                 return filepath, filename
             def isNumber(str):
                 """
                 Chequea si el conjunto de caracteres que componen un string puede ser convertidos a un numero.
                 Excepciones:
                     Si un determinado string no puede ser convertido a numero
                 Input:
                     str, string al cual se le analiza para determinar si convertible a un numero o no
                 Return:
                     True    :    si el string es uno numerico
                     False   :    no es un string numerico
                 """
                 try:
                     float( str )
                     return True
                 except:
                     return False
             def isThisFileinRange(filename, startUTSeconds, endUTSeconds):
                 """
                 Esta funcion determina si un archivo de datos se encuentra o no dentro del rango de fecha especificado.
                 Inputs:
                     filename            :    nombre completo del archivo de datos en formato Jicamarca (.r)
                     startUTSeconds      :    fecha inicial del rango seleccionado. La fecha esta dada en
                                              segundos contados desde 01/01/1970.
                     endUTSeconds        :    fecha final del rango seleccionado. La fecha esta dada en
                                              segundos contados desde 01/01/1970.
                 Return:
                     Boolean    :    Retorna True si el archivo de datos contiene datos en el rango de
                                     fecha especificado, de lo contrario retorna False.
                 Excepciones:
                     Si el archivo no existe o no puede ser abierto
                     Si la cabecera no puede ser leida.
                 """
                 m_BasicHeader = BasicHeader()
                 try:
                     fp = open(filename,'rb')
                 except:
                     raise IOError, "The file %s can't be opened" %(filename)
                 sts = m_BasicHeader.read(fp)
                 fp.close()
                 if not(sts):
                     print "Skipping the file %s because it has not a valid header" %(filename)
                     return 0
                 if not ((startUTSeconds <= m_BasicHeader.utc) and (endUTSeconds > m_BasicHeader.utc)):
                     return 0
                 return 1
             def getlastFileFromPath(path, ext):
                 """
                 Depura el fileList dejando solo los que cumplan el formato de "PYYYYDDDSSS.ext"
                 al final de la depuracion devuelve el ultimo file de la lista que quedo.
                 Input:
                     fileList    :    lista conteniendo todos los files (sin path) que componen una determinada carpeta
                     ext         :    extension de los files contenidos en una carpeta
                 Return:
                     El ultimo file de una determinada carpeta, no se considera el path.
                 """
                 validFilelist = []
                 fileList = os.listdir(path)
                 # 0 1234 567 89A BCDE
                 # H YYYY DDD SSS .ext
                 for file in fileList:
                     try:
                         year = int(file[1:5])
                         doy  = int(file[5:8])
                         if (os.path.splitext(file)[-1].upper() != ext.upper()) : continue
                     except:
                         continue
                     validFilelist.append(file)
                 if validFilelist:
                     validFilelist = sorted( validFilelist, key=str.lower )
                     return validFilelist[-1]
                 return None
+            class JRODataIO():
-            class DataReader():
-                def __init__(self):
-                    pass
-            class DataWriter():
-                def __init__(self):
-                    pass
-            class JRODataReader(DataReader):
+                #speed of light
+                c = 3E8
-                """
-                Esta clase es usada como la clase padre de las clases DataReader,
-                contiene todos lo metodos necesarios para leer datos desde archivos en formato
-                jicamarca o pdata (.r o .pdata). La lectura de los datos siempre se realiza por bloques. Los datos
-                leidos son array de 3 dimensiones:
-                                  Para Voltajes  -  perfiles * alturas * canales
-                                  Para Spectra   -  paresCanalesIguales    * alturas * perfiles  (Self Spectra)
-                                                    paresCanalesDiferentes * alturas * perfiles  (Cross Spectra)
-                                                    canales * alturas                            (DC Channels)
-                y son almacenados en su buffer respectivo.
-                Esta clase contiene instancias (objetos) de las clases BasicHeader, SystemHeader,
-                RadarControllerHeader y DataObj. Los tres primeros se usan para almacenar informacion de la
-                cabecera de datos (metadata), y el cuarto (DataObj) para obtener y almacenar los datos desde
-                el buffer cada vez que se ejecute el metodo "getData".
-                """
                 m_BasicHeader = BasicHeader()
                 m_SystemHeader = SystemHeader()
                 m_RadarControllerHeader = RadarControllerHeader()
                 m_ProcessingHeader = ProcessingHeader()
                 m_DataObj = None
-                heightList = None
-                channelList = None
                 online = 0
                 fp = None
+                dataType = None
                 fileSizeByHeader = None
                 filenameList = []
                 filename = None
                 fileSize = None
                 firstHeaderSize = 0
                 basicHeaderSize = 24
-                dataType = None
+                nTotalBlocks = 0
+                ippSeconds = 0
-                maxTimeStep = 30
+                blocksize = 0
-                flagNoMoreFiles = 0
                 set = 0
                 ext = None
                 path = None
+                maxTimeStep = 30
                 delay  = 3   #seconds
                 nTries  = 3  #quantity tries
                 nFiles = 3   #number of files for searching
-                nBlocks = 0
+                flagNoMoreFiles = 0
                 flagIsNewFile = 1
-                ippSeconds = 0
                 flagResetProcessing = 0
                 flagIsNewBlock = 0
-                nReadBlocks = 0
+                def __init__(self):
+                    pass
-                blocksize = 0
+            class JRODataReader(JRODataIO):
+                """
+                Esta clase es usada como la clase padre de las clases VoltageReader y SpectraReader.
+                Contiene todos lo metodos necesarios para leer datos desde archivos en formato
+                jicamarca o pdata (.r o .pdata). La lectura de los datos siempre se realiza por bloques. Los datos
+                leidos son array de 3 dimensiones:
-                datablockIndex = 9999
+                                  Para Voltajes  -  perfiles * alturas * canales
+                                  Para Spectra   -  paresCanalesIguales    * alturas * perfiles  (Self Spectra)
+                                                    paresCanalesDiferentes * alturas * perfiles  (Cross Spectra)
+                                                    canales * alturas                            (DC Channels)
+                y son almacenados en su buffer respectivo.
+                Esta clase contiene instancias (objetos) de las clases BasicHeader, SystemHeader,
+                RadarControllerHeader y DataObj. Los tres primeros se usan para almacenar informacion de la
+                cabecera de datos (metadata), y el cuarto (DataObj) para obtener y almacenar los datos desde
+                el buffer de datos cada vez que se ejecute el metodo "getData".
+                """
-                #speed of light
+                nReadBlocks = 0
-                c = 3E8
                 def __init__(self, m_DataObj=None):
                     raise ValueError, "This class can't be instanced"
                 def hasNotDataInBuffer(self):
                     raise ValueError, "Not implemented"
+                def getBlockDimension(self):
+                    raise ValueError, "No implemented"
                 def readBlock(self):
+                    self.nTotalBlocks += 1
+                    self.nReadBlocks += 1
                     raise ValueError, "This method has not been implemented"
                 def getData( self ):
                     raise ValueError, "This method has not been implemented"
                 def __rdSystemHeader(self, fp=None):
                     if fp == None:
                         fp = self.fp
                     self.m_SystemHeader.read(fp)
                 def __rdRadarControllerHeader(self, fp=None):
                     if fp == None:
                         fp = self.fp
                     self.m_RadarControllerHeader.read(fp)
                 def __rdProcessingHeader(self, fp=None):
                     if fp == None:
                         fp = self.fp
                     self.m_ProcessingHeader.read(fp)
                 def __rdBasicHeader(self, fp=None):
                     if fp == None:
                         fp = self.fp
                     self.m_BasicHeader.read(fp)
-                def getBlockDimension(self):
-                    raise ValueError, "No implemented"
                 def __readFirstHeader(self):
                     """
                     Lectura del First Header, es decir el Basic Header y el Long Header
                     Affected:
                         self.m_BasicHeader
                         self.m_SystemHeader
                         self.m_RadarControllerHeader
                         self.m_ProcessingHeader
                         self.firstHeaderSize
-                        self.heightList
                         self.dataType
                         self.fileSizeByHeader
                         self.ippSeconds
                     Return:
                         None
                     """
                     self.__rdBasicHeader()
                     self.__rdSystemHeader()
                     self.__rdRadarControllerHeader()
                     self.__rdProcessingHeader()
                     self.firstHeaderSize = self.m_BasicHeader.size
-                    data_type=int(numpy.log2((self.m_ProcessingHeader.processFlags & PROCFLAG.DATATYPE_MASK))-numpy.log2(PROCFLAG.DATATYPE_CHAR))
+                    datatype = int(numpy.log2((self.m_ProcessingHeader.processFlags & PROCFLAG.DATATYPE_MASK))-numpy.log2(PROCFLAG.DATATYPE_CHAR))
-                    if data_type == 0:
+                    if datatype == 0:
-                        tmp = numpy.dtype([('real','<i1'),('imag','<i1')])
+                        datatype_str = numpy.dtype([('real','<i1'),('imag','<i1')])
-                    elif data_type == 1:
+                    elif datatype == 1:
-                        tmp = numpy.dtype([('real','<i2'),('imag','<i2')])
+                        datatype_str = numpy.dtype([('real','<i2'),('imag','<i2')])
-                    elif data_type == 2:
+                    elif datatype == 2:
-                        tmp = numpy.dtype([('real','<i4'),('imag','<i4')])
+                        datatype_str = numpy.dtype([('real','<i4'),('imag','<i4')])
-                    elif data_type == 3:
+                    elif datatype == 3:
-                        tmp = numpy.dtype([('real','<i8'),('imag','<i8')])
+                        datatype_str = numpy.dtype([('real','<i8'),('imag','<i8')])
-                    elif data_type == 4:
+                    elif datatype == 4:
-                        tmp = numpy.dtype([('real','<f4'),('imag','<f4')])
+                        datatype_str = numpy.dtype([('real','<f4'),('imag','<f4')])
-                    elif data_type == 5:
+                    elif datatype == 5:
-                        tmp = numpy.dtype([('real','<f8'),('imag','<f8')])
+                        datatype_str = numpy.dtype([('real','<f8'),('imag','<f8')])
                     else:
                         raise ValueError, 'Data type was not defined'
-                    xi = self.m_ProcessingHeader.firstHeight
+                    self.dataType = datatype_str
-                    step = self.m_ProcessingHeader.deltaHeight
-                    xf = xi + self.m_ProcessingHeader.numHeights*step
-                    self.heightList = numpy.arange(xi, xf, step)
-                    self.channelList = numpy.arange(self.m_SystemHeader.numChannels)
-                    self.dataType = tmp
-                    self.fileSizeByHeader = self.m_ProcessingHeader.dataBlocksPerFile * self.m_ProcessingHeader.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.m_ProcessingHeader.dataBlocksPerFile - 1)
                     self.ippSeconds = 2 * 1000 * self.m_RadarControllerHeader.ipp / self.c
+                    self.fileSizeByHeader = self.m_ProcessingHeader.dataBlocksPerFile * self.m_ProcessingHeader.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.m_ProcessingHeader.dataBlocksPerFile - 1)
                     self.getBlockDimension()
+                def __setNewBlock(self):
+                    """
+                    Lee el Basic Header y posiciona le file pointer en la posicion inicial del bloque a leer
+                    Affected:
+                        self.m_BasicHeader
+                        self.flagNoContinuousBlock
+                        self.ns
+                    Return:
+:    Si el file no tiene un Basic Header que pueda ser leido
+:    Si se pudo leer el Basic Header
+                    """
+                    if self.fp == None:
+                        return 0
+                    if self.flagIsNewFile:
+                        return 1
+                    self.lastUTTime = self.m_BasicHeader.utc
+                    currentSize = self.fileSize - self.fp.tell()
+                    neededSize = self.m_ProcessingHeader.blockSize + self.basicHeaderSize
+                    #If there is enough data setting new data block
+                    if ( currentSize >= neededSize ):
+                        self.__rdBasicHeader()
+                        return 1
+                    #si es OnLine y ademas aun no se han leido un bloque completo entonces se espera por uno valido
+                    if self.online and (self.nReadBlocks < self.m_ProcessingHeader.dataBlocksPerFile):
+                        fpointer = self.fp.tell()
+                        for nTries in range( self.nTries ):
+                            #self.fp.close()
+                            print "\tWaiting %0.2f seconds for the next block, try %03d ..." % (self.delay, nTries+1)
+                            time.sleep( self.delay )
+                            #self.fp = open( self.filename, 'rb' )
+                            #self.fp.seek( fpointer )
+                            self.fileSize = os.path.getsize( self.filename )
+                            currentSize = self.fileSize - fpointer
+                            if ( currentSize >= neededSize ):
+                                self.__rdBasicHeader()
+                                return 1
+                    #Setting new file
+                    if not( self.setNextFile() ):
+                        return 0
+                    deltaTime = self.m_BasicHeader.utc - self.lastUTTime # check this
+                    self.flagResetProcessing = 0
+                    if deltaTime > self.maxTimeStep:
+                        self.flagResetProcessing = 1
+                    return 1
+                def readNextBlock(self):
+                    """
+                    Establece un nuevo bloque de datos a leer y los lee, si es que no existiese
+                    mas bloques disponibles en el archivo actual salta al siguiente.
+                    Affected:
+                        self.lastUTTime
+                    Return: None
+                    """
+                    if not(self.__setNewBlock()):
+                        return 0
+                    if not(self.readBlock()):
+                        return 0
+                    return 1
                 def __setNextFileOnline(self):
                     """
                     Busca el siguiente file que tenga suficiente data para ser leida, dentro de un folder especifico, si
                     no encuentra un file valido espera un tiempo determinado y luego busca en los posibles n files
                     siguientes.
                     Affected:
                         self.flagIsNewFile
                         self.filename
                         self.fileSize
                         self.fp
                         self.set
                         self.flagNoMoreFiles
                     Return:
 : si luego de una busqueda del siguiente file valido este no pudo ser encontrado
 : si el file fue abierto con exito y esta listo a ser leido
                     Excepciones:
                         Si un determinado file no puede ser abierto
                     """
                     nFiles = 0
                     fileOk_flag = False
                     firstTime_flag = True
                     self.set += 1
                     #busca el 1er file disponible
                     file, filename = checkForRealPath( self.path, self.year, self.doy, self.set, self.ext )
                     if file:
                         if self.__verifyFile(file, False):
                             fileOk_flag = True
                     #si no encuentra un file entonces espera y vuelve a buscar
                     if not(fileOk_flag):
                         for nFiles in range(self.nFiles+1): #busco en los siguientes self.nFiles+1 files posibles
                             if firstTime_flag: #si es la 1era vez entonces hace el for self.nTries veces
                                 tries = self.nTries
                             else:
                                 tries = 1 #si no es la 1era vez entonces solo lo hace una vez
                             for nTries in range( tries ):
                                 if firstTime_flag:
                                     print "\tWaiting %0.2f sec for new \"%s\" file, try %03d ..." % ( self.delay, filename, nTries+1 )
                                     time.sleep( self.delay )
                                 else:
                                     print "\tSearching next \"%s%04d%03d%03d%s\" file ..." % (self.optchar, self.year, self.doy, self.set, self.ext)
                                 file, filename = checkForRealPath( self.path, self.year, self.doy, self.set, self.ext )
                                 if file:
                                     if self.__verifyFile(file):
                                         fileOk_flag = True
                                         break
                             if fileOk_flag:
                                 break
                             firstTime_flag = False
                             print "\tSkipping the file \"%s\" due to this file doesn't exist yet" % filename
                             self.set += 1
                             if nFiles == (self.nFiles-1): #si no encuentro el file buscado cambio de carpeta y busco en la siguiente carpeta
                                 self.set = 0
                                 self.doy += 1
                     if fileOk_flag:
                         self.fileSize = os.path.getsize( file )
                         self.filename = file
                         self.flagIsNewFile = 1
                         if self.fp != None: self.fp.close()
                         self.fp = open(file)
                         self.flagNoMoreFiles = 0
                         print 'Setting the file: %s' % file
                     else:
                         self.fileSize = 0
                         self.filename = None
                         self.flagIsNewFile = 0
                         self.fp = None
                         self.flagNoMoreFiles = 1
                         print 'No more Files'
                     return fileOk_flag
                 def __setNextFileOffline(self):
                     """
                     Busca el siguiente file dentro de un folder que tenga suficiente data para ser leida
                     Affected:
                         self.flagIsNewFile
                         self.fileIndex
                         self.filename
                         self.fileSize
                         self.fp
                     Return:
 : si un determinado file no puede ser abierto
 : si el file fue abierto con exito
                     Excepciones:
                         Si un determinado file no puede ser abierto
                     """
                     idFile = self.fileIndex
                     while(True):
                         idFile += 1
                         if not(idFile < len(self.filenameList)):
                             self.flagNoMoreFiles = 1
                             print 'No more Files'
                             return 0
                         filename = self.filenameList[idFile]
                         fileSize = os.path.getsize(filename)
                         try:
                             fp = open(filename,'rb')
                         except:
                             raise IOError, "The file %s can't be opened" %filename
                         currentSize = fileSize - fp.tell()
                         neededSize = self.m_ProcessingHeader.blockSize + self.firstHeaderSize
                         if (currentSize < neededSize):
                             print "Skipping the file %s due to it hasn't enough data" %filename
                             continue
                         break
                     self.flagIsNewFile = 1
                     self.fileIndex = idFile
                     self.filename = filename
                     self.fileSize = fileSize
                     self.fp = fp
                     print 'Setting the file: %s'%self.filename
                     return 1
                 def setNextFile(self):
                     """
                     Determina el siguiente file a leer y si hay uno disponible lee el First Header
                     Affected:
                         self.m_BasicHeader
                         self.m_SystemHeader
                         self.m_RadarControllerHeader
                         self.m_ProcessingHeader
                         self.firstHeaderSize
                     Return:
 :    Si no hay files disponibles
 :    Si hay mas files disponibles
                     """
                     if self.fp != None:
                         self.fp.close()
                     if self.online:
                         newFile = self.__setNextFileOnline()
                     else:
                         newFile = self.__setNextFileOffline()
-                    if self.flagNoMoreFiles:
-                        sys.exit(0)
                     if not(newFile):
                         return 0
                     self.__readFirstHeader()
-                    self.nBlocks = 0
+                    self.nReadBlocks = 0
                     return 1
-                def __setNewBlock(self):
-                    """
-                    Lee el Basic Header y posiciona le file pointer en la posicion inicial del bloque a leer
-                    Affected:
-                        self.m_BasicHeader
-                        self.flagNoContinuousBlock
-                        self.ns
-                    Return:
-:    Si el file no tiene un Basic Header que pueda ser leido
-:    Si se pudo leer el Basic Header
-                    """
-                    if self.fp == None:
-                        return 0
-                    if self.flagIsNewFile:
-                        return 1
-                    currentSize = self.fileSize - self.fp.tell()
-                    neededSize = self.m_ProcessingHeader.blockSize + self.basicHeaderSize
-                    #If there is enough data setting new data block
-                    if ( currentSize >= neededSize ):
-                        self.__rdBasicHeader()
-                        return 1
-                    #si es OnLine y ademas aun no se han leido un bloque completo entonces se espera por uno valido
-                    elif (self.nBlocks != self.m_ProcessingHeader.dataBlocksPerFile) and self.online:
-                        for nTries in range( self.nTries ):
-                            fpointer = self.fp.tell()
-                            self.fp.close()
-                            print "\tWaiting %0.2f sec for the next block, try %03d ..." % (self.delay, nTries+1)
-                            time.sleep( self.delay )
-                            self.fp = open( self.filename, 'rb' )
-                            self.fp.seek( fpointer )
-                            self.fileSize = os.path.getsize( self.filename )
-                            currentSize = self.fileSize - self.fp.tell()
-                            neededSize = self.m_ProcessingHeader.blockSize + self.basicHeaderSize
-                            if ( currentSize >= neededSize ):
-                                self.__rdBasicHeader()
-                                return 1
-                    #Setting new file
-                    if not( self.setNextFile() ):
-                        return 0
-                    deltaTime = self.m_BasicHeader.utc - self.lastUTTime # check this
-                    self.flagResetProcessing = 0
-                    if deltaTime > self.maxTimeStep:
-                        self.flagResetProcessing = 1
-                        #self.nReadBlocks = 0
-                    return 1
                 def __searchFilesOnLine(self, path, startDateTime=None, endDateTime=None, expLabel = "", ext = None):
                     """
                     Busca el ultimo archivo de la ultima carpeta (determinada o no por startDateTime) y
                     devuelve el archivo encontrado ademas de otros datos.
                     Input:
                         path             :    carpeta donde estan contenidos los files que contiene data
                         startDateTime    :    punto especifico en el tiempo del cual se requiere la data
                         ext              :    extension de los files
                     Return:
                         year        :    el anho
                         doy         :    el numero de dia del anho
                         set         :    el set del archivo
                         filename    :    el ultimo file de una determinada carpeta
                         directory   :    eL directorio donde esta el file encontrado
                     """
                     dirList = []
                     pathList = []
                     directory = None
                     for thisPath in os.listdir(path):
                         if os.path.isdir(os.path.join(path,thisPath)):
                             dirList.append(thisPath)
                     if not(dirList):
                         return None, None, None, None, None
                     dirList = sorted( dirList, key=str.lower )
                     if startDateTime:
                         thisDateTime = startDateTime
                         if endDateTime == None: endDateTime = startDateTime
                         while(thisDateTime <= endDateTime):
                             year = thisDateTime.timetuple().tm_year
                             doy = thisDateTime.timetuple().tm_yday
                             match = fnmatch.filter(dirList, '?' + '%4.4d%3.3d' % (year,doy))
                             if len(match) == 0:
                                 thisDateTime += datetime.timedelta(1)
                                 continue
                             pathList.append(os.path.join(path,match[0], expLabel))
                             thisDateTime += datetime.timedelta(1)
                         if not(pathList):
                             print "\tNo files in range: %s - %s" %(startDateTime.ctime(), endDateTime.ctime())
                             return None, None, None, None, None
                         directory = pathList[0]
                     else:
                         directory = dirList[-1]
                         directory = os.path.join(path,directory)
                     filename = getlastFileFromPath(directory, ext)
                     if not(filename):
                         return None, None, None, None, None
                     if not(self.__verifyFile(os.path.join(directory, filename))):
                         return None, None, None, None, None
                     year = int( filename[1:5] )
                     doy  = int( filename[5:8] )
                     set  = int( filename[8:11] )
                     return directory, filename, year, doy, set
                 def __searchFilesOffLine(self, path, startDateTime, endDateTime, set=None, expLabel = "", ext = ".r"):
                     """
                     Realiza una busqueda de los archivos que coincidan con los parametros
                     especificados y se encuentren ubicados en el path indicado. Para realizar una busqueda
                     correcta la estructura de directorios debe ser la siguiente:
                     ...path/D[yyyy][ddd]/expLabel/D[yyyy][ddd][sss].ext
                     [yyyy]: anio
                     [ddd] : dia del anio
                     [sss] : set del archivo
                     Inputs:
                         path           :    Directorio de datos donde se realizara la busqueda. Todos los
                                             ficheros que concidan con el criterio de busqueda seran
                                             almacenados en una lista y luego retornados.
                         startDateTime  :    Fecha inicial. Rechaza todos los archivos donde
                                             file end time < startDateTime (obejto datetime.datetime)
                         endDateTime    :    Fecha final. Rechaza todos los archivos donde
                                             file start time > endDateTime (obejto datetime.datetime)
                         set            :    Set del primer archivo a leer. Por defecto None
                         expLabel       :    Nombre del subdirectorio de datos.  Por defecto ""
                         ext            :    Extension de los archivos a leer. Por defecto .r
                     Return:
                         (pathList, filenameList)
                         pathList        :    Lista de directorios donde se encontraron archivos dentro
                                              de los parametros especificados
                         filenameList    :    Lista de archivos (ruta completa) que coincidieron con los
                                              parametros especificados.
                     Variables afectadas:
                         self.filenameList:    Lista de archivos (ruta completa) que la clase utiliza
                                               como fuente para leer los bloque de datos, si se termina
                                               de leer todos los bloques de datos de un determinado
                                               archivo se pasa al siguiente archivo de la lista.
                     Excepciones:
                     """
                     print "Searching files ..."
                     dirList = []
                     for thisPath in os.listdir(path):
                         if os.path.isdir(os.path.join(path,thisPath)):
                             dirList.append(thisPath)
                     if not(dirList):
                         return None, None
                     pathList = []
                     thisDateTime = startDateTime
                     while(thisDateTime <= endDateTime):
                         year = thisDateTime.timetuple().tm_year
                         doy = thisDateTime.timetuple().tm_yday
                         match = fnmatch.filter(dirList, '?' + '%4.4d%3.3d' % (year,doy))
                         if len(match) == 0:
                             thisDateTime += datetime.timedelta(1)
                             continue
                         pathList.append(os.path.join(path,match[0],expLabel))
                         thisDateTime += datetime.timedelta(1)
                     startUtSeconds = time.mktime(startDateTime.timetuple())
                     endUtSeconds = time.mktime(endDateTime.timetuple())
                     filenameList = []
                     for thisPath in pathList:
                         fileList = glob.glob1(thisPath, "*%s" %ext)
                         fileList.sort()
                         for file in fileList:
                             filename = os.path.join(thisPath,file)
                             if isThisFileinRange(filename, startUtSeconds, endUtSeconds):
                                 filenameList.append(filename)
                     if not(filenameList):
                         return None, None
                     self.filenameList = filenameList
                     return pathList, filenameList
                 def __verifyFile(self, filename, msgFlag=True):
                     """
                     Verifica que el filename tenga data valida, para ello leo el FirstHeader del file
                     Return:
 :    file no valido para ser leido
 :    file valido para ser leido
                     """
                     m_BasicHeader = BasicHeader()
                     m_SystemHeader = SystemHeader()
                     m_RadarControllerHeader = RadarControllerHeader()
                     m_ProcessingHeader = ProcessingHeader()
                     flagFileOK = False
                     try:
                         fp = open( filename,'rb' ) #lectura binaria
                     except:
                         if msgFlag:
                             print "The file %s can't be opened" % (filename)
                     try:
                         if not( m_BasicHeader.read(fp) ): raise ValueError
                         if not( m_SystemHeader.read(fp) ): raise ValueError
                         if not( m_RadarControllerHeader.read(fp) ): raise ValueError
                         if not( m_ProcessingHeader.read(fp) ): raise ValueError
                         data_type = int(numpy.log2((m_ProcessingHeader.processFlags & PROCFLAG.DATATYPE_MASK))-numpy.log2(PROCFLAG.DATATYPE_CHAR))
                         if m_BasicHeader.size > self.basicHeaderSize:
                             flagFileOK = True
                     except:
                         if msgFlag:
                             print "\tThe file %s is empty or it hasn't enough data" % filename
                     fp.close()
                     if not(flagFileOK):
                         return 0
                     return 1
+                def updateDataHeader(self):
+                    self.m_DataObj.m_BasicHeader = self.m_BasicHeader.copy()
+                    self.m_DataObj.m_ProcessingHeader = self.m_ProcessingHeader.copy()
+                    self.m_DataObj.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
+                    self.m_DataObj.m_SystemHeader = self.m_SystemHeader.copy()
+                    self.m_DataObj.updateObjFromHeader()
                 def setup(self, path, startDateTime=None, endDateTime=None, set=0, expLabel = "", ext = None, online = 0):
                     """
                     setup configura los parametros de lectura de la clase DataReader.
                     Si el modo de lectura es offline, primero se realiza una busqueda de todos los archivos
                     que coincidan con los parametros especificados; esta lista de archivos son almacenados en
                     self.filenameList.
                     Input:
                         path                :    Directorios donde se ubican los datos a leer. Dentro de este
                                                  directorio deberia de estar subdirectorios de la forma:
                                                  path/D[yyyy][ddd]/expLabel/P[yyyy][ddd][sss][ext]
                         startDateTime       :    Fecha inicial. Rechaza todos los archivos donde
                                                  file end time < startDatetime (obejto datetime.datetime)
                         endDateTime         :    Fecha final. Si no es None, rechaza todos los archivos donde
                                                  file end time < startDatetime (obejto datetime.datetime)
                         set                 :    Set del primer archivo a leer. Por defecto None
                         expLabel            :    Nombre del subdirectorio de datos.  Por defecto ""
                         ext                 :    Extension de los archivos a leer. Por defecto .r
                         online              :    Si es == a 0 entonces busca files que cumplan con las condiciones dadas
                     Return:
 :    Si no encuentra files que cumplan con las condiciones dadas
 :    Si encuentra files que cumplan con las condiciones dadas
                     Affected:
                         self.startUTCSeconds
                         self.endUTCSeconds
                         self.startYear
                         self.endYear
                         self.startDoy
                         self.endDoy
                         self.pathList
                         self.filenameList
                         self.online
                     """
                     if ext == None:
                         ext = self.ext
                     if online:
                         print "Searching files ..."
                         doypath, file, year, doy, set = self.__searchFilesOnLine(path, startDateTime, endDateTime, expLabel, ext)
                         if not(doypath):
                             for nTries in range( self.nTries ):
                                 print '\tWaiting %0.2f sec for valid file in %s: try %02d ...' % (self.delay, path, nTries+1)
                                 time.sleep( self.delay )
                                 doypath, file, year, doy, set = self.__searchFilesOnLine(path, startDateTime, endDateTime, expLabel, ext)
                                 if doypath:
                                     break
                         if not(doypath):
                             print "There 'isn't valied files in %s" % path
                             return 0
                         self.year = year
                         self.doy  = doy
                         self.set  = set - 1
                         self.path = path
                     else: # offline
                         pathList, filenameList = self.__searchFilesOffLine(path, startDateTime, endDateTime, set, expLabel, ext)
                         if not(pathList):
                             print "No files in range: %s - %s" %(startDateTime.ctime(), endDateTime.ctime())
                             return 0
                         self.fileIndex = -1
                         self.pathList = pathList
                         self.filenameList = filenameList
                     self.online = online
                     self.ext = ext
                     ext = ext.lower()
                     if not( self.setNextFile() ):
                         if (startDateTime != None) and (endDateTime != None):
                             print "No files in range: %s - %s" %(startDateTime.ctime(), endDateTime.ctime())
                         elif startDateTime != None:
                             print "No files in : %s" % startDateTime.ctime()
                         else:
                             print "No files"
                         return 0
                     if startDateTime != None:
                         self.startUTCSeconds = time.mktime(startDateTime.timetuple())
                         self.startYear = startDateTime.timetuple().tm_year
                         self.startDoy = startDateTime.timetuple().tm_yday
                     if endDateTime != None:
                         self.endUTCSeconds = time.mktime(endDateTime.timetuple())
                         self.endYear = endDateTime.timetuple().tm_year
                         self.endDoy = endDateTime.timetuple().tm_yday
                     #call fillHeaderValues() - to Data Object
-                    self.m_DataObj.m_BasicHeader = self.m_BasicHeader.copy()
+                    self.updateDataHeader()
-                    self.m_DataObj.m_ProcessingHeader = self.m_ProcessingHeader.copy()
-                    self.m_DataObj.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
-                    self.m_DataObj.m_SystemHeader = self.m_SystemHeader.copy()
-                    self.m_DataObj.dataType = self.dataType
-                    return 1
-                def readNextBlock(self):
-                    """
-                    Establece un nuevo bloque de datos a leer y los lee, si es que no existiese
-                    mas bloques disponibles en el archivo actual salta al siguiente.
-                    Affected:
-                        self.lastUTTime
-                    Return: None
-                    """
-                    if not(self.__setNewBlock()):
-                        return 0
-                    if not(self.readBlock()):
-                        return 0
-                    self.lastUTTime = self.m_BasicHeader.utc
                     return 1
+            class JRODataWriter(JRODataIO):
-            class JRODataWriter(DataWriter):
                 """
                 Esta clase permite escribir datos a archivos procesados (.r o ,pdata). La escritura
                 de los datos siempre se realiza por bloques.
                 """
-                m_BasicHeader = BasicHeader()
-                m_SystemHeader = SystemHeader()
-                m_RadarControllerHeader = RadarControllerHeader()
-                m_ProcessingHeader = ProcessingHeader()
-                fp = None
-                blocksCounter = 0
-                flagIsNewFile = 1
-                nWriteBlocks = 0
-                flagIsNewBlock = 0
-                flagNoMoreFiles = 0
-                m_DataObj = None
-                fp = None
-                blocksCounter = 0
-                flagIsNewFile = 1
                 nWriteBlocks = 0
-                flagIsNewBlock = 0
-                flagNoMoreFiles = 0
                 setFile = None
-                dataType = None
-                path = None
-                noMoreFiles = 0
-                filename = None
-                channelList = None
                 def __init__(self, m_DataObj=None):
                     raise ValueError, "Not implemented"
                 def hasAllDataInBuffer(self):
                     raise ValueError, "Not implemented"
                 def setBlockDimension(self):
                     raise ValueError, "Not implemented"
                 def writeBlock(self):
                     raise ValueError, "No implemented"
                 def putData(self):
                     raise ValueError, "No implemented"
                 def __writeFirstHeader(self):
                     """
                     Escribe el primer header del file es decir el Basic header y el Long header (SystemHeader, RadarControllerHeader, ProcessingHeader)
                     Affected:
                         __dataType
                     Return:
                         None
                     """
                     self.__writeBasicHeader()
                     self.__wrSystemHeader()
                     self.__wrRadarControllerHeader()
                     self.__wrProcessingHeader()
                     self.dataType = self.m_DataObj.dataType
                 def __writeBasicHeader(self, fp=None):
                     """
                     Escribe solo el Basic header en el file creado
                     Return:
                         None
                     """
                     if fp == None:
                         fp = self.fp
                     self.m_DataObj.m_BasicHeader.write(fp)
                 def __wrSystemHeader(self, fp=None):
                     """
                     Escribe solo el System header en el file creado
                     Return:
                         None
                     """
                     if fp == None:
                         fp = self.fp
                     self.m_DataObj.m_SystemHeader.write(fp)
                 def __wrRadarControllerHeader(self, fp=None):
                     """
                     Escribe solo el RadarController header en el file creado
                     Return:
                         None
                     """
                     if fp == None:
                         fp = self.fp
                     self.m_DataObj.m_RadarControllerHeader.write(fp)
                 def __wrProcessingHeader(self, fp=None):
                     """
                     Escribe solo el Processing header en el file creado
                     Return:
                         None
                     """
                     if fp == None:
                         fp = self.fp
                     self.m_DataObj.m_ProcessingHeader.write(fp)
                 def setNextFile(self):
                     """
                     Determina el siguiente file que sera escrito
                     Affected:
                         self.filename
                         self.subfolder
                         self.fp
                         self.setFile
                         self.flagIsNewFile
                     Return:
 :    Si el archivo no puede ser escrito
 :    Si el archivo esta listo para ser escrito
                     """
                     ext = self.ext
                     path = self.path
                     if self.fp != None:
                         self.fp.close()
                     timeTuple = time.localtime( self.m_DataObj.m_BasicHeader.utc )
                     subfolder = 'D%4.4d%3.3d' % (timeTuple.tm_year,timeTuple.tm_yday)
-                    tmp = os.path.join( path, subfolder )
+                    doypath = os.path.join( path, subfolder )
-                    if not( os.path.exists(tmp) ):
+                    if not( os.path.exists(doypath) ):
-                        os.mkdir(tmp)
+                        os.mkdir(doypath)
                         self.setFile = -1 #inicializo mi contador de seteo
                     else:
-                        filesList = os.listdir( tmp )
+                        filesList = os.listdir( doypath )
                         if len( filesList ) > 0:
                             filesList = sorted( filesList, key=str.lower )
                             filen = filesList[-1]
                             # el filename debera tener el siguiente formato
                             # 0 1234 567 89A BCDE (hex)
                             # x YYYY DDD SSS .ext
                             if isNumber( filen[8:11] ):
                                 self.setFile = int( filen[8:11] ) #inicializo mi contador de seteo al seteo del ultimo file
                             else:
                                 self.setFile = -1
                         else:
                             self.setFile = -1 #inicializo mi contador de seteo
                     setFile = self.setFile
                     setFile += 1
                     file = '%s%4.4d%3.3d%3.3d%s' % (self.optchar,
                                                     timeTuple.tm_year,
                                                     timeTuple.tm_yday,
                                                     setFile,
                                                     ext )
                     filename = os.path.join( path, subfolder, file )
                     fp = open( filename,'wb' )
-                    self.blocksCounter = 0
+                    self.nWriteBlocks = 0
                     #guardando atributos
                     self.filename = filename
                     self.subfolder = subfolder
                     self.fp = fp
                     self.setFile = setFile
                     self.flagIsNewFile = 1
                     print 'Writing the file: %s'%self.filename
                     self.__writeFirstHeader()
                     return 1
                 def __setNewBlock(self):
                     """
                     Si es un nuevo file escribe el First Header caso contrario escribe solo el Basic Header
                     Return:
 :    si no pudo escribir nada
 :    Si escribio el Basic el First Header
                     """
                     if self.fp == None:
                         self.setNextFile()
                     if self.flagIsNewFile:
                         return 1
-                    if self.blocksCounter < self.m_ProcessingHeader.dataBlocksPerFile:
+                    if self.nWriteBlocks < self.m_ProcessingHeader.dataBlocksPerFile:
                         self.__writeBasicHeader()
                         return 1
                     if not( self.setNextFile() ):
                         return 0
                     return 1
                 def writeNextBlock(self):
                     """
                     Selecciona el bloque siguiente de datos y los escribe en un file
                     Return:
 :    Si no hizo pudo escribir el bloque de datos
 :    Si no pudo escribir el bloque de datos
                     """
                     if not( self.__setNewBlock() ):
                         return 0
                     self.writeBlock()
                     return 1
-                def getHeader(self):
+                def getDataHeader(self):
                     """
                     Obtiene una copia del First Header
                     Affected:
                         self.m_BasicHeader
                         self.m_SystemHeader
                         self.m_RadarControllerHeader
                         self.m_ProcessingHeader
                         self.dataType
                     Return:
                         None
                     """
+                    self.m_DataObj.updateHeaderFromObj()
                     self.m_BasicHeader = self.m_DataObj.m_BasicHeader.copy()
                     self.m_SystemHeader = self.m_DataObj.m_SystemHeader.copy()
                     self.m_RadarControllerHeader = self.m_DataObj.m_RadarControllerHeader.copy()
                     self.m_ProcessingHeader = self.m_DataObj.m_ProcessingHeader.copy()
                     self.dataType = self.m_DataObj.dataType
                 def setup(self, path, set=0, ext=None):
                     """
                     Setea el tipo de formato en la cual sera guardada la data y escribe el First Header
                     Inputs:
                         path      :    el path destino en el cual se escribiran los files a crear
                         format    :    formato en el cual sera salvado un file
                         set       :    el setebo del file
                     Return:
 :    Si no realizo un buen seteo
 :    Si realizo un buen seteo
                     """
                     if ext == None:
                         ext = self.ext
                     ext = ext.lower()
                     self.path = path
                     self.setFile = set - 1
                     self.ext = ext
                     #self.format = format
-                    self.getHeader()
+                    self.getDataHeader()
                     self.setBlockDimension()
                     if not( self.setNextFile() ):
                         print "There isn't a next file"
                         return 0
                     return 1

schainpy/IO/SpectraIO.py +17 -47

             '''
             File: SpectraIO.py
             Created on 20/02/2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import numpy
             import glob
             import fnmatch
             import time, datetime
             path = os.path.split(os.getcwd())[0]
             sys.path.append(path)
             from Model.JROHeader import *
             from Model.Spectra import Spectra
-            from DataIO import JRODataReader
+            from JRODataIO import JRODataReader
-            from DataIO import JRODataWriter
+            from JRODataIO import JRODataWriter
-            from DataIO import isNumber
+            from JRODataIO import isNumber
             class SpectraReader( JRODataReader ):
                 """
                 Esta clase permite leer datos de espectros desde archivos procesados (.pdata). La lectura
                 de los datos siempre se realiza por bloques. Los datos leidos (array de 3 dimensiones)
                 son almacenados en tres buffer's para el Self Spectra, el Cross Spectra y el DC Channel.
                                     paresCanalesIguales    * alturas * perfiles  (Self Spectra)
                                     paresCanalesDiferentes * alturas * perfiles  (Cross Spectra)
                                     canales * alturas                            (DC Channels)
                 Esta clase contiene instancias (objetos) de las clases BasicHeader, SystemHeader,
                 RadarControllerHeader y Spectra. Los tres primeros se usan para almacenar informacion de la
                 cabecera de datos (metadata), y el cuarto (Spectra) para obtener y almacenar un bloque de
                 datos desde el "buffer" cada vez que se ejecute el metodo "getData".
                 Example:
                     dpath = "/home/myuser/data"
                     startTime = datetime.datetime(2010,1,20,0,0,0,0,0,0)
                     endTime = datetime.datetime(2010,1,21,23,59,59,0,0,0)
                     readerObj = SpectraReader()
                     readerObj.setup(dpath, startTime, endTime)
                     while(True):
                         readerObj.getData()
                         print readerObj.m_Spectra.data
                         if readerObj.flagNoMoreFiles:
                             break
                 """
                 m_DataObj = None
                 data_spc = None
                 data_cspc = None
                 data_dc = None
                 pts2read_SelfSpectra = 0
                 pts2read_CrossSpectra = 0
                 pts2read_DCchannels = 0
                 nChannels = 0
                 nPairs = 0
                 #pairList = None
                 channelList = None
                 def __init__(self, m_Spectra=None):
                     """
                     Inicializador de la clase SpectraReader para la lectura de datos de espectros.
                     Inputs:
                         m_Spectra    :    Objeto de la clase Spectra. Este objeto sera utilizado para
                                           almacenar un perfil de datos cada vez que se haga un requerimiento
                                           (getData). El perfil sera obtenido a partir del buffer de datos,
                                           si el buffer esta vacio se hara un nuevo proceso de lectura de un
                                           bloque de datos.
                                           Si este parametro no es pasado se creara uno internamente.
                     Affected:
                         self.m_DataObj
                     Return      : None
                     """
                     if m_Spectra == None:
                         m_Spectra = Spectra()
                     if not( isinstance(m_Spectra, Spectra) ):
                         raise ValueError, "in SpectraReader, m_Spectra must be an Spectra class object"
                     self.m_DataObj = m_Spectra
                     self.data_spc = None
                     self.data_cspc = None
                     self.data_dc = None
                     self.pts2read_SelfSpectra = 0
                     self.pts2read_CrossSpectra = 0
                     self.pts2read_DCs = 0
                     self.nChannels = 0
                     self.nPairs = 0
                     self.ext = ".pdata"
                     self.optchar = "P"
                     ######################
                     self.m_BasicHeader = BasicHeader()
                     self.m_SystemHeader = SystemHeader()
                     self.m_RadarControllerHeader = RadarControllerHeader()
                     self.m_ProcessingHeader = ProcessingHeader()
                     self.online = 0
                     self.fp = None
                     self.fileSizeByHeader = None
                     self.filenameList = []
                     self.filename = None
                     self.fileSize = None
                     self.firstHeaderSize = 0
                     self.basicHeaderSize = 24
                     self.dataType = None
                     self.maxTimeStep = 30
                     self.flagNoMoreFiles = 0
                     self.set = 0
                     self.path = None
                     self.delay  = 3  #seconds
                     self.nTries = 3  #quantity tries
                     self.nFiles = 3  #number of files for searching
-                    self.nBlocks = 0
+                    self.nReadBlocks = 0
                     self.flagIsNewFile = 1
                     self.ippSeconds = 0
                     self.flagResetProcessing = 0
                     self.flagIsNewBlock = 0
-                    self.nReadBlocks = 0
+                    self.nTotalBlocks = 0
                     self.blocksize = 0
                     #pairList = None
                     channelList = None
                 def __hasNotDataInBuffer(self):
                     return 1
                 def getBlockDimension(self):
                     """
                     Obtiene la cantidad de puntos a leer por cada bloque de datos
                     Affected:
                         self.nChannels
                         self.nPairs
                         self.pts2read_SelfSpectra
                         self.pts2read_CrossSpectra
                         self.pts2read_DCchannels
                         self.blocksize
                         self.m_DataObj.nChannels
                         self.m_DataObj.nPairs
                     Return:
                         None
                     """
                     self.nChannels = 0
                     self.nPairs = 0
-                    #self.pairList = []
+                    self.pairList = []
                     for i in range( 0, self.m_ProcessingHeader.totalSpectra*2, 2 ):
                         if self.m_ProcessingHeader.spectraComb[i] == self.m_ProcessingHeader.spectraComb[i+1]:
                             self.nChannels = self.nChannels + 1   #par de canales iguales
                         else:
                             self.nPairs = self.nPairs + 1 #par de canales diferentes
-                            #self.pairList.append( (self.m_ProcessingHeader.spectraComb[i], self.m_ProcessingHeader.spectraComb[i+1]) )
+                            self.pairList.append( (self.m_ProcessingHeader.spectraComb[i], self.m_ProcessingHeader.spectraComb[i+1]) )
                     pts2read = self.m_ProcessingHeader.numHeights * self.m_ProcessingHeader.profilesPerBlock
                     self.pts2read_SelfSpectra = int( self.nChannels * pts2read )
                     self.pts2read_CrossSpectra = int( self.nPairs * pts2read )
                     self.pts2read_DCchannels = int( self.m_SystemHeader.numChannels * self.m_ProcessingHeader.numHeights )
                     self.blocksize = self.pts2read_SelfSpectra + self.pts2read_CrossSpectra + self.pts2read_DCchannels
-                    self.m_DataObj.nPoints = self.m_ProcessingHeader.profilesPerBlock
-                    self.m_DataObj.nChannels = self.nChannels
-                    self.m_DataObj.nPairs = self.nPairs
-                    #self.pairList = tuple( self.pairList )
                     self.channelList = numpy.arange( self.nChannels )
                 def readBlock(self):
                     """
                     Lee el bloque de datos desde la posicion actual del puntero del archivo
                     (self.fp) y actualiza todos los parametros relacionados al bloque de datos
                     (metadata + data). La data leida es almacenada en el buffer y el contador del buffer
                     es seteado a 0
                     Return: None
                     Variables afectadas:
                         self.datablockIndex
                         self.flagIsNewFile
                         self.flagIsNewBlock
-                        self.nReadBlocks
+                        self.nTotalBlocks
                         self.data_spc
                         self.data_cspc
                         self.data_dc
                     Exceptions:
                         Si un bloque leido no es un bloque valido
                     """
                     blockOk_flag = False
                     fpointer = self.fp.tell()
                     spc = numpy.fromfile( self.fp, self.dataType[0], self.pts2read_SelfSpectra )
                     cspc = numpy.fromfile( self.fp, self.dataType, self.pts2read_CrossSpectra )
                     dc = numpy.fromfile( self.fp, self.dataType, self.pts2read_DCchannels ) #int(self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels) )
-                    if self.online:
-                        if (spc.size + cspc.size + dc.size) != self.blocksize:
-                            for nTries in range( self.nTries ):
-                                print "\tWaiting %0.2f sec for the next block, try %03d ..." % (self.delay, nTries+1)
-                                time.sleep( self.delay )
-                                self.fp.seek( fpointer )
-                                fpointer = self.fp.tell()
-                                spc = numpy.fromfile( self.fp, self.dataType[0], self.pts2read_SelfSpectra )
-                                cspc = numpy.fromfile( self.fp, self.dataType, self.pts2read_CrossSpectra )
-                                dc = numpy.fromfile( self.fp, self.dataType, self.pts2read_DCchannels ) #int(self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels) )
-                                if (spc.size + cspc.size + dc.size) == self.blocksize:
-                                    blockOk_flag = True
-                                    break
-                            if not( blockOk_flag ):
-                                return 0
                     try:
                         spc = spc.reshape( (self.nChannels, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D
                         if self.nPairs != 0:
                             cspc = cspc.reshape( (self.nPairs, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D
                         else:
                             cspc = None
                         dc = dc.reshape( (self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D
                     except:
                         print "Data file %s is invalid" % self.filename
                         return 0
                     if not( self.m_ProcessingHeader.shif_fft ):
                         spc = numpy.roll( spc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                         if cspc != None:
                             cspc = numpy.roll( cspc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                     spc = numpy.transpose( spc, (0,2,1) )
                     if cspc != None: cspc = numpy.transpose( cspc, (0,2,1) )
                     self.data_spc = spc
                     if cspc != None:
                         self.data_cspc = cspc['real'] + cspc['imag']*1j
                     else:
                         self.data_cspc = None
                     self.data_dc = dc['real'] + dc['imag']*1j
                     self.datablockIndex = 0
                     self.flagIsNewFile = 0
                     self.flagIsNewBlock = 1
+                    self.nTotalBlocks += 1
                     self.nReadBlocks += 1
-                    self.nBlocks += 1
                     return 1
                 def getData(self):
                     """
                     Copia el buffer de lectura a la clase "Spectra",
                     con todos los parametros asociados a este (metadata). cuando no hay datos en el buffer de
                     lectura es necesario hacer una nueva lectura de los bloques de datos usando "readNextBlock"
                     Return:
 :    Si no hay mas archivos disponibles
 :    Si hizo una buena copia del buffer
                     Affected:
                         self.m_DataObj
                         self.datablockIndex
                         self.flagResetProcessing
                         self.flagIsNewBlock
                     """
                     if self.flagNoMoreFiles: return 0
                     self.flagResetProcessing = 0
                     self.flagIsNewBlock = 0
                     if self.__hasNotDataInBuffer():
                         if not( self.readNextBlock() ):
-                            self.setNextFile()
                             return 0
-                        self.m_DataObj.m_BasicHeader = self.m_BasicHeader.copy()
+                        self.updateDataHeader()
-                        self.m_DataObj.m_ProcessingHeader = self.m_ProcessingHeader.copy()
-                        self.m_DataObj.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
-                        self.m_DataObj.m_SystemHeader = self.m_SystemHeader.copy()
-                        self.m_DataObj.heightList = self.heightList
-                        self.m_DataObj.dataType = self.dataType
                     if self.flagNoMoreFiles == 1:
                         print 'Process finished'
                         return 0
                     #data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
                     if self.data_dc == None:
                         self.m_DataObj.flagNoData = True
                         return 0
                     self.m_DataObj.flagNoData = False
                     self.m_DataObj.flagResetProcessing = self.flagResetProcessing
                     self.m_DataObj.data_spc = self.data_spc
                     self.m_DataObj.data_cspc = self.data_cspc
                     self.m_DataObj.data_dc = self.data_dc
                     return 1
             class SpectraWriter(JRODataWriter):
                 """
                 Esta clase permite escribir datos de espectros a archivos procesados (.pdata). La escritura
                 de los datos siempre se realiza por bloques.
                 """
                 m_DataObj = None
                 shape_spc_Buffer = None
                 shape_cspc_Buffer = None
                 shape_dc_Buffer = None
                 data_spc = None
                 data_cspc = None
                 data_dc = None
                 def __init__(self, m_Spectra=None):
                     """
                     Inicializador de la clase SpectraWriter para la escritura de datos de espectros.
                     Affected:
                         self.m_DataObj
                         self.m_BasicHeader
                         self.m_SystemHeader
                         self.m_RadarControllerHeader
                         self.m_ProcessingHeader
                     Return: None
                     """
                     if m_Spectra == None:
                         m_Spectra = Spectra()
                     if not( isinstance(m_Spectra, Spectra) ):
                         raise ValueError, "in SpectraReader, m_Spectra must be an Spectra class object"
                     self.m_DataObj = m_Spectra
                     self.ext = ".pdata"
                     self.optchar = "P"
                     self.shape_spc_Buffer = None
                     self.shape_cspc_Buffer = None
                     self.shape_dc_Buffer = None
                     self.data_spc = None
                     self.data_cspc = None
                     self.data_dc = None
                     ####################################
                     self.fp = None
-                    self.blocksCounter = 0
+                    self.nWriteBlocks = 0
                     self.flagIsNewFile = 1
-                    self.nWriteBlocks = 0
+                    self.nTotalBlocks = 0
                     self.flagIsNewBlock = 0
                     self.flagNoMoreFiles = 0
                     self.setFile = None
                     self.dataType = None
                     self.path = None
                     self.noMoreFiles = 0
                     self.filename = None
                     self.m_BasicHeader= BasicHeader()
                     self.m_SystemHeader = SystemHeader()
                     self.m_RadarControllerHeader = RadarControllerHeader()
                     self.m_ProcessingHeader = ProcessingHeader()
                 def hasAllDataInBuffer(self):
                     return 1
                 def setBlockDimension(self):
                     """
                     Obtiene las formas dimensionales del los subbloques de datos que componen un bloque
                     Affected:
                         self.shape_spc_Buffer
                         self.shape_cspc_Buffer
                         self.shape_dc_Buffer
                     Return: None
                     """
                     self.shape_spc_Buffer = (self.m_DataObj.nChannels,
                                              self.m_ProcessingHeader.numHeights,
                                              self.m_ProcessingHeader.profilesPerBlock)
                     self.shape_cspc_Buffer = (self.m_DataObj.nPairs,
                                               self.m_ProcessingHeader.numHeights,
                                               self.m_ProcessingHeader.profilesPerBlock)
                     self.shape_dc_Buffer = (self.m_SystemHeader.numChannels,
                                             self.m_ProcessingHeader.numHeights)
                 def writeBlock(self):
                     """
                     Escribe el buffer en el file designado
                     Affected:
                         self.data_spc
                         self.data_cspc
                         self.data_dc
                         self.flagIsNewFile
                         self.flagIsNewBlock
-                        self.nWriteBlocks
+                        self.nTotalBlocks
-                        self.blocksCounter
+                        self.nWriteBlocks
                     Return: None
                     """
                     spc = numpy.transpose( self.data_spc, (0,2,1) )
                     if not( self.m_ProcessingHeader.shif_fft ):
                         spc = numpy.roll( spc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                     data = spc.reshape((-1))
                     data.tofile(self.fp)
                     if self.data_cspc != None:
                         data = numpy.zeros( self.shape_cspc_Buffer, self.dataType )
                         cspc = numpy.transpose( self.data_cspc, (0,2,1) )
                         if not( self.m_ProcessingHeader.shif_fft ):
                             cspc = numpy.roll( cspc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                         data['real'] = cspc.real
                         data['imag'] = cspc.imag
                         data = data.reshape((-1))
                         data.tofile(self.fp)
                     data = numpy.zeros( self.shape_dc_Buffer, self.dataType )
                     dc = self.data_dc
                     data['real'] = dc.real
                     data['imag'] = dc.imag
                     data = data.reshape((-1))
                     data.tofile(self.fp)
                     self.data_spc.fill(0)
                     self.data_dc.fill(0)
                     if self.data_cspc != None:
                         self.data_cspc.fill(0)
                     self.flagIsNewFile = 0
                     self.flagIsNewBlock = 1
+                    self.nTotalBlocks += 1
                     self.nWriteBlocks += 1
-                    self.blocksCounter += 1
                 def putData(self):
                     """
                     Setea un bloque de datos y luego los escribe en un file
                     Affected:
                         self.data_spc
                         self.data_cspc
                         self.data_dc
                     Return:
 :    Si no hay data o no hay mas files que puedan escribirse
 :    Si se escribio la data de un bloque en un file
                     """
                     self.flagIsNewBlock = 0
                     if self.m_DataObj.flagNoData:
                         return 0
                     if self.m_DataObj.flagResetProcessing:
                         self.data_spc.fill(0)
                         self.data_cspc.fill(0)
                         self.data_dc.fill(0)
                         self.setNextFile()
                     self.data_spc = self.m_DataObj.data_spc
                     self.data_cspc = self.m_DataObj.data_cspc
                     self.data_dc = self.m_DataObj.data_dc
                     # #self.m_ProcessingHeader.dataBlocksPerFile)
                     if self.hasAllDataInBuffer():
-                        self.getHeader()
+                        self.getDataHeader()
                         self.writeNextBlock()
                     if self.flagNoMoreFiles:
                         #print 'Process finished'
                         return 0
                     return 1

schainpy/IO/TestIO.py +1 -1

             '''
             Created on 23/01/2012
             @author $Author$
             @version $Id$
             '''
             import os
             import sys
             import datetime
             import time
             class TestIO():
                 def __init__(self):
                     self.setValues()
                     self.createVoltageObjects()
                     self.testReadVoltage()
                     pass
                 def setValues(self):
                     self.path = '/Users/danielangelsuarezmunoz/Documents/Projects/testWR'
                     self.startDateTime = datetime.datetime(2007,5,1,17,49,0)
                     self.endDateTime = datetime.datetime(2007,5,1,18,15,0)
                 def createVoltageObjects(self):
                     path = os.path.split(os.getcwd())[0]
                     sys.path.append(path)
                     from IO.VoltageIO import VoltageReader
                     from IO.VoltageIO import VoltageWriter
                     from Model.Voltage import Voltage
                     self.voltageModelObj = Voltage()
                     self.voltageReaderObj = VoltageReader(self.voltageModelObj)
                     self.voltageReaderObj.setup(self.path, self.startDateTime, self.endDateTime)
             #        self.voltageWriterObj = VoltageWriter(self.voltageModelObj)
             #        self.voltageWriterObj.setup('/Users/danielangelsuarezmunoz/Documents/Projects/testWR')
                 def testReadVoltage(self):
                     while(not(self.voltageReaderObj.noMoreFiles)):
                         self.voltageReaderObj.getData()
                         if self.voltageReaderObj.flagResetProcessing:
                             print 'jump'
                         if self.voltageReaderObj.flagIsNewBlock:
-                            print 'Block No %04d, Time: %s'%(self.voltageReaderObj.nReadBlocks,
+                            print 'Block No %04d, Time: %s'%(self.voltageReaderObj.nTotalBlocks,
                                                              datetime.datetime.fromtimestamp(self.voltageReaderObj.m_BasicHeader.utc))
             #            self.voltageWriterObj.putData()
             if __name__ == '__main__':
                 TestIO()

schainpy/IO/VoltageIO.py +35 -77

             '''
             Created on 23/01/2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import numpy
             import glob
             import fnmatch
             import time, datetime
             path = os.path.split(os.getcwd())[0]
             sys.path.append(path)
             from Model.JROHeader import *
             from Model.Voltage import Voltage
-            from IO.DataIO import JRODataReader
+            from IO.JRODataIO import JRODataReader
-            from IO.DataIO import JRODataWriter
+            from IO.JRODataIO import JRODataWriter
             class VoltageReader(JRODataReader):
                 """
                 Esta clase permite leer datos de voltage desde archivos en formato rawdata (.r). La lectura
                 de los datos siempre se realiza por bloques. Los datos leidos (array de 3 dimensiones:
                 perfiles*alturas*canales) son almacenados en la variable "buffer".
                                          perfiles * alturas * canales
                 Esta clase contiene instancias (objetos) de las clases BasicHeader, SystemHeader,
                 RadarControllerHeader y Voltage. Los tres primeros se usan para almacenar informacion de la
                 cabecera de datos (metadata), y el cuarto (Voltage) para obtener y almacenar un perfil de
                 datos desde el "buffer" cada vez que se ejecute el metodo "getData".
                 Example:
                     dpath = "/home/myuser/data"
                     startTime = datetime.datetime(2010,1,20,0,0,0,0,0,0)
                     endTime = datetime.datetime(2010,1,21,23,59,59,0,0,0)
                     readerObj = VoltageReader()
                     readerObj.setup(dpath, startTime, endTime)
                     while(True):
                         #to get one profile
                         profile =  readerObj.getData()
                         #print the profile
                         print profile
                         #If you want to see all datablock
                         print readerObj.datablock
                         if readerObj.flagNoMoreFiles:
                             break
                 """
                 m_DataObj = None
-                idProfile = 0
                 datablock = None
-                pts2read = 0
-                utc = 0
                 ext = ".r"
                 optchar = "D"
                 def __init__(self, m_Voltage=None):
                     """
                     Inicializador de la clase VoltageReader para la lectura de datos de voltage.
                     Input:
                         m_Voltage    :    Objeto de la clase Voltage. Este objeto sera utilizado para
                                           almacenar un perfil de datos cada vez que se haga un requerimiento
                                           (getData). El perfil sera obtenido a partir del buffer de datos,
                                           si el buffer esta vacio se hara un nuevo proceso de lectura de un
                                           bloque de datos.
                                           Si este parametro no es pasado se creara uno internamente.
                     Variables afectadas:
                         self.m_DataObj
                     Return:
                         None
                     """
                     if m_Voltage == None:
                         m_Voltage = Voltage()
                     if not(isinstance(m_Voltage, Voltage)):
                         raise ValueError, "in VoltageReader, m_Voltage must be an Voltage class object"
                     self.m_DataObj = m_Voltage
-                    self.idProfile = 0
                     self.datablock = None
-                    self.pts2read = 0
                     self.utc = 0
                     self.ext = ".r"
                     self.optchar = "D"
                     self.m_BasicHeader = BasicHeader()
                     self.m_SystemHeader = SystemHeader()
                     self.m_RadarControllerHeader = RadarControllerHeader()
                     self.m_ProcessingHeader = ProcessingHeader()
                     self.online = 0
                     self.fp = None
                     self.idFile = None
                     self.startDateTime = None
                     self.endDateTime = None
                     self.dataType = None
                     self.fileSizeByHeader = None
                     self.filenameList = []
                     self.filename = None
                     self.fileSize = None
                     self.firstHeaderSize = 0
                     self.basicHeaderSize = 24
                     self.pathList = []
                     self.filenameList = []
                     self.lastUTTime = 0
                     self.maxTimeStep = 30
                     self.flagNoMoreFiles = 0
                     self.set = 0
                     self.path = None
-                    self.datablockIndex = 9999
+                    self.profileIndex = 9999
                     self.delay  = 3   #seconds
                     self.nTries  = 3  #quantity tries
                     self.nFiles = 3   #number of files for searching
-                    self.nBlocks = 0
+                    self.nReadBlocks = 0
                     self.flagIsNewFile = 1
                     self.ippSeconds = 0
                     self.flagResetProcessing = 0
                     self.flagIsNewBlock = 0
-                    self.nReadBlocks = 0
+                    self.nTotalBlocks = 0
                     self.blocksize = 0
                 def __hasNotDataInBuffer(self):
-                    if self.datablockIndex >= self.m_ProcessingHeader.profilesPerBlock:
+                    if self.profileIndex >= self.m_ProcessingHeader.profilesPerBlock:
                         return 1
                     return 0
                 def getBlockDimension(self):
                     """
                     Obtiene la cantidad de puntos a leer por cada bloque de datos
                     Affected:
-                        self.pts2read
                         self.blocksize
                     Return:
                         None
                     """
-                    self.pts2read = self.m_ProcessingHeader.profilesPerBlock * self.m_ProcessingHeader.numHeights * self.m_SystemHeader.numChannels
+                    pts2read = self.m_ProcessingHeader.profilesPerBlock * self.m_ProcessingHeader.numHeights * self.m_SystemHeader.numChannels
-                    self.blocksize = self.pts2read
+                    self.blocksize = pts2read
-                    self.m_DataObj.nProfiles = self.m_ProcessingHeader.profilesPerBlock
                 def readBlock(self):
                     """
                     readBlock lee el bloque de datos desde la posicion actual del puntero del archivo
                     (self.fp) y actualiza todos los parametros relacionados al bloque de datos
                     (metadata + data). La data leida es almacenada en el buffer y el contador del buffer
                     es seteado a 0
                     Inputs:
                         None
                     Return:
                         None
                     Affected:
-                        self.datablockIndex
+                        self.profileIndex
                         self.datablock
                         self.flagIsNewFile
-                        self.idProfile
                         self.flagIsNewBlock
-                        self.nReadBlocks
+                        self.nTotalBlocks
                     Exceptions:
                         Si un bloque leido no es un bloque valido
                     """
-                    blockOk_flag = False
-                    fpointer = self.fp.tell()
+                    junk = numpy.fromfile( self.fp, self.dataType, self.blocksize )
-                    junk = numpy.fromfile( self.fp, self.dataType, self.pts2read )
-                    if self.online:
-                        if junk.size != self.blocksize:
-                            for nTries in range( self.nTries ):
-                                print "\tWaiting %0.2f sec for the next block, try %03d ..." % (self.delay, nTries+1)
-                                time.sleep( self.delay )
-                                self.fp.seek( fpointer )
-                                fpointer = self.fp.tell()
-                                junk = numpy.fromfile( self.fp, self.dataType, self.pts2read )
-                                if junk.size == self.blocksize:
-                                    blockOk_flag = True
-                                    break
-                            if not( blockOk_flag ):
-                                return 0
                     try:
                         junk = junk.reshape( (self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, self.m_SystemHeader.numChannels) )
                     except:
-                        print "Data file %s is invalid" % self.filename
+                        print "The read block (%3d) has not enough data" %self.nReadBlocks
                         return 0
                     junk = numpy.transpose(junk, (2,0,1))
                     self.datablock = junk['real'] + junk['imag']*1j
-                    self.datablockIndex = 0
+                    self.profileIndex = 0
                     self.flagIsNewFile = 0
-                    self.idProfile = 0
                     self.flagIsNewBlock = 1
+                    self.nTotalBlocks += 1
                     self.nReadBlocks += 1
-                    self.nBlocks += 1
                     return 1
                 def getData(self):
                     """
                     getData obtiene una unidad de datos del buffer de lectura y la copia a la clase "Voltage"
                     con todos los parametros asociados a este (metadata). cuando no hay datos en el buffer de
                     lectura es necesario hacer una nueva lectura de los bloques de datos usando "readNextBlock"
                     Ademas incrementa el contador del buffer en 1.
                     Return:
                         data    :    retorna un perfil de voltages (alturas * canales) copiados desde el
                                      buffer. Si no hay mas archivos a leer retorna None.
                     Variables afectadas:
                         self.m_DataObj
-                        self.datablockIndex
+                        self.profileIndex
-                        self.idProfile
                     Affected:
                         self.m_DataObj
-                        self.datablockIndex
+                        self.profileIndex
                         self.flagResetProcessing
                         self.flagIsNewBlock
-                        self.idProfile
                     """
                     if self.flagNoMoreFiles: return 0
                     self.flagResetProcessing = 0
                     self.flagIsNewBlock = 0
                     if self.__hasNotDataInBuffer():
                         if not( self.readNextBlock() ):
-                            self.setNextFile()
                             return 0
-                        self.m_DataObj.m_BasicHeader = self.m_BasicHeader.copy()
+                        self.updateDataHeader()
-                        self.m_DataObj.m_ProcessingHeader = self.m_ProcessingHeader.copy()
-                        self.m_DataObj.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
-                        self.m_DataObj.m_SystemHeader = self.m_SystemHeader.copy()
-                        self.m_DataObj.heightList = self.heightList
-                        self.m_DataObj.dataType = self.dataType
                     if self.flagNoMoreFiles == 1:
                         print 'Process finished'
                         return 0
                     #data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
                     if self.datablock == None:
                         self.m_DataObj.flagNoData = True
                         return 0
-                    time = self.m_BasicHeader.utc + self.datablockIndex * self.ippSeconds
+                    time = self.m_BasicHeader.utc + self.profileIndex * self.ippSeconds
                     self.m_DataObj.m_BasicHeader.utc = time
                     self.m_DataObj.flagNoData = False
                     self.m_DataObj.flagResetProcessing = self.flagResetProcessing
-                    self.m_DataObj.data = self.datablock[:,self.datablockIndex,:]
+                    self.m_DataObj.data = self.datablock[:,self.profileIndex,:]
-                    self.m_DataObj.idProfile = self.idProfile
-                    self.datablockIndex += 1
+                    self.profileIndex += 1
-                    self.idProfile += 1
                     #call setData - to Data Object
                     return 1 #self.m_DataObj.data
             class VoltageWriter( JRODataWriter ):
                 """
                 Esta clase permite escribir datos de voltajes a archivos procesados (.r). La escritura
                 de los datos siempre se realiza por bloques.
                 """
                 __configHeaderFile = 'wrSetHeadet.txt'
                 m_DataObj = None
                 ext = ".r"
                 optchar = "D"
                 datablock = None
-                datablockIndex = 0
+                profileIndex = 0
                 shapeBuffer = None
                 def __init__(self, m_Voltage=None):
                     """
                     Inicializador de la clase VoltageWriter para la escritura de datos de espectros.
                     Affected:
                         self.m_DataObj
                     Return: None
                     """
                     if m_Voltage == None:
                         m_Voltage = Voltage()
                     if not( isinstance(m_Voltage, Voltage) ):
                         raise ValueError, "in VoltageReader, m_Voltage must be an Spectra class object"
                     self.m_DataObj = m_Voltage
                 def hasAllDataInBuffer(self):
-                    if self.datablockIndex >= self.m_ProcessingHeader.profilesPerBlock:
+                    if self.profileIndex >= self.m_ProcessingHeader.profilesPerBlock:
                         return 1
                     return 0
                 def setBlockDimension(self):
                     """
                     Obtiene las formas dimensionales del los subbloques de datos que componen un bloque
                     Affected:
                         self.shape_spc_Buffer
                         self.shape_cspc_Buffer
                         self.shape_dc_Buffer
                     Return: None
                     """
                     self.shapeBuffer = (self.m_ProcessingHeader.profilesPerBlock,
                                         self.m_ProcessingHeader.numHeights,
                                         self.m_SystemHeader.numChannels )
                     self.datablock = numpy.zeros((self.m_SystemHeader.numChannels,
                                                  self.m_ProcessingHeader.profilesPerBlock,
                                                  self.m_ProcessingHeader.numHeights),
                                                  dtype=numpy.dtype('complex'))
                 def writeBlock(self):
                     """
                     Escribe el buffer en el file designado
                     Affected:
-                        self.datablockIndex
+                        self.profileIndex
                         self.flagIsNewFile
                         self.flagIsNewBlock
-                        self.nWriteBlocks
+                        self.nTotalBlocks
-                        self.blocksCounter
+                        self.nWriteBlocks
                     Return: None
                     """
                     data = numpy.zeros( self.shapeBuffer, self.dataType )
                     junk = numpy.transpose(self.datablock, (1,2,0))
                     data['real'] = junk.real
                     data['imag'] = junk.imag
                     data = data.reshape( (-1) )
                     data.tofile( self.fp )
                     self.datablock.fill(0)
-                    self.datablockIndex = 0
+                    self.profileIndex = 0
                     self.flagIsNewFile = 0
                     self.flagIsNewBlock = 1
+                    self.nTotalBlocks += 1
                     self.nWriteBlocks += 1
-                    self.blocksCounter += 1
                 def putData(self):
                     """
                     Setea un bloque de datos y luego los escribe en un file
                     Affected:
                         self.flagIsNewBlock
-                        self.datablockIndex
+                        self.profileIndex
                     Return:
 :    Si no hay data o no hay mas files que puedan escribirse
 :    Si se escribio la data de un bloque en un file
                     """
                     self.flagIsNewBlock = 0
                     if self.m_DataObj.flagNoData:
                         return 0
                     if self.m_DataObj.flagResetProcessing:
                         self.datablock.fill(0)
-                        self.datablockIndex = 0
+                        self.profileIndex = 0
                         self.setNextFile()
-                    self.datablock[:,self.datablockIndex,:] = self.m_DataObj.data
+                    self.datablock[:,self.profileIndex,:] = self.m_DataObj.data
-                    self.datablockIndex += 1
+                    self.profileIndex += 1
                     if self.hasAllDataInBuffer():
                         #if self.flagIsNewFile:
-                        self.getHeader()
+                        self.getDataHeader()
                         self.writeNextBlock()
                     if self.flagNoMoreFiles:
                         #print 'Process finished'
                         return 0
                     return 1
   No newline at end of file

schainpy/Model/Correlation.py +44 -4

@@ -1,18 +1,58
1	'''	1	'''
2	Created on Feb 7, 2012	2	Created on Feb 7, 2012
3		3
4	@author $Author$	4	@author $Author$
5	@version $Id$	5	@version $Id$
6	'''	6	'''
		7	from JROData import JROData, Noise
		8	from JROHeader import RadarControllerHeader, ProcessingHeader, SystemHeader, BasicHeader
7		9
8	class Correlation(Data):	10	class Correlation(JROData):
9	'''	11	'''
10	classdocs	12	classdocs
11	'''	13	'''
12		14
13		15	data = None
		16
		17	nLags = None
		18
		19	lagsList = None
		20
14	def __init__(self):	21	def __init__(self):
15	'''	22	'''
16	Constructor	23	Constructor
17	'''	24	'''
18	~~pass~~ No newline at end of file	25
		26	self.m_RadarControllerHeader = RadarControllerHeader()
		27
		28	self.m_ProcessingHeader = ProcessingHeader()
		29
		30	self.m_SystemHeader = SystemHeader()
		31
		32	self.m_BasicHeader = BasicHeader()
		33
		34	self.m_NoiseObj = Noise()
		35
		36	self.type = "Spectra"
		37
		38	self.dataType = None
		39
		40	self.nHeights = 0
		41
		42	self.nChannels = 0
		43
		44	self.channelList = None
		45
		46	self.heightList = None
		47
		48	self.flagNoData = True
		49
		50	self.flagResetProcessing = False
		51
		52
		53	self.data = None
		54
		55	self.nLags = 0
		56
		57	self.lagsList = None
		58	No newline at end of file

schainpy/Model/JROData.py +36 -5

             '''
             Created on Feb 7, 2012
             @author $Author$
             @version $Id$
             '''
             import copy
             from JROHeader import RadarControllerHeader, ProcessingHeader, SystemHeader, BasicHeader
             class Data:
                 '''
                 classdocs
                 '''
-                type = None
                 def __init__(self):
                     '''
                     Constructor
                     '''
                     raise ValueError, "This class has not been implemented"
                 def copy(self, objIn=None):
                     if objIn == None:
                         return copy.deepcopy(self)
                     for key in objIn.__dict__.keys():
                         self.__dict__[key] = objIn.__dict__[key]
                 def deepcopy(self):
                     return copy.deepcopy(self)
             class Noise(Data):
                 '''
                 classdocs
                 '''
                 def __init__(self):
                     '''
                     Constructor
                     '''
                     pass
             class JROData(Data):
                 '''
                 classdocs
                 '''
                 m_RadarControllerHeader = RadarControllerHeader()
                 m_ProcessingHeader = ProcessingHeader()
                 m_SystemHeader = SystemHeader()
                 m_BasicHeader = BasicHeader()
                 m_NoiseObj = Noise()
-                data = None
+                type = None
                 dataType = None
-                nProfiles = None
                 nHeights = None
                 nChannels = None
                 heightList = None
                 channelList = None
                 flagNoData = False
                 flagResetProcessing = False
                 def __init__(self):
                     '''
                     Constructor
                     '''
-                    raise ValueError, "This class has not been implemented"
  No newline at end of file
+                    raise ValueError, "This class has not been implemented"
+                def updateHeaderFromObj(self):
+                    xi = self.heightList[0]
+                    step = self.heightList[1] - self.heightList[0]
+                    self.m_ProcessingHeader.firstHeight = xi
+                    self.m_ProcessingHeader.deltaHeight = step
+                    self.m_ProcessingHeader.numHeights = self.nHeights
+                    self.m_SystemHeader.numChannels = self.nChannels
+                def updateObjFromHeader(self):
+                    xi = self.m_ProcessingHeader.firstHeight
+                    step = self.m_ProcessingHeader.deltaHeight
+                    xf = xi + self.m_ProcessingHeader.numHeights*step
+                    self.heightList = numpy.arange(xi, xf, step)
+                    self.channelList = numpy.arange(self.m_SystemHeader.numChannels)
+                    self.nHeights = len(self.heightList)
+                    self.nChannels = len(self.channelList)
+  No newline at end of file

schainpy/Model/Spectra.py +30 -14

             '''
             Created on Feb 7, 2012
             @author $Author$
             @version $Id$
             '''
             from JROData import JROData, Noise
             from JROHeader import RadarControllerHeader, ProcessingHeader, SystemHeader, BasicHeader
             class Spectra(JROData):
                 '''
                 classdocs
                 '''
-                type = "Spectra"
                 data_spc = None
                 data_cspc = None
                 data_dc = None
+                nFFTPoints = None
+                nPairs = None
+                pairsList = None
                 def __init__(self):
                     '''
                     Constructor
                     '''
                     self.m_RadarControllerHeader = RadarControllerHeader()
                     self.m_ProcessingHeader = ProcessingHeader()
                     self.m_SystemHeader = SystemHeader()
                     self.m_BasicHeader = BasicHeader()
-                    m_NoiseObj = Noise()
+                    self.m_NoiseObj = Noise()
-                    #data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
+                    self.type = "Spectra"
-                    self.data_spc = None
-                    self.data_cspc = None
+                    self.dataType = None
-                    self.data_dc = None
+                    self.nHeights = 0
-                    self.heightList  = None
+                    self.nChannels = 0
                     self.channelList = None
+                    self.heightList = None
                     self.flagNoData = True
-                    self.nProfiles = None
+                    self.flagResetProcessing = False
-                    self.nPoints = None
+                    #data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
+                    self.data_spc = None
-                    self.dataType = None
+                    self.data_cspc = None
-                    self.flagResetProcessing = False
+                    self.data_dc = None
+                    self.nFFTPoints = None
                     self.nPairs = 0
-                    self.nChannels = 0
  No newline at end of file
+                    self.pairsList = None
+  No newline at end of file

schainpy/Model/Voltage.py +22 -8

             '''
             Created on Feb 7, 2012
             @author $Author$
             @version $Id$
             '''
             from JROData import JROData, Noise
             from JROHeader import RadarControllerHeader, ProcessingHeader, SystemHeader, BasicHeader
             class Voltage(JROData):
                 '''
                 classdocs
                 '''
-                type = "Voltage"
                 data = None
+                nProfiles = None
                 profileIndex = None
                 def __init__(self):
                     '''
                     Constructor
                     '''
-                    self.m_RadarControllerHeader= RadarControllerHeader()
+                    self.m_RadarControllerHeader = RadarControllerHeader()
-                    self.m_ProcessingHeader= ProcessingHeader()
+                    self.m_ProcessingHeader = ProcessingHeader()
-                    self.m_SystemHeader= SystemHeader()
+                    self.m_SystemHeader = SystemHeader()
-                    self.m_BasicHeader= BasicHeader()
+                    self.m_BasicHeader = BasicHeader()
-                    m_NoiseObj = Noise()
+                    self.m_NoiseObj = Noise()
+                    self.type = "Voltage"
                     #data es un numpy array de 3 dmensiones (perfiles, alturas y canales)
                     self.data = None
                     self.dataType = None
+                    self.nHeights = 0
+                    self.nChannels = 0
+                    self.channelList = None
                     self.heightList = None
+                    self.flagNoData = True
+                    self.flagResetProcessing = False
                     self.profileIndex = None
                     self.nProfiles = None
-                    self.flagNoData = True
-                    self.flagResetProcessing = False
   No newline at end of file

schainpy/Processing/SpectraProcessor.py +43 -45

             '''
             Created on Feb 7, 2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import numpy
             path = os.path.split(os.getcwd())[0]
             sys.path.append(path)
             from Model.Spectra import Spectra
             from IO.SpectraIO import SpectraWriter
             from Graphics.SpectraPlot import Spectrum
             class SpectraProcessor:
                 '''
                 classdocs
                 '''
                 def __init__(self, dataInObj, dataOutObj=None):
                     '''
                     Constructor
                     '''
                     self.dataInObj = dataInObj
                     if dataOutObj == None:
                         self.dataOutObj = Spectra()
                     else:
                         self.dataOutObj = dataOutObj
                     self.integratorIndex = None
                     self.decoderIndex = None
                     self.writerIndex = None
                     self.plotterIndex = None
                     self.integratorList = []
                     self.decoderList = []
                     self.writerList = []
                     self.plotterList = []
                     self.buffer = None
                     self.ptsId = 0
                 def init(self, nFFTPoints, pairList=None):
                     self.integratorIndex = 0
                     self.decoderIndex = 0
                     self.writerIndex = 0
                     self.plotterIndex = 0
                     if nFFTPoints == None:
-                        nFFTPoints = self.dataOutObj.nPoints
+                        nFFTPoints = self.dataOutObj.nFFTPoints
                     self.nFFTPoints = nFFTPoints
                     self.pairList = pairList
                     if not( isinstance(self.dataInObj, Spectra) ):
                         self.__getFft()
                     else:
                         self.dataOutObj.copy(self.dataInObj)
                 def __getFft(self):
                     """
                     Convierte valores de Voltaje a Spectra
                     Affected:
                         self.dataOutObj.data_spc
                         self.dataOutObj.data_cspc
                         self.dataOutObj.data_dc
                         self.dataOutObj.heightList
                         self.dataOutObj.m_BasicHeader
                         self.dataOutObj.m_ProcessingHeader
                         self.dataOutObj.m_RadarControllerHeader
                         self.dataOutObj.m_SystemHeader
                         self.ptsId
                         self.buffer
                         self.dataOutObj.flagNoData
                         self.dataOutObj.dataType
                         self.dataOutObj.nPairs
                         self.dataOutObj.nChannels
                         self.dataOutObj.nProfiles
                         self.dataOutObj.m_SystemHeader.numChannels
                         self.dataOutObj.m_ProcessingHeader.totalSpectra
                         self.dataOutObj.m_ProcessingHeader.profilesPerBlock
                         self.dataOutObj.m_ProcessingHeader.numHeights
                         self.dataOutObj.m_ProcessingHeader.spectraComb
                         self.dataOutObj.m_ProcessingHeader.shif_fft
                     """
                     blocksize = 0
-                    npoints = self.nFFTPoints
+                    nFFTPoints = self.nFFTPoints
-                    nchannels, nheis = self.dataInObj.data.shape
+                    nChannels, nheis = self.dataInObj.data.shape
                     if self.buffer == None:
-                        self.buffer = numpy.zeros((nchannels, npoints, nheis), dtype='complex')
+                        self.buffer = numpy.zeros((nChannels, nFFTPoints, nheis), dtype='complex')
                     self.buffer[:,self.ptsId,:] = self.dataInObj.data
                     self.ptsId += 1
-                    if self.ptsId < self.dataOutObj.nPoints:
+                    if self.ptsId < self.dataOutObj.nFFTPoints:
                         self.dataOutObj.flagNoData = True
                         return
                     fft_volt = numpy.fft.fft(self.buffer,axis=1)
                     dc = fft_volt[:,0,:]
                     #calculo de self-spectra
                     fft_volt = numpy.fft.fftshift(fft_volt,axes=(1,))
                     spc = numpy.abs(fft_volt * numpy.conjugate(fft_volt))
                     blocksize += dc.size
                     blocksize += spc.size
                     cspc = None
-                    npair = 0
+                    nPair = 0
                     if self.pairList != None:
                         #calculo de cross-spectra
-                        npairs = len(self.pairList)
+                        nPairs = len(self.pairList)
-                        cspc = numpy.zeros((npairs, npoints, nheis), dtype='complex')
+                        cspc = numpy.zeros((nPairs, nFFTPoints, nheis), dtype='complex')
                         for pair in self.pairList:
-                            cspc[npair,:,:] = numpy.abs(fft_volt[pair[0],:,:] * numpy.conjugate(fft_volt[pair[1],:,:]))
+                            cspc[nPair,:,:] = numpy.abs(fft_volt[pair[0],:,:] * numpy.conjugate(fft_volt[pair[1],:,:]))
-                            npair += 1
+                            nPair += 1
                         blocksize += cspc.size
                     self.dataOutObj.data_spc = spc
                     self.dataOutObj.data_cspc = cspc
                     self.dataOutObj.data_dc = dc
                     self.ptsId = 0
                     self.buffer = None
                     self.dataOutObj.flagNoData = False
                     self.dataOutObj.heightList = self.dataInObj.heightList
                     self.dataOutObj.channelList = self.dataInObj.channelList
                     self.dataOutObj.m_BasicHeader = self.dataInObj.m_BasicHeader.copy()
                     self.dataOutObj.m_ProcessingHeader = self.dataInObj.m_ProcessingHeader.copy()
                     self.dataOutObj.m_RadarControllerHeader = self.dataInObj.m_RadarControllerHeader.copy()
                     self.dataOutObj.m_SystemHeader = self.dataInObj.m_SystemHeader.copy()
                     self.dataOutObj.dataType = self.dataInObj.dataType
-                    self.dataOutObj.nPairs = npair
+                    self.dataOutObj.nPairs = nPair
-                    self.dataOutObj.nChannels = nchannels
+                    self.dataOutObj.nChannels = nChannels
-                    self.dataOutObj.nProfiles = npoints
+                    self.dataOutObj.nProfiles = nFFTPoints
                     self.dataOutObj.nHeights = nheis
-                    self.dataOutObj.nPoints = npoints
+                    self.dataOutObj.nFFTPoints = nFFTPoints
                     #self.dataOutObj.data = None
-                    self.dataOutObj.m_SystemHeader.numChannels = nchannels
+                    self.dataOutObj.m_SystemHeader.numChannels = nChannels
-                    self.dataOutObj.m_SystemHeader.nProfiles = npoints
+                    self.dataOutObj.m_SystemHeader.nProfiles = nFFTPoints
                     self.dataOutObj.m_ProcessingHeader.blockSize = blocksize
-                    self.dataOutObj.m_ProcessingHeader.totalSpectra = nchannels + npair
+                    self.dataOutObj.m_ProcessingHeader.totalSpectra = nChannels + nPair
-                    self.dataOutObj.m_ProcessingHeader.profilesPerBlock = npoints
+                    self.dataOutObj.m_ProcessingHeader.profilesPerBlock = nFFTPoints
                     self.dataOutObj.m_ProcessingHeader.numHeights = nheis
                     self.dataOutObj.m_ProcessingHeader.shif_fft = True
-                    spectraComb = numpy.zeros( (nchannels+npair)*2,numpy.dtype('u1'))
+                    spectraComb = numpy.zeros( (nChannels+nPair)*2,numpy.dtype('u1'))
                     k = 0
-                    for i in range( 0,nchannels*2,2 ):
+                    for i in range( 0,nChannels*2,2 ):
                         spectraComb[i]   = k
                         spectraComb[i+1] = k
                         k += 1
                     k *= 2
                     if self.pairList != None:
                         for pair in self.pairList:
                             spectraComb[k]   = pair[0]
                             spectraComb[k+1] = pair[1]
                             k += 2
                     self.dataOutObj.m_ProcessingHeader.spectraComb = spectraComb
                     #self.selectHeightsByIndex( 0,10)
                     #self.selectHeightsByValue( 120,200 )
                     #self.selectChannels((2,4,5), self.pairList)
                 def addWriter(self,wrpath):
                     objWriter = SpectraWriter(self.dataOutObj)
                     objWriter.setup(wrpath)
                     self.writerList.append(objWriter)
                 def addPlotter(self, index=None):
                     if index==None:
                         index = self.plotterIndex
                     plotObj = Spectrum(self.dataOutObj, index)
                     self.plotterList.append(plotObj)
                 def addIntegrator(self,N):
                     objIncohInt = IncoherentIntegration(N)
                     self.integratorList.append(objIncohInt)
                 def writeData(self, wrpath):
                     if self.dataOutObj.flagNoData:
                             return 0
                     if len(self.writerList) <= self.writerIndex:
                         self.addWriter(wrpath)
                     self.writerList[self.writerIndex].putData()
                     self.writerIndex += 1
                 def plotData(self,xmin=None, xmax=None, ymin=None, ymax=None, winTitle='', index=None):
                     if self.dataOutObj.flagNoData:
                         return 0
                     if len(self.plotterList) <= self.plotterIndex:
                         self.addPlotter(index)
                     self.plotterList[self.plotterIndex].plotData(xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax,winTitle=winTitle)
                     self.plotterIndex += 1
                 def integrator(self, N):
                     if self.dataOutObj.flagNoData:
                             return 0
                     if len(self.integratorList) <= self.integratorIndex:
                         self.addIntegrator(N)
                     myCohIntObj = self.integratorList[self.integratorIndex]
                     myCohIntObj.exe(self.dataOutObj.data_spc)
                     if myCohIntObj.flag:
                         self.dataOutObj.data_spc = myCohIntObj.data
                         self.dataOutObj.m_ProcessingHeader.incoherentInt *= N
                         self.dataOutObj.flagNoData = False
                     else:
                         self.dataOutObj.flagNoData = True
                     self.integratorIndex += 1
                 def removeDC(self, type):
                     if self.dataOutObj.flagNoData:
                         return 0
                     pass
                 def removeInterference(self):
                     if self.dataOutObj.flagNoData:
                         return 0
                     pass
                 def removeSatellites(self):
                     if self.dataOutObj.flagNoData:
                         return 0
                     pass
                 def selectChannels(self, channelList, pairList=None):
                     """
                     Selecciona un bloque de datos en base a canales y pares segun el channelList y el pairList
                     Input:
                         channelList    :    lista sencilla de canales a seleccionar por ej. (2,3,7)
                         pairList       :    tupla de pares que se desea selecionar por ej. ( (0,1), (0,2) )
                     Affected:
                         self.dataOutObj.data_spc
                         self.dataOutObj.data_cspc
                         self.dataOutObj.data_dc
                         self.dataOutObj.nChannels
                         self.dataOutObj.nPairs
                         self.dataOutObj.m_ProcessingHeader.spectraComb
                         self.dataOutObj.m_SystemHeader.numChannels
                     Return:
                         None
                     """
                     if self.dataOutObj.flagNoData:
                         return 0
-                    nchannels = 0
+                    nProfiles = self.dataOutObj.nProfiles
-                    npairs = 0
-                    profiles = self.dataOutObj.nProfiles
                     dataType = self.dataOutObj.dataType
-                    heights  = self.dataOutObj.m_ProcessingHeader.numHeights
+                    nHeights  = self.dataOutObj.m_ProcessingHeader.numHeights
                     blocksize = 0
                     #self spectra
-                    nchannels = len(channelList)
+                    nChannels = len(channelList)
-                    spc = numpy.zeros( (nchannels,profiles,heights), dataType[0] )
+                    spc = numpy.zeros( (nChannels,nProfiles,nHeights), dataType[0] )
                     for index, channel in enumerate(channelList):
                         spc[index,:,:] = self.dataOutObj.data_spc[channel,:,:]
                     #DC channel
-                    dc = numpy.zeros( (nchannels,heights), dtype='complex' )
+                    dc = numpy.zeros( (nChannels,nHeights), dtype='complex' )
                     for index, channel in enumerate(channelList):
                         dc[index,:] = self.dataOutObj.data_dc[channel,:]
                     blocksize += dc.size
                     blocksize += spc.size
-                    npairs = 0
+                    nPairs = 0
                     cspc = None
                     if pairList == None:
                         pairList = self.pairList
                     if pairList != None:
                         #cross spectra
-                        npairs = len(pairList)
+                        nPairs = len(pairList)
-                        cspc = numpy.zeros( (npairs,profiles,heights), dtype='complex' )
+                        cspc = numpy.zeros( (nPairs,nProfiles,nHeights), dtype='complex' )
                         spectraComb = self.dataOutObj.m_ProcessingHeader.spectraComb
                         totalSpectra = len(spectraComb)
                         nchan = self.dataOutObj.nChannels
                         indexList = []
                         for pair in pairList: #busco el par en la lista de pares del Spectra Combinations
                             for index in range(0,totalSpectra,2):
                                 if pair[0] == spectraComb[index] and pair[1] == spectraComb[index+1]:
                                     indexList.append( index/2 - nchan )
                         for index, pair in enumerate(indexList):
                             cspc[index,:,:] = self.dataOutObj.data_cspc[pair,:,:]
                         blocksize += cspc.size
                     else:
                         pairList = self.pairList
                         cspc = self.dataOutObj.data_cspc
                         if cspc != None:
                             blocksize += cspc.size
-                    spectraComb = numpy.zeros( (nchannels+npairs)*2,numpy.dtype('u1'))
+                    spectraComb = numpy.zeros( (nChannels+nPairs)*2,numpy.dtype('u1'))
                     i = 0
                     for val in channelList:
                         spectraComb[i]   = val
                         spectraComb[i+1] = val
                         i += 2
                     if pairList != None:
                         for pair in pairList:
                             spectraComb[i]   = pair[0]
                             spectraComb[i+1] = pair[1]
                             i += 2
                     self.dataOutObj.data_spc = spc
                     self.dataOutObj.data_cspc = cspc
                     self.dataOutObj.data_dc = dc
-                    self.dataOutObj.nChannels = nchannels
+                    self.dataOutObj.nChannels = nChannels
-                    self.dataOutObj.nPairs = npairs
+                    self.dataOutObj.nPairs = nPairs
                     self.dataOutObj.channelList = channelList
                     self.dataOutObj.m_ProcessingHeader.spectraComb = spectraComb
-                    self.dataOutObj.m_ProcessingHeader.totalSpectra = nchannels + npairs
+                    self.dataOutObj.m_ProcessingHeader.totalSpectra = nChannels + nPairs
-                    self.dataOutObj.m_SystemHeader.numChannels = nchannels
+                    self.dataOutObj.m_SystemHeader.numChannels = nChannels
-                    self.dataOutObj.nChannels = nchannels
+                    self.dataOutObj.nChannels = nChannels
                     self.dataOutObj.m_ProcessingHeader.blockSize = blocksize
                 def selectHeightsByValue(self, minHei, maxHei):
                     """
                     Selecciona un bloque de datos en base a un grupo de valores de alturas segun el rango
                     minHei <= height <= maxHei
                     Input:
                         minHei    :    valor minimo de altura a considerar
                         maxHei    :    valor maximo de altura a considerar
                     Affected:
                         Indirectamente son cambiados varios valores a travez del metodo selectHeightsByIndex
                     Return:
                         None
                     """
                     if self.dataOutObj.flagNoData:
                         return 0
                     minIndex = 0
                     maxIndex = 0
                     data = self.dataOutObj.heightList
                     for i,val in enumerate(data):
                         if val < minHei:
                             continue
                         else:
                             minIndex = i;
                             break
                     for i,val in enumerate(data):
                         if val <= maxHei:
                             maxIndex = i;
                         else:
                             break
                     self.selectHeightsByIndex(minIndex, maxIndex)
                 def selectHeightsByIndex(self, minIndex, maxIndex):
                     """
                     Selecciona un bloque de datos en base a un grupo indices de alturas segun el rango
                     minIndex <= index <= maxIndex
                     Input:
                         minIndex    :    valor minimo de altura a considerar
                         maxIndex    :    valor maximo de altura a considerar
                     Affected:
                         self.dataOutObj.data_spc
                         self.dataOutObj.data_cspc
                         self.dataOutObj.data_dc
                         self.dataOutObj.heightList
                         self.dataOutObj.nHeights
                         self.dataOutObj.m_ProcessingHeader.numHeights
                         self.dataOutObj.m_ProcessingHeader.blockSize
                         self.dataOutObj.m_ProcessingHeader.firstHeight
                         self.dataOutObj.m_RadarControllerHeader.numHeights
                     Return:
                         None
                     """
                     if self.dataOutObj.flagNoData:
                         return 0
-                    nchannels = self.dataOutObj.nChannels
+                    nChannels = self.dataOutObj.nChannels
-                    npairs = self.dataOutObj.nPairs
+                    nPairs = self.dataOutObj.nPairs
-                    profiles = self.dataOutObj.nProfiles
+                    nProfiles = self.dataOutObj.nProfiles
                     dataType = self.dataOutObj.dataType
                     newheis = maxIndex - minIndex + 1
                     blockSize = 0
                     #self spectra
-                    spc = numpy.zeros( (nchannels,profiles,newheis), dataType[0] )
+                    spc = numpy.zeros( (nChannels,nProfiles,newheis), dataType[0] )
-                    for i in range(nchannels):
+                    for i in range(nChannels):
                         spc[i,:,:] = self.dataOutObj.data_spc[i,:,minIndex:maxIndex+1]
                     #cross spectra
-                    cspc = numpy.zeros( (npairs,profiles,newheis), dtype='complex')
+                    cspc = numpy.zeros( (nPairs,nProfiles,newheis), dtype='complex')
-                    for i in range(npairs):
+                    for i in range(nPairs):
                         cspc[i,:,:] = self.dataOutObj.data_cspc[i,:,minIndex:maxIndex+1]
                     #DC channel
-                    dc = numpy.zeros( (nchannels,newheis), dtype='complex')
+                    dc = numpy.zeros( (nChannels,newheis), dtype='complex')
-                    for i in range(nchannels):
+                    for i in range(nChannels):
                         dc[i] = self.dataOutObj.data_dc[i,minIndex:maxIndex+1]
                     self.dataOutObj.data_spc = spc
                     self.dataOutObj.data_cspc = cspc
                     self.dataOutObj.data_dc = dc
                     firstHeight = self.dataOutObj.heightList[minIndex]
                     self.dataOutObj.nHeights = newheis
                     self.dataOutObj.m_ProcessingHeader.blockSize = spc.size + cspc.size + dc.size
                     self.dataOutObj.m_ProcessingHeader.numHeights = newheis
                     self.dataOutObj.m_ProcessingHeader.firstHeight = firstHeight
                     self.dataOutObj.m_RadarControllerHeader.numHeights = newheis
                     xi = firstHeight
                     step = self.dataOutObj.m_ProcessingHeader.deltaHeight
                     xf = xi + newheis * step
                     self.dataOutObj.heightList = numpy.arange(xi, xf, step)
             class IncoherentIntegration:
                 def __init__(self, N):
                     self.profCounter = 1
                     self.data = None
                     self.buffer = None
                     self.flag = False
                     self.nIncohInt = N
                 def exe(self,data):
                     if self.buffer == None:
                         self.buffer = data
                     else:
                         self.buffer = self.buffer + data
                     if self.profCounter == self.nIncohInt:
                         self.data = self.buffer
                         self.buffer = None
                         self.profCounter = 0
                         self.flag = True
                     else:
                         self.flag = False
                     self.profCounter += 1

schainpy/TestDataSChain.py +2 -2

             '''
             Created on 23/01/2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import time, datetime
             from Model.JROData import JROData
             from IO.DataIO import *
             #===============================================================================
             # from Graphics.DataPlot import Osciloscope
             #
             # from Model.Spectra import Spectra
             # from IO.SpectraIO import *
             # from Graphics.SpectraPlot import Spectrum
             #===============================================================================
             class TestSChain():
                 def __init__(self):
                     self.setValues()
                     self.createObjects()
                     self.testSChain()
                     pass
                 def setValues(self):
                     #self.path = "/home/valentin/Tmp/RAWDATA"
                     self.path = "/home/dsuarez/Projects"
                     #self.wrpath = "/home/dsuarez/Projects/testWR"
                     self.startDateTime = datetime.datetime(2007,5,1,15,49,0)
                     self.endDateTime = datetime.datetime(2007,5,1,16,0,0)
                 def createObjects(self):
                     self.Obj = JROData()
                     self.readerObj = JRODataReader(self.Obj)
                     #self.plotObj = Spectrum(self.Obj)
                     if not(self.readerObj.setup(self.path, self.startDateTime, self.endDateTime, ext = '.pdata', expLabel='', online =1)):
                         sys.exit(0)
                 def testSChain(self):
                     ini = time.time()
                     while(True):
                         if self.readerObj.getData():
                             print "",
                             #self.plotObj.plotData(zmin=40, zmax=140, showColorbar=True, showPowerProfile=True)
             #            self.writerObj.putData()
                         if self.readerObj.noMoreFiles:
                             break
-                        if self.readerObj.flagIsNewBlock and self.readerObj.nReadBlocks:
+                        if self.readerObj.flagIsNewBlock and self.readerObj.nTotalBlocks:
-                            print 'Block No %04d, Time: %s' %(self.readerObj.nReadBlocks,
+                            print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks,
                                                               datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc),)
                             #===============================================================
                             # fin = time.time()
                             # print 'Tiempo de un bloque leido y escrito: [%6.5f]' %(fin - ini)
                             # ini = time.time()
                             #===============================================================
                         #time.sleep(0.5)
                     self.plotObj.end()
             if __name__ == '__main__':
                 TestSChain()

schainpy/TestSChain.py +1 -1

             '''
             Created on 23/01/2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import time, datetime
             from Model.Voltage import Voltage
             from IO.VoltageIO import *
             from Graphics.VoltagePlot import Osciloscope
             from Model.Spectra import Spectra
             from IO.SpectraIO import *
             from Graphics.SpectraPlot import Spectrum
             class TestSChain():
                 def __init__(self):
                     self.setValues()
                     self.createObjects()
                     self.setupObjects()
                     self.testSChain()
                     pass
                 def setValues(self):
                     self.path = '/home/roj-idl71/Data/RAWDATA/DP_Faraday/'
                     self.path = '/Users/danielangelsuarezmunoz/Documents/Projects/testWR'
                     self.path = '/home/roj-idl71/Data/RAWDATA/IMAGING'
                     #self.path = '/remote/puma/2011_08/E-F_Valley'
                     #self.path = '/remote/puma/2011_12/EEJ+150km+ONAXIS+ESF+Twilight/Twilight/'
                     self.path = '/home/roj-idl71/tmp/data/'
                     self.ppath = "/home/roj-idl71/tmp/data"
                     self.startDateTime = datetime.datetime(2011,1,31,0,20,0)
                     self.endDateTime = datetime.datetime(2011,12,5,18,10,0)
                 def createObjects(self):
             #        self.Obj = Voltage()
             #        self.readerObj = VoltageReader(self.Obj)
             #        self.plotObj = Osciloscope(self.Obj)
             #        self.writerObj = VoltageWriter(self.Obj)
                     self.Obj = Spectra()
                     self.readerObj = SpectraReader(self.Obj)
                     self.plotObj = Spectrum(self.Obj)
             #        self.writerObj = SpectraWriter(self.Obj)
                 def setupObjects(self):
                     if not(self.readerObj.setup(self.path, self.startDateTime, self.endDateTime, expLabel='', online = 0)):
                         sys.exit(0)
                     print "Parameters:"
                     print "Num profiles: %s" %(self.readerObj.m_SystemHeader.numProfiles)
                     print "Num samples: %s" %(self.readerObj.m_SystemHeader.numSamples)
                     print "Num channels: %s" %(self.readerObj.m_SystemHeader.numChannels)
                     print "Num profiles per block: %s" %(self.readerObj.m_ProcessingHeader.profilesPerBlock)
                     print "Num heights: %s" %(self.readerObj.m_ProcessingHeader.numHeights)
                     print "Num coh int: %s" %(self.readerObj.m_ProcessingHeader.coherentInt)
                     print "Num incoh int: %s" %(self.readerObj.m_ProcessingHeader.incoherentInt)
                     print "Num code: %d" %(self.readerObj.m_ProcessingHeader.numCode)
                     print "Num baud: %d" %(self.readerObj.m_ProcessingHeader.numBaud)
             #        if not(self.writerObj.setup(self.ppath)):
             #            sys.exit(0)
                 def testSChain(self):
                     ini = time.time()
                     while(True):
                         self.readerObj.getData()
                         self.plotObj.plotData(zmin=40, zmax=140, showColorbar=True, showPowerProfile=True)
                         #self.plotObj.plotData(idProfile=1, type="power")
             #            self.writerObj.putData()
                         if self.readerObj.noMoreFiles:
                             break
                         if self.readerObj.flagIsNewBlock:
-                            print 'Block No %04d, Time: %s' %(self.readerObj.nReadBlocks,
+                            print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks,
                                                               datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc),)
                             fin = time.time()
                             print 'Tiempo de un bloque leido y escrito: [%6.5f]' %(fin - ini)
                             ini = time.time()
                         #time.sleep(0.5)
                     self.plotObj.end()
             if __name__ == '__main__':
                 TestSChain()

schainpy/TestSVoltageChain.py +21 -21

             '''
             Created on 27/03/2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import time, datetime
             from Model.Voltage import Voltage
             from IO.VoltageIO import *
             #from Graphics.VoltagePlot import Osciloscope
             from Model.Spectra import Spectra
             from IO.SpectraIO import *
             from Processing.VoltageProcessor import *
             from Processing.SpectraProcessor import *
             class TestSChain():
                 def __init__(self):
                     self.setValues()
                     self.createObjects()
                     self.testSChain()
                 def setValues( self ):
                     self.path = "/home/dsuarez/Projects"  #1
-                    #self.path = "/home/valentin/Tmp/VOLTAGE2" #2
+                    self.path = "/home/roj-idl71/Data/RAWDATA/IMAGING"
             #        self.startDateTime = datetime.datetime(2007,5,1,15,49,0)
             #        self.endDateTime = datetime.datetime(2007,5,1,23,0,0)
                     self.startDateTime = datetime.datetime(2011,10,4,0,0,0)
                     self.endDateTime = datetime.datetime(2011,10,4,0,20,0)
-                    self.N = 2
+                    self.N = 10
-                    self.npts = 4
+                    self.npts = 1024
                 def createObjects( self ):
-                    self.Obj = Voltage()
+                    self.voltObj1 = Voltage()
-                    self.OutObj = Voltage()
+                    self.voltObj2 = Voltage()
-                    self.readerObj = VoltageReader(self.Obj)
+                    self.specObj1 = Spectra()
-                    self.procObj = VoltageProcessor(self.Obj, self.OutObj)
-                    self.spectraObj = Spectra()
+                    self.readerObj = VoltageReader(self.voltObj1)
-                    self.specProcObj = SpectraProcessor(self.OutObj, self.spectraObj,self.npts)
+                    self.voltProcObj = VoltageProcessor(self.voltObj1, self.voltObj2)
+                    self.specProcObj = SpectraProcessor(self.voltObj2, self.specObj1)
-                    #self.plotObj = Osciloscope(self.Obj)
+                    #self.plotObj = Osciloscope(self.voltObj1)
                     if not(self.readerObj.setup( self.path, self.startDateTime, self.endDateTime, expLabel='', online =0) ):
                         sys.exit(0)
             #        if not(self.readerObj.setup(self.path, self.startDateTime, self.endDateTime)):
             #            sys.exit(0)
                 def testSChain( self ):
                     ini = time.time()
                     while(True):
                         self.readerObj.getData()
-                        self.procObj.init()
+                        self.voltProcObj.init()
-                        self.procObj.plotData(idProfile = 1, type='power',winTitle='figura 1')
+            #            self.voltProcObj.plotData(idProfile = 1, type='iq', ymin=-25000, ymax=25000, winTitle='sin decodificar')
-                        self.procObj.decoder(type=0)
+                        self.voltProcObj.decoder(type=0)
-            #            self.procObj.plotData(idProfile = 1, type='iq', xmin=0, xmax=100,winTitle='figura 2')
+            #            self.voltProcObj.plotData(idProfile = 1, type='iq', ymin=-70000, ymax=70000,winTitle='Decodificado')
             #
-            #            self.procObj.integrator(self.N)
+                        self.voltProcObj.integrator(self.N)
-                        self.procObj.plotData(idProfile = 1, type='power',winTitle='figura 3')
+            #            self.voltProcObj.plotData(idProfile = 1, type='iq', ymin=-700000, ymax=700000,winTitle='figura 3')
-                        self.specProcObj.init()
+                        self.specProcObj.init(self.npts)
                         self.specProcObj.integrator(2)
-                        self.specProcObj.plotData(winTitle='Spectra 1', index=2)
+                        self.specProcObj.plotData(winTitle='Spectra 1', index=0)
             #            if self.readerObj.getData():
             #                self.plotObj.plotData(idProfile=0, type='power' )
             #
             #
-            #            if self.readerObj.flagNoMoreFiles:
+                        if self.readerObj.flagNoMoreFiles:
-            #                break
+                            break
             #
                         if self.readerObj.flagIsNewBlock:
-                            print 'Block No %04d, Time: %s' %(self.readerObj.nReadBlocks,
+                            print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks,
                                                               datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc),)
             #                fin = time.time()
             #                print 'Tiempo de un bloque leido y escrito: [%6.5f]' %(fin - ini)
             #                ini = time.time()
                         #time.sleep(0.5)
             #        self.plotObj.end()
             if __name__ == '__main__':
                 TestSChain()

schainpy/TestSpectraSChain.py +2 -2

             '''
             Created on 23/01/2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import time, datetime
             from Model.Voltage import Voltage
             from IO.VoltageIO import *
             from Graphics.VoltagePlot import Osciloscope
             from Model.Spectra import Spectra
             from IO.SpectraIO import *
             from Graphics.SpectraPlot import Spectrum
             class TestSChain():
                 def __init__(self):
                     self.setValues()
                     self.createObjects()
                     self.testSChain()
                     pass
                 def setValues(self):
                     #self.path = "/home/valentin/Tmp/RAWDATA"
                     self.path = "/home/valentin/Tmp/RAWDATA"
                     self.startDateTime = datetime.datetime(2009,11,2,00,00,0)
                     self.endDateTime = datetime.datetime(2009,11,30,18,10,0)
                 def createObjects(self):
                     self.Obj = Spectra()
                     self.readerObj = SpectraReader(self.Obj)
                     self.plotObj = Spectrum(self.Obj)
             #        self.writerObj = SpectraWriter(self.Obj)
                     if not(self.readerObj.setup(self.path, self.startDateTime, self.endDateTime, expLabel='', online =1)): #self.startDateTime
                         sys.exit(0)
             #        if not(self.writerObj.setup(self.ppath)):
             #            sys.exit(0)
                 def testSChain(self):
                     ini = time.time()
                     while(True):
                         if self.readerObj.getData():
                             self.plotObj.plotData(showColorbar=True, showPowerProfile=True) #zmin=40, zmax=140,
             #            self.writerObj.putData()
                         if self.readerObj.flagNoMoreFiles:
                             break
-                        if self.readerObj.flagIsNewBlock and self.readerObj.nReadBlocks:
+                        if self.readerObj.flagIsNewBlock and self.readerObj.nTotalBlocks:
-                            print 'Block No %04d, Time: %s' %(self.readerObj.nReadBlocks,
+                            print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks,
                                                               datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc),)
                             #===============================================================
                             # fin = time.time()
                             # print 'Tiempo de un bloque leido y escrito: [%6.5f]' %(fin - ini)
                             # ini = time.time()
                             #===============================================================
                         #time.sleep(0.5)
                     self.plotObj.end()
             if __name__ == '__main__':
                 TestSChain()

schainpy/TestSpectraWriteChain.py +2 -2

             '''
             Created on 20/03/2012
             @author $Author$
             @version $Id$
             '''
             import os, sys
             import time, datetime
             from Model.Voltage import Voltage
             from IO.VoltageIO import *
             from Graphics.VoltagePlot import Osciloscope
             from Model.Spectra import Spectra
             from IO.SpectraIO import *
             from Graphics.SpectraPlot import Spectrum
             class TestSChain():
                 def __init__(self):
                     self.setValues()
                     self.createObjects()
                     self.testSChain()
                     pass
                 def setValues(self):
                     self.srcPath = "/home/valentin/Tmp/RAWDATA"
                     self.dstPath = "/home/valentin/Tmp/RAWDATA2"
                     self.startDateTime = datetime.datetime(2009,11,1,00,00,0) #4
                     self.endDateTime = datetime.datetime(2009,11,30,18,10,0)
                 def createObjects(self):
                     self.Obj = Spectra()
                     self.readerObj = SpectraReader(self.Obj)
                     self.writerObj = SpectraWriter(self.Obj)
                     self.plotObj = Spectrum(self.Obj)
                     if not( self.readerObj.setup(self.srcPath, self.startDateTime, self.endDateTime, expLabel='', online =0) ):
                         sys.exit(0)
                     if not( self.writerObj.setup(path=self.dstPath) ): sys.exit(0)
                 def testSChain(self):
                     ini = time.time()
                     while(True):
                         if self.readerObj.getData():
                             self.plotObj.plotData( zmin=35, zmax=100, showColorbar=True, showPowerProfile=True)
             ###################################################################################
                             #time.sleep( 2 )
                             self.writerObj.putData()
             ###################################################################################
                         if self.readerObj.flagNoMoreFiles:
                             break
-                        if self.readerObj.flagIsNewBlock and self.readerObj.nReadBlocks:
+                        if self.readerObj.flagIsNewBlock and self.readerObj.nTotalBlocks:
-                            print 'Block No %04d, Time: %s' %(self.readerObj.nReadBlocks,
+                            print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks,
                                                               datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc))
                             #===============================================================
                             # fin = time.time()
                             # print 'Tiempo de un bloque leido y escrito: [%6.5f]' %(fin - ini)
                             # ini = time.time()
                             #===============================================================
                         #time.sleep(0.5)
                     self.plotObj.end()
             if __name__ == '__main__':
                 TestSChain()

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