From 740f62003cfc00f6d6525fb6e8f7dc2624b82d22 2012-11-28 22:54:44 From: Miguel Valdez Date: 2012-11-28 22:54:44 Subject: [PATCH] --- diff --git a/schainpy/TestSVoltageChain.py b/schainpy/TestSVoltageChain.py deleted file mode 100644 index 938bae7..0000000 --- a/schainpy/TestSVoltageChain.py +++ /dev/null @@ -1,98 +0,0 @@ -''' -Created on Jul 31, 2012 - -@author $Author$ -@version $Id$ -''' - -import os, sys -import time, datetime - -from Model.Voltage import Voltage -from IO.VoltageIO import * - -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" - self.path = "/Users/jro/Documents/RadarData/EW_Drifts" - self.path = "/Users/jro/Documents/RadarData/MST_ISR/MST" - self.path = "/home/daniel/RadarData/MST" - - self.startDate = datetime.date(2009,01,1) - self.endDate = datetime.date(2009,01,31) - - self.startTime = datetime.time(0,0,0) - self.endTime = datetime.time(20,0,0) - self.N = 4 - self.npts = 8 - - def createObjects( self ): - - self.readerObj = VoltageReader() - self.voltProcObj = VoltageProcessor() - self.specProcObj = SpectraProcessor() - - self.voltObj1 = self.readerObj.setup( - path = self.path, - startDate = self.startDate, - endDate = self.endDate, - startTime = self.startTime, - endTime = self.endTime, - expLabel = '', - online = 0) - - if not(self.voltObj1): - sys.exit(0) - - self.voltObj2 = self.voltProcObj.setup(dataInObj = self.voltObj1) - - self.specObj1 = self.specProcObj.setup(dataInObj = self.voltObj2, - nFFTPoints = 16) - - - def testSChain( self ): - - ini = time.time() - - while(True): - self.readerObj.getData() - - self.voltProcObj.init() - - self.voltProcObj.plotScope(winTitle="Scope 1",type="iq", index=1) - - self.voltProcObj.plotRti(winTitle='VOLTAGE INPUT', showPowerProfile=True, index=2) - - self.voltProcObj.integrator(4) - - self.specProcObj.init() - - self.specProcObj.integrator(N=4) - -# self.specProcObj.plotSpec(winTitle='Spectra Test', showColorbar=True,showPowerProfile=True,index=3) - self.specProcObj.plotData(winTitle='Spectra Test', showColorbar=True,showPowerProfile=True,save=False,index=3) - - if self.readerObj.flagNoMoreFiles: - break - - if self.readerObj.flagIsNewBlock: - print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks, - datetime.datetime.fromtimestamp(self.readerObj.m_BasicHeader.utc),) - - -if __name__ == '__main__': - TestSChain() \ No newline at end of file diff --git a/schainpy/TestSpectraHeis.py b/schainpy/TestSpectraHeis.py deleted file mode 100644 index bbff1f8..0000000 --- a/schainpy/TestSpectraHeis.py +++ /dev/null @@ -1,104 +0,0 @@ -''' -Created on Jul 31, 2012 - -@author $Author$ -@version $Id$ -''' - -import os, sys -import time, datetime -#import pylab as pl - -from Data.JROData import Voltage -from IO.VoltageIO import * - -from Data.JROData import SpectraHeis -from IO.SpectraIO import * - -from Processing.VoltageProcessor import * -from Processing.SpectraProcessor import * - -#from Graphics.BaseGraph_mpl import LinearPlot - -class TestHeis(): - i=None - def __init__(self): - self.setValues() - self.createObjects() - self.testSChain() - self.i=0 - - def setValues( self ): - - self.path="/home/roj-idl71/data" - self.path = "/Data/Data/RAWDATA/ASTRONOMIA" - - #self.path = "" - self.startDate = datetime.date(2012,4,1) - self.endDate = datetime.date(2012,12,30) - - self.startTime = datetime.time(0,0,0) - self.endTime = datetime.time(23,0,0) - - - def createObjects( self ): - - self.readerObj = VoltageReader() - self.specProcObj = SpectraHeisProcessor() - - self.voltObj1 = self.readerObj.setup( - path = self.path, - startDate = self.startDate, - endDate = self.endDate, - startTime = self.startTime, - endTime = self.endTime, - expLabel = '', - online = 1) - - if not(self.voltObj1): - sys.exit(0) - - self.specObj1 = self.specProcObj.setup(dataInObj = self.voltObj1,nFFTPoints=self.voltObj1.nHeights) - - -# - -# - - def testSChain( self ): - - ini = time.time() - counter = 0 - while(True): - self.readerObj.getData() - self.specProcObj.init() - - self.specProcObj.integrator(N=32) ## return self.dataOutObj - - - - - self.specProcObj.plotScope(idfigure=1, - wintitle='test plot library', - driver='plplot', - minvalue = 30000.0, - maxvalue = 5000000.0, - save=False, - gpath="/home/roj-idl71/PlotImage") - - - if self.readerObj.flagNoMoreFiles: - break - - - - if self.readerObj.flagIsNewBlock: - print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks, - datetime.datetime.fromtimestamp(self.readerObj.basicHeaderObj.utc),) - - - -if __name__ == '__main__': - TestHeis() - - \ No newline at end of file diff --git a/schainpy/controller/controller.py b/schainpy/controller/controller.py index 81dfd2a..30d1877 100644 --- a/schainpy/controller/controller.py +++ b/schainpy/controller/controller.py @@ -53,7 +53,8 @@ class Controller(): id = len(self.readBranchObjList) + 1 - readBranchObj = ReadBranch(id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime) + readBranchObj = ReadBranch() + readBranchObj.setup(id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime) self.readBranchObjList.append(readBranchObj) @@ -63,7 +64,8 @@ class Controller(): id = len(self.procBranchObjList) + 1 - procBranchObj = ProcBranch(id, name) + procBranchObj = ProcBranch() + procBranchObj.setup(id, name) self.procBranchObjList.append(procBranchObj) @@ -97,58 +99,52 @@ class Controller(): #tree = ET.parse(filename) self.projectElement = None - tree = ElementTree(self.projectElement).parse(filename) + self.readBranchObjList = None + self.procBranchObjList = None + + self.projectElement = ElementTree().parse(filename) self.project = self.projectElement.tag self.id = self.projectElement.get('id') - self.name = self.projectElement.get('name') - - readElement = self.projectElement.getiterator('readBranch') - - root = tree.getroot() - self.project = root.tag - self.id = root.attrib.get('id') - self.name = root.attrib.get('name') - - for description in root.findall('description'): - description = description.get('description') - - self.description= description - - for readBranch in root.findall('readBranch'): - id = readBranch.get('id') - self.idrb=id - - for procBranch in root.findall('procBranch'): - id = readBranch.get('id') - name = readBranch.get('name') - self.idpb=id - self.nameBranch=name - - root=tree.getroot() - print root.tag , root.attrib - for child in root: - print child.tag ,child.attrib - for child in child: - print child.tag ,child.attrib - for child in child: - print child.tag ,child.attrib - for child in child: - print child.tag ,child.attrib + self.name = self.projectElement.get('name') + + self.readBranchObjList = [] + + readBranchElementList = self.projectElement.getiterator('readBranch') + + for readBranchElement in readBranchElementList: + readBrachObj = ReadBranch() + readBrachObj.readXml(readBranchElement) + self.readBranchObjList.append(readBranchObj) + + self.procBranchObjList = [] + + procBranchElementList = self.projectElement.getiterator('procBranch') + + for procBranchElement in procBranchElementList: + procBranchObj = ProcBranch() + procBranchObj.readXml(procBranchElement) + self.procBranchObjList.append(procBranchObj) # class ReadBranch(): id = None - dpath = None - dataformat = None - readMode = None - startDate = None - endDate = None - startTime = None - endTime = None +# dpath = None +# dataformat = None +# readMode = None +# startDate = None +# endDate = None +# startTime = None +# endTime = None + + parmObjList = [] - def __init__(self, id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime): + def __init__(self): + + self.parmObjList = [] + + def setup(self, id, dpath, dataformat, readMode, startDate, endDate, startTime, endTime): self.id = id self.dpath = dpath @@ -159,19 +155,46 @@ class ReadBranch(): self.startTime = startTime self.endTime = endTime + def addParameter(self, name, value): + + id = len(self.parmObjList) + 1 + + parmObj = ParameterConf() + parmObj.setup(id, name, value) + + self.parmObjList.append(parmObj) + + return parmObj + def makeXml(self, projectElement): readBranchElement = SubElement(projectElement, 'readBranch') readBranchElement.set('id', str(self.id)) + + self.addParameter(name='dpath' , value=self.dpath) + self.addParameter(name='dataformat', value=self.dataformat) + self.addParameter(name='startDate' , value=self.startDate) + self.addParameter(name='endDate' , value=self.endDate) + self.addParameter(name='startTime' , value=self.startTime) + self.addParameter(name='endTime' , value=self.endTime) + self.addParameter(name='readMode' , value=str(self.readMode)) + + for parmObj in self.parmObjList: + parmObj.makeXml(readBranchElement) + + def readXml(self, readBranchElement): + + self.id = readBranchElement.get('id') + + self.parmObjList = [] + + parmElementList = readBranchElement.getiterator('Parameter') + + for parmElement in parmElementList: + parmObj = Parameter() + parmObj.readXml(parmElement) + self.parmObjList.append(parmObj) - se = SubElement(readBranchElement, 'parameter', name='dpath' , value=self.dpath) - se = SubElement(readBranchElement, 'parameter', name='dataformat', value=self.dataformat) - se = SubElement(readBranchElement, 'parameter', name='startDate' , value=self.startDate) - se = SubElement(readBranchElement, 'parameter', name='endDate' , value=self.endDate) - se = SubElement(readBranchElement, 'parameter', name='startTime' , value=self.startTime) - se = SubElement(readBranchElement, 'parameter', name='endTime' , value=self.endTime) - se = SubElement(readBranchElement, 'parameter', name='readMode' , value=str(self.readMode)) - class ProcBranch(): @@ -180,7 +203,10 @@ class ProcBranch(): upObjList = None - def __init__(self, id, name): + def __init__(self): + pass + + def setup(self, id, name): self.id = id self.name = name @@ -191,7 +217,8 @@ class ProcBranch(): id = len(self.upObjList) + 1 - upObj = UPConf(id, name, type) + upObj = UPConf() + upObj.setup(id, name, type) self.upObjList.append(upObj) @@ -206,6 +233,20 @@ class ProcBranch(): for upObj in self.upObjList: upObj.makeXml(procBranchElement) + def readXml(self, procBranchElement): + + self.id = procBranchElement.get('id') + self.name = procBranchElement.get('name') + + self.upObjList = [] + + upElementList = procBranchElement.getiterator('UP') + + for upElement in upElementList: + upObj = UPConf() + #upObj.readXml(upElement) + self.upObjList.append(upObj) + class UPConf(): id = None @@ -214,7 +255,10 @@ class UPConf(): opObjList = [] - def __init__(self, id, name, type): + def __init__(self): + pass + + def setup(self, id, name, type): self.id = id self.name = name @@ -226,7 +270,8 @@ class UPConf(): id = len(self.opObjList) + 1 - opObj = OperationConf(id, name, priority, type) + opObj = OperationConf() + opObj.setup(id, name, priority, type) self.opObjList.append(opObj) @@ -242,6 +287,17 @@ class UPConf(): for opObj in self.opObjList: opObj.makeXml(upElement) + def readXml(self, upElement): + + self.id = upElement.get('id') + self.name = upElement.get('name') + self.type = upElement.get('type') + + opElementList = upElement.getiterator('Operation') + + for opElement in opElementList: + pass + def getOperationObjList(self): return self.opObjList @@ -255,7 +311,10 @@ class OperationConf(): parmObjList = [] - def __init__(self, id, name, priority, type): + def __init__(self): + pass + + def setup(self, id, name, priority, type): self.id = id self.name = name @@ -268,7 +327,8 @@ class OperationConf(): id = len(self.parmObjList) + 1 - parmObj = ParameterConf(id, name, value) + parmObj = ParameterConf() + parmObj.setup(id, name, value) self.parmObjList.append(parmObj) @@ -283,6 +343,17 @@ class OperationConf(): for parmObj in self.parmObjList: parmObj.makeXml(opElement) + + def readXml(self, opElement): + + self.id = opElement.get('id') + self.name = opElement.get('name') + self.type = opElement.get('type') + + parmElementList = opElement.getiterator('Parameter') + + for parmElement in parmElementList: + pass def getParameterObjList(self): @@ -294,7 +365,10 @@ class ParameterConf(): name = None value = None - def __init__(self, id, name, value): + def __init__(self): + pass + + def setup(self, id, name, value): self.id = id self.name = name @@ -306,12 +380,11 @@ class ParameterConf(): parmElement.set('name', self.name) parmElement.set('value', self.value) - def readXml(self, opElement): - + def readXml(self, parmElement): - pass -# se = SubElement(parmElement, 'value')#ESTO ES LO ULTIMO QUE SE TRABAJO -# se.text = self.value + self.id = parmElement.get('id') + self.name = parmElement.get('name') + self.value = parmElement.get('value') if __name__ == '__main__': diff --git a/schainpy/testSchainExp.py b/schainpy/testSchainExp.py deleted file mode 100644 index 9afae63..0000000 --- a/schainpy/testSchainExp.py +++ /dev/null @@ -1,120 +0,0 @@ -''' - -$Author: murco $ -$Id: testSchainExp.py 158 2012-11-08 21:31:03Z murco $ -''' -import os, sys -import time, datetime - -path = os.path.split(os.getcwd())[0] -sys.path.append(path) - -from Data.JROData import Voltage -from IO.VoltageIO 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/roj-idl71/Data/RAWDATA/Meteors" - self.path = "/remote/puma/2012_06/Meteors" - - self.startDate = datetime.date(2012,06,19) - self.endDate = datetime.date(2012,12,30) - - self.startTime = datetime.time(11,0,0) - self.endTime = datetime.time(23,59,59) - - self.nFFTPoints = 32 - - self.wrpath = "/home/roj-idl71/tmp/results" - self.profilesPerBlock = 40 - self.blocksPerFile = 50 - - def createObjects(self): - - self.readerObj = VoltageReader() - self.voltProcObj = VoltageProcessor() - self.specProcObj = SpectraProcessor() - - self.voltObj1 = self.readerObj.setup( - path = self.path, - startDate = self.startDate, - endDate = self.endDate, - startTime = self.startTime, - endTime = self.endTime, - expLabel = '', - online = True) - - self.voltObj2 = self.voltProcObj.setup(dataInObj = self.voltObj1) - self.specObj1 = self.specProcObj.setup(dataInObj = self.voltObj2, nFFTPoints = self.nFFTPoints) - - def testSChain(self): - - ini = time.time() - - while(True): - self.readerObj.getData() - - self.voltProcObj.init() - - self.voltProcObj.integrator(25, overlapping=False) -# -# self.voltProcObj.writeData(self.wrpath,self.profilesPerBlock,self.blocksPerFile) - self.voltProcObj.selectChannels([0,1,2]) - -# self.voltProcObj.plotScope(idfigure=0, -# wintitle='test plot library', -# driver='plplot', -# save=False, -# gpath=None, -# type="power") - -# self.voltProcObj.plotRti(idfigure=1, -# starttime=self.startTime, -# endtime=self.endTime, -# minvalue=0, -# maxvalue=50, -# wintitle='', -# driver='plplot', -# colormap='jet', -# colorbar=True, -# showprofile=False, -# xrangestep=2, -# save=False, -# gpath=None) -# -# if self.voltProcObj.dataOutObj.flagNoData ==False: -# print self.readerObj.dataOutObj.nProfiles - - self.specProcObj.init() - - self.specProcObj.plotSpc(idfigure=2, - minvalue=30, - maxvalue=70, - wintitle='Spectra', - driver='plplot', - colormap='jet', - colorbar=True, - showprofile=True, - save=False, - gpath=None) - - if self.readerObj.flagNoMoreFiles: - break - - if self.readerObj.flagIsNewBlock: -# print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks, datetime.datetime.fromtimestamp(self.readerObj.basicHeaderObj.utc),) - print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks, - datetime.datetime.fromtimestamp(self.readerObj.basicHeaderObj.utc + self.readerObj.basicHeaderObj.miliSecond/1000.0),) - - -if __name__ == '__main__': - TestSChain() \ No newline at end of file diff --git a/schainpy/testSchainSpecExp.py b/schainpy/testSchainSpecExp.py deleted file mode 100644 index 61b9eec..0000000 --- a/schainpy/testSchainSpecExp.py +++ /dev/null @@ -1,85 +0,0 @@ -''' - -$Author: murco $ -$Id: testSchainSpecExp.py 147 2012-10-30 22:50:56Z murco $ -''' - -import os, sys -import time, datetime - -path = os.path.split(os.getcwd())[0] -sys.path.append(path) - - -from Data.JROData import Spectra -from IO.SpectraIO import * -from Processing.SpectraProcessor import * - - - -class TestSChain: - - def __init__(self): - self.setValues() - self.createObjects() - self.testSChain() - - def setValues(self): -# self.path = "/Users/jro/Documents/RadarData/MST_ISR/MST" -## self.path = "/home/roj-idl71/Data/RAWDATA/IMAGING" -# self.path = "/Users/danielangelsuarezmunoz/Data/EW_Drifts" -# self.path = "/Users/danielangelsuarezmunoz/Data/IMAGING" - self.path = "/home/daniel/RadarData/IMAGING" - - self.startDate = datetime.date(2012,3,1) - self.endDate = datetime.date(2012,3,30) - - self.startTime = datetime.time(0,0,0) - self.endTime = datetime.time(14,1,1) - - # paramatros para Escritura de Pdata - self.wrpath = "/home/daniel/RadarData/test_wr2" - self.blocksPerFile = 5 - - - - def createObjects(self): - - self.readerObj = SpectraReader() - - self.specObj1 = self.readerObj.setup( - path = self.path, - startDate = self.startDate, - endDate = self.endDate, - startTime = self.startTime, - endTime = self.endTime, - expLabel = '', - online = 0) - - self.specObjProc = SpectraProcessor() - - self.specObj2 = self.specObjProc.setup(dataInObj = self.specObj1) - - - - def testSChain(self): - - ini = time.time() - - while(True): - self.readerObj.getData() - - self.specObjProc.init() - - self.specObjProc.writeData(self.wrpath,self.blocksPerFile) -# - if self.readerObj.flagNoMoreFiles: - break - - if self.readerObj.flagIsNewBlock: - print 'Block No %04d, Time: %s' %(self.readerObj.nTotalBlocks, - datetime.datetime.fromtimestamp(self.readerObj.basicHeaderObj.utc)) - - -if __name__ == '__main__': - TestSChain() \ No newline at end of file