diff --git a/schainpy/model/data/jroheaderIO.py b/schainpy/model/data/jroheaderIO.py index c03853d..38f2d06 100644 --- a/schainpy/model/data/jroheaderIO.py +++ b/schainpy/model/data/jroheaderIO.py @@ -370,7 +370,6 @@ class RadarControllerHeader(Header): if fp.tell() < endFp: sys.stderr.write("Warning %s: Size value read from Radar Controller header is greater than it has to be\n" %fp.name) - return 1 def write(self, fp): diff --git a/schainpy/model/io/jroIO_digitalRF.py b/schainpy/model/io/jroIO_digitalRF.py index 76f1883..06bf1d9 100644 --- a/schainpy/model/io/jroIO_digitalRF.py +++ b/schainpy/model/io/jroIO_digitalRF.py @@ -548,7 +548,7 @@ class DigitalRFWriter(Operation): Operation.__init__(self, **kwargs) self.dataOut = None - def setup(self, dataIn, path, blocksPerFile, set=0, ext=None): + def setup(self, dataIn, path, blocksPerFile, set=0, ext='.h5'): ''' In this method we should set all initial parameters. @@ -566,7 +566,7 @@ class DigitalRFWriter(Operation): return - def run(self, dataIn, **kwargs): + def run(self, dataIn, path=None, **kwargs): ''' This method will be called many times so here you should put all your code @@ -575,9 +575,15 @@ class DigitalRFWriter(Operation): dataIn : object with the data ''' - + print dir(dataIn) + print 'blocksize', dataIn.blocksize + print 'channelIndexList', dataIn.channelIndexList + print 'ippSeconds', dataIn.ippSeconds + print 'frequency', dataIn.frequency + print 'nProfiles', dataIn.nProfiles + print 'systemHeaderObj.nSamples', dataIn.systemHeaderObj.nSamples if not self.isConfig: - self.setup(dataIn, **kwargs) + self.setup(dataIn, path, **kwargs) if __name__ == '__main__': diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index 71435e4..f394593 100644 --- a/schainpy/scripts/schain.xml +++ b/schainpy/scripts/schain.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/schainpy/scripts/testDigitalRFWriter.py b/schainpy/scripts/testDigitalRFWriter.py new file mode 100644 index 0000000..72f3285 --- /dev/null +++ b/schainpy/scripts/testDigitalRFWriter.py @@ -0,0 +1,94 @@ +import os, sys + +from schainpy.controller import Project + +if __name__ == '__main__': + + desc = "Segundo Test" + filename = "schain.xml" + + controllerObj = Project() + + controllerObj.setup(id = '191', name='test01', description=desc) + + readUnitConfObj = controllerObj.addReadUnit(datatype='VoltageReader', + path='/home/jchavez/jicamarca/jro_data/rawdata/', + startDate='2010/10/28', + endDate='2017/10/28', + startTime='00:00:00', + endTime='23:59:59', + online=0, + walk=0) + + opObj00 = readUnitConfObj.addOperation(name='printNumberOfBlock') + + procUnitConfObj0 = controllerObj.addProcUnit(datatype='VoltageProc', + inputId=readUnitConfObj.getId()) + + opObj10 = procUnitConfObj0.addOperation(name='DigitalRFWriter', optype='other') + opObj10.addParameter(name='path', value='/home/jchavez/jicamarca/data_sink/', format='str') + # opObj10.addParameter(name='minHei', value='0', format='float') + # opObj10.addParameter(name='maxHei', value='8', format='float') + + # opObj10 = procUnitConfObj0.addOperation(name='filterByHeights') + # opObj10.addParameter(name='window', value='2', format='float') + + # opObj10 = procUnitConfObj0.addOperation(name='Decoder', optype='external') + # opObj10.addParameter(name='code', value='1,-1', format='intlist') + # opObj10.addParameter(name='nCode', value='2', format='float') + # opObj10.addParameter(name='nBaud', value='1', format='float') + + + # opObj10 = procUnitConfObj0.addOperation(name='CohInt', optype='external') + # opObj10.addParameter(name='n', value='1296', format='float') + + # procUnitConfObj1 = controllerObj.addProcUnit(datatype='SpectraProc', + # inputId=procUnitConfObj0.getId()) + + #Creating a processing object with its parameters + #schainpy.model.proc.jroproc_spectra.SpectraProc.run() + #If you need to add more parameters can use the "addParameter method" + # procUnitConfObj1.addParameter(name='nFFTPoints', value='128', format='int') + + # opObj10 = procUnitConfObj1.addOperation(name='IncohInt', optype='external') + # opObj10.addParameter(name='n', value='2', format='float') + + #Using internal methods + #schainpy.model.proc.jroproc_spectra.SpectraProc.selectChannels() +# opObj10 = procUnitConfObj1.addOperation(name='selectChannels') +# opObj10.addParameter(name='channelList', value='0,1', format='intlist') + + #Using internal methods + #schainpy.model.proc.jroproc_spectra.SpectraProc.selectHeights() +# opObj10 = procUnitConfObj1.addOperation(name='selectHeights') +# opObj10.addParameter(name='minHei', value='90', format='float') +# opObj10.addParameter(name='maxHei', value='180', format='float') + + #Using external methods (new modules) +# #schainpy.model.proc.jroproc_spectra.IncohInt.setup() +# opObj12 = procUnitConfObj1.addOperation(name='IncohInt', optype='other') +# opObj12.addParameter(name='n', value='1', format='int') + + #Using external methods (new modules) + #schainpy.model.graphics.jroplot_spectra.SpectraPlot.setup() +# opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='external') +# opObj11.addParameter(name='id', value='11', format='int') +# opObj11.addParameter(name='wintitle', value='SpectraPlot', format='str') +# opObj11.addParameter(name='zmin', value='-60', format='int') +# opObj11.addParameter(name='zmax', value='10', format='int') +# opObj11.addParameter(name='save', value='1', format='int') + +# #Using external methods (new modules) +# #schainpy.model.graphics.jroplot_spectra.RTIPlot.setup() +# opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') +# opObj11.addParameter(name='id', value='30', format='int') +# opObj11.addParameter(name='wintitle', value='RTI', format='str') +# opObj11.addParameter(name='zmin', value='-60', format='int') +# opObj11.addParameter(name='zmax', value='-10', format='int') +# opObj11.addParameter(name='showprofile', value='1', format='int') +# # opObj11.addParameter(name='timerange', value=str(5*60*60*60), format='int') +# opObj11.addParameter(name='xmin', value='14', format='float') +# opObj11.addParameter(name='xmax', value='23.9', format='float') +# opObj11.addParameter(name='save', value='1', format='int') + + controllerObj.start()