diff --git a/schainpy2/Data/JROData.py b/schainpy2/Data/JROData.py index 4b52876..10120c0 100644 --- a/schainpy2/Data/JROData.py +++ b/schainpy2/Data/JROData.py @@ -1,3 +1,9 @@ +''' + +$Author$ +$Id$ +''' + import os, sys import copy import numpy diff --git a/schainpy2/Data/Spectra.py b/schainpy2/Data/Spectra.py index c21574c..19d350d 100644 --- a/schainpy2/Data/Spectra.py +++ b/schainpy2/Data/Spectra.py @@ -1,3 +1,9 @@ +''' + +$Author$ +$Id$ +''' + import os, sys import numpy diff --git a/schainpy2/Data/Voltage.py b/schainpy2/Data/Voltage.py index 2cf7ec3..b3e4a8e 100644 --- a/schainpy2/Data/Voltage.py +++ b/schainpy2/Data/Voltage.py @@ -1,3 +1,9 @@ +''' + +$Author$ +$Id$ +''' + import os, sys import numpy diff --git a/schainpy2/IO/JRODataIO.py b/schainpy2/IO/JRODataIO.py index 47a639f..5b9a27d 100644 --- a/schainpy2/IO/JRODataIO.py +++ b/schainpy2/IO/JRODataIO.py @@ -1,3 +1,9 @@ +''' + +$Author$ +$Id$ +''' + import os, sys import glob import time @@ -707,7 +713,7 @@ class JRODataWriter(JRODataIO): raise ValueError, "No implemented" - def setup(self, path, profilesPerBlock, blocksPerFile, set=0, ext=None): + def setup(self, path, blocksPerFile, profilesPerBlock=None, set=0, ext=None): """ Setea el tipo de formato en la cual sera guardada la data y escribe el First Header @@ -732,10 +738,10 @@ class JRODataWriter(JRODataIO): self.setFile = set - 1 - self.profilesPerBlock = profilesPerBlock - self.blocksPerFile = blocksPerFile + self.profilesPerBlock = profilesPerBlock + if not(self.setNextFile()): print "There isn't a next file" return 0 diff --git a/schainpy2/IO/JROHeader.py b/schainpy2/IO/JROHeader.py index 8331a6f..5ab88cd 100644 --- a/schainpy2/IO/JROHeader.py +++ b/schainpy2/IO/JROHeader.py @@ -1,8 +1,7 @@ ''' -Created on 23/01/2012 -@author $Author: vsarmiento $ -@version $Id: HeaderIO.py 37 2012-03-26 22:55:13Z vsarmiento $ +$Author$ +$Id$ ''' import numpy diff --git a/schainpy2/IO/SpectraIO.py b/schainpy2/IO/SpectraIO.py index 13beb1c..00e8d51 100644 --- a/schainpy2/IO/SpectraIO.py +++ b/schainpy2/IO/SpectraIO.py @@ -1,9 +1,7 @@ -''' -File: SpectraIO.py -Created on 20/02/2012 +''' -@author $Author: dsuarez $ -@version $Id: SpectraIO.py 110 2012-07-19 15:18:18Z dsuarez $ +$Author$ +$Id$ ''' import os, sys @@ -367,7 +365,7 @@ class SpectraReader(JRODataReader): self.dataOutObj.channelIndexList = range(self.systemHeaderObj.nChannels) - self.dataOutObj.dataUtcTime = self.basicHeaderObj.utc #+ self.profileIndex * self.ippSeconds + self.dataOutObj.dataUtcTime = self.basicHeaderObj.utc + self.basicHeaderObj.miliSecond/1000.#+ self.profileIndex * self.ippSeconds self.dataOutObj.flagShiftFFT = self.processingHeaderObj.shif_fft @@ -540,13 +538,14 @@ class SpectraWriter(JRODataWriter): data['imag'] = cspc.imag data = data.reshape((-1)) data.tofile(self.fp) - - data = numpy.zeros( self.shape_dc_Buffer, self.dtype ) - dc = self.data_dc - data['real'] = dc.real - data['imag'] = dc.imag - data = data.reshape((-1)) - data.tofile(self.fp) + + if self.data_dc != None: + data = numpy.zeros( self.shape_dc_Buffer, self.dtype ) + 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) @@ -557,6 +556,7 @@ class SpectraWriter(JRODataWriter): self.flagIsNewBlock = 1 self.nTotalBlocks += 1 self.nWriteBlocks += 1 + self.blockIndex += 1 def putData(self): @@ -673,17 +673,17 @@ class SpectraWriter(JRODataWriter): pts2write = self.dataOutObj.nHeights * self.dataOutObj.nFFTPoints pts2write_SelfSpectra = int(self.nWrChannels * pts2write) - blocksize = pts2write_SelfSpectra + blocksize = (pts2write_SelfSpectra*datatypeValue) if self.dataOutObj.data_cspc != None: pts2write_CrossSpectra = int(self.nWrPairs * pts2write) - blocksize += pts2write_CrossSpectra + blocksize += (pts2write_CrossSpectra*datatypeValue*2) if self.dataOutObj.data_dc != None: pts2write_DCchannels = int(self.nWrChannels * self.dataOutObj.nHeights) - blocksize += pts2write_DCchannels + blocksize += (pts2write_DCchannels*datatypeValue*2) - blocksize = blocksize * datatypeValue * 2 + blocksize = blocksize #* datatypeValue * 2 #CORREGIR ESTO return blocksize diff --git a/schainpy2/IO/VoltageIO.py b/schainpy2/IO/VoltageIO.py index 515d1ab..78b526c 100644 --- a/schainpy2/IO/VoltageIO.py +++ b/schainpy2/IO/VoltageIO.py @@ -1,8 +1,7 @@ ''' -Created on 23/01/2012 -@author $Author: dsuarez $ -@version $Id: VoltageIO.py 110 2012-07-19 15:18:18Z dsuarez $ +$Author$ +$Id$ ''' import os, sys @@ -294,7 +293,7 @@ class VoltageReader(JRODataReader): self.dataOutObj.flagTimeBlock = self.flagTimeBlock - self.dataOutObj.dataUtcTime = self.basicHeaderObj.utc + self.profileIndex * self.ippSeconds + self.dataOutObj.dataUtcTime = self.basicHeaderObj.utc + self.basicHeaderObj.miliSecond/1000. + self.profileIndex * self.ippSeconds self.dataOutObj.nCohInt = self.processingHeaderObj.nCohInt diff --git a/schainpy2/Processing/SpectraProcessor.py b/schainpy2/Processing/SpectraProcessor.py index 2771a3b..8faf03e 100644 --- a/schainpy2/Processing/SpectraProcessor.py +++ b/schainpy2/Processing/SpectraProcessor.py @@ -1,9 +1,9 @@ ''' -Created on Feb 7, 2012 -@author $Author: murco $ -@version $Id: SpectraProcessor.py 119 2012-09-05 17:06:09Z murco $ +$Author$ +$Id$ ''' + import os, sys import numpy import time @@ -256,9 +256,9 @@ class SpectraProcessor: # self.getNoise() - def addWriter(self, wrpath, profilesPerBlock, blocksPerFile): + def addWriter(self, wrpath, blocksPerFile): objWriter = SpectraWriter(self.dataOutObj) - objWriter.setup(wrpath, profilesPerBlock, blocksPerFile) + objWriter.setup(wrpath, blocksPerFile) self.writerObjList.append(objWriter) def addIntegrator(self,N,timeInterval): @@ -266,12 +266,12 @@ class SpectraProcessor: objIncohInt = IncoherentIntegration(N,timeInterval) self.integratorObjList.append(objIncohInt) - def writeData(self, wrpath, profilesPerBlock, blocksPerFile): + def writeData(self, wrpath, blocksPerFile): if self.dataOutObj.flagNoData: return 0 if len(self.writerObjList) <= self.writerObjIndex: - self.addWriter(wrpath, profilesPerBlock, blocksPerFile) + self.addWriter(wrpath, blocksPerFile) self.writerObjList[self.writerObjIndex].putData() diff --git a/schainpy2/Processing/VoltageProcessor.py b/schainpy2/Processing/VoltageProcessor.py index 1b92971..b235f19 100644 --- a/schainpy2/Processing/VoltageProcessor.py +++ b/schainpy2/Processing/VoltageProcessor.py @@ -1,3 +1,9 @@ +''' + +$Author$ +$Id$ +''' + import os import sys import numpy @@ -46,18 +52,18 @@ class VoltageProcessor: objCohInt = CoherentIntegrator(N,timeInterval) self.integratorObjList.append(objCohInt) - def addWriter(self, wrpath, profilesPerBlock, blocksPerFile): + def addWriter(self, wrpath, blocksPerFile, profilesPerBlock): objWriter = VoltageWriter(self.dataOutObj) - objWriter.setup(wrpath,profilesPerBlock,blocksPerFile) + objWriter.setup(wrpath,blocksPerFile,profilesPerBlock) self.writerObjList.append(objWriter) - def writeData(self, wrpath, profilesPerBlock, blocksPerFile): + def writeData(self, wrpath, blocksPerFile, profilesPerBlock): if self.dataOutObj.flagNoData: return 0 if len(self.writerObjList) <= self.writerObjIndex: - self.addWriter(wrpath, profilesPerBlock, blocksPerFile) + self.addWriter(wrpath, blocksPerFile, profilesPerBlock) self.writerObjList[self.writerObjIndex].putData() diff --git a/schainpy2/testSchainExp.py b/schainpy2/testSchainExp.py index 6dff19e..51667e6 100644 --- a/schainpy2/testSchainExp.py +++ b/schainpy2/testSchainExp.py @@ -1,4 +1,8 @@ +''' +$Author$ +$Id$ +''' import os, sys import time, datetime diff --git a/schainpy2/testSchainSpecExp.py b/schainpy2/testSchainSpecExp.py index a7f0e8a..ed88632 100644 --- a/schainpy2/testSchainSpecExp.py +++ b/schainpy2/testSchainSpecExp.py @@ -1,3 +1,8 @@ +''' + +$Author$ +$Id$ +''' import os, sys import time, datetime @@ -20,10 +25,11 @@ class TestSChain: 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 = "/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) @@ -32,10 +38,9 @@ class TestSChain: self.endTime = datetime.time(14,1,1) # paramatros para Escritura de Pdata - self.wrpath = "/Users/danielangelsuarezmunoz/Data/testWR_pdata" - self.profilesPerBlock = 8 + self.wrpath = "/home/daniel/RadarData/test_wr2" self.blocksPerFile = 5 -# self.pairList = [(0,1),(0,2)] + def createObjects(self): @@ -50,7 +55,7 @@ class TestSChain: endTime = self.endTime, expLabel = '', online = 0) - # new lines + self.specObjProc = SpectraProcessor() self.specObj2 = self.specObjProc.setup(dataInObj = self.specObj1) @@ -66,8 +71,8 @@ class TestSChain: self.specObjProc.init() - self.specObjProc.writeData(self.wrpath,self.profilesPerBlock,self.blocksPerFile) - + self.specObjProc.writeData(self.wrpath,self.blocksPerFile) +# if self.readerObj.flagNoMoreFiles: break