schain-jc Commit - r9:abb62041a98c · Jicamarca Repository

Estructura de directorios del modelo agregada.

Miguel Valdez -

r9:abb62041a98c

parent child

Context file:

r9:abb62041a98c

Collapse all files

schainpy/Model/Correlation.py created 644 +17 0

@@ -0,0 +1,17
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class Correlation(Data):
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass No newline at end of file

schainpy/Model/Data.py created 644 +18 0

@@ -0,0 +1,18
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class Data:
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass
	18	No newline at end of file

schainpy/Model/Noise.py created 644 +18 0

@@ -0,0 +1,18
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class Noise:
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass
	18	No newline at end of file

schainpy/Model/Spectra.py created 644 +18 0

@@ -0,0 +1,18
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class Spectra(Data):
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass
	18	No newline at end of file

schainpy/Model/Voltage.py created 644 +18 0

@@ -0,0 +1,18
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class Voltage(Data):
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass
	18	No newline at end of file

schainpy/Model/__init__.py created 644 0 0

NO CONTENT: new file 100644

schainpy/Processing/CorrelationProcessor.py created 644 +17 0

@@ -0,0 +1,17
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class CorrelationProcessor():
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass No newline at end of file

schainpy/Processing/SpectraProcessor.py created 644 +17 0

@@ -0,0 +1,17
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class SpectraProcessor():
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass No newline at end of file

schainpy/Processing/VoltageProcessor.py created 644 +17 0

@@ -0,0 +1,17
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class VoltageProcessor():
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass No newline at end of file

schainpy/Processing/__init__.py created 644 0 0

NO CONTENT: new file 100644

schainpy/Utilities/FtpServer.py created 644 +18 0

@@ -0,0 +1,18
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class FtpServer():
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass
	18	No newline at end of file

schainpy/Utilities/FtpServerList.py created 644 +17 0

@@ -0,0 +1,17
	1	'''
	2	Created on Feb 7, 2012
	3
	4	@author: roj-idl71
	5	'''
	6
	7	class FtpServerList():
	8	'''
	9	classdocs
	10	'''
	11
	12
	13	def __init__(self):
	14	'''
	15	Constructor
	16	'''
	17	pass No newline at end of file

schainpy/Utilities/__init__.py created 644 0 0

NO CONTENT: new file 100644

schainpy/IO/Correlation.py 0 0

NO CONTENT: modified file

schainpy/IO/Data.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file

NO CONTENT: modified file

schainpy/IO/Header.py +8 0

                     return 1
+                def copy(self):
+                    obj = BasicHeader()
+                    obj.size = self.size
+                    return obj
             class SystemHeader:
                 size = 0
                 numSamples = 0

schainpy/IO/Spectra.py 0 0

NO CONTENT: modified file

schainpy/IO/Voltage.py +58 -29

             @author: danielangelsuarezmunoz
             '''
+            import os, sys
             import numpy
-            import os.path
             import glob
             import fnmatch
             import time
             from Data import DataReader
             from Data import DataWriter
+            path = os.path.split(os.getcwd())[0]
+            sys.path.append(os.path.join(path,"Model"))
+            from Voltage import Voltage
             class VoltageReader(DataReader):
                 __idFile = 0
                 basicHeaderSize = 24
-                basicHeaderObj = BasicHeader()
+                m_BasicHeader = BasicHeader()
+                m_SystemHeader = SystemHeader()
-                systemHeaderObj = SystemHeader()
+                m_RadarControllerHeader = RadarControllerHeader()
-                radarControllerHeaderObj = RadarControllerHeader()
+                m_ProcessingHeader = ProcessingHeader()
-                processingHeaderObj = ProcessingHeader()
+                m_Voltage = None
                 __buffer = 0
                 __buffer_id = 9999
-                #m_Voltage= Voltage()
+                def __init__(self, m_Voltage):
-                def __init__(self):
+                    self.m_Voltage = m_Voltage
-                    pass
                 def __rdSystemHeader(self,fp=None):
                     if fp == None:
                         fp = self.__fp
-                    self.systemHeaderObj.read(fp)
+                    self.m_SystemHeader.read(fp)
                 def __rdRadarControllerHeader(self,fp=None):
                     if fp == None:
                         fp = self.__fp
-                    self.radarControllerHeaderObj.read(fp)
+                    self.m_RadarControllerHeader.read(fp)
                 def __rdProcessingHeader(self,fp=None):
                     if fp == None:
                         fp = self.__fp
-                    self.processingHeaderObj.read(fp)
+                    self.m_ProcessingHeader.read(fp)
                 def __searchFiles(self,path, startDateTime, endDateTime, set=None, expLabel = "", ext = "*.r"):
                     if endUTSeconds==None:
                         endUTSeconds = self.endUTCSeconds
-                    basicHeaderObj = BasicHeader()
+                    m_BasicHeader = BasicHeader()
-                    if not(basicHeaderObj.read(fp)):
+                    if not(m_BasicHeader.read(fp)):
                         return 0
                     fp.close()
-                    if not ((startUTSeconds <= basicHeaderObj.utc) and (endUTSeconds >= basicHeaderObj.utc)):
+                    if not ((startUTSeconds <= m_BasicHeader.utc) and (endUTSeconds >= m_BasicHeader.utc)):
                         return 0
                     return 1
                     if fp == None:
                         fp = self.__fp
-                    self.basicHeaderObj.read(fp)
+                    self.m_BasicHeader.read(fp)
                 def __readFirstHeader(self):
                     self.__rdSystemHeader()
                     self.__rdRadarControllerHeader()
                     self.__rdProcessingHeader()
-                    self.firstHeaderSize = self.basicHeaderObj.size
+                    self.firstHeaderSize = self.m_BasicHeader.size
-                    data_type=int(numpy.log2((self.processingHeaderObj.processFlags & PROCFLAG.DATATYPE_MASK))-numpy.log2(PROCFLAG.DATATYPE_CHAR))
+                    data_type=int(numpy.log2((self.m_ProcessingHeader.processFlags & PROCFLAG.DATATYPE_MASK))-numpy.log2(PROCFLAG.DATATYPE_CHAR))
                     if data_type == 0:
                         tmp=numpy.dtype([('real','<i1'),('imag','<i1')])
                     elif data_type == 1:
                         tmp = 0
                     self.__dataType = tmp
-                    self.__sizeOfFileByHeader = self.processingHeaderObj.dataBlocksPerFile * self.processingHeaderObj.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.processingHeaderObj.dataBlocksPerFile - 1)
+                    self.__sizeOfFileByHeader = self.m_ProcessingHeader.dataBlocksPerFile * self.m_ProcessingHeader.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.m_ProcessingHeader.dataBlocksPerFile - 1)
                 def __setNextFileOnline(self):
                     return 0
                         fp = open(filename,'rb')
                         currentSize = fileSize - fp.tell()
-                        neededSize = self.processingHeaderObj.blockSize + self.firstHeaderSize
+                        neededSize = self.m_ProcessingHeader.blockSize + self.firstHeaderSize
                         if (currentSize < neededSize):
                             continue
                         return 1
                     currentSize = self.fileSize - self.__fp.tell()
-                    neededSize = self.processingHeaderObj.blockSize + self.basicHeaderSize
+                    neededSize = self.m_ProcessingHeader.blockSize + self.basicHeaderSize
                     # Bloque Completo
                     if (currentSize >= neededSize):
                     self.__readFirstHeader()
-                    deltaTime = self.basicHeaderObj.utc - self.__lastUTTime # check this
+                    deltaTime = self.m_BasicHeader.utc - self.__lastUTTime # check this
                     self.flagResetProcessing = 0
                     if deltaTime > self.__maxTimeStep:
                     seteado a 0
                     """
-                    pts2read = self.processingHeaderObj.profilesPerBlock*self.processingHeaderObj.numHeights*self.systemHeaderObj.numChannels
+                    pts2read = self.m_ProcessingHeader.profilesPerBlock*self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels
                     data = numpy.fromfile(self.__fp,self.__dataType,pts2read)
-                    data = data.reshape((self.processingHeaderObj.profilesPerBlock, self.processingHeaderObj.numHeights, self.systemHeaderObj.numChannels))
+                    data = data.reshape((self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, self.m_SystemHeader.numChannels))
                     self.__flagIsNewFile = 0
                     self.__readBlock()
-                    self.__lastUTTime = self.basicHeaderObj.utc
+                    self.__lastUTTime = self.m_BasicHeader.utc
                     return 1
                 def __hasNotDataInBuffer(self):
-                    if self.__buffer_id >= self.processingHeaderObj.profilesPerBlock:
+                    if self.__buffer_id >= self.m_ProcessingHeader.profilesPerBlock:
                         return 1
                     return 0
                         return None
                     data = self.__buffer[self.__buffer_id,:,:]
-                    #time = timeblock + n*ipp
+                    time = 111
-                    #print self.__buffer_id
+                    self.m_Voltage.data = data
+                    self.m_Voltage.timeProfile = time
+                    self.m_Voltage.m_BasicHeader = self.m_BasicHeader.copy()
+                    self.m_Voltage.m_ProcessingHeader = self.m_ProcessingHeader.copy()
+                    self.m_Voltage.m_RadarControllerHeader = self.m_RadarControllerHeader.copy()
+                    self.m_Voltage.m_SystemHeader = self.m_systemHeader.copy()
                     self.__buffer_id += 1
             class VoltageWriter(DataWriter):
-                def __init__(self):
+                m_BasicHeader= BasicHeader()
-                    pass
+                m_SystemHeader = SystemHeader()
+                m_RadarControllerHeader = RadarControllerHeader()
+                m_ProcessingHeader = ProcessingHeader()
+                m_Voltage = None
+                def __init__(self, m_Voltage):
+                    self.m_Voltage = m_Voltage
   No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages