diff --git a/schainpy/model/io/jroIO_digitalRF.py b/schainpy/model/io/jroIO_digitalRF.py index 48c69d0..92ceef9 100644 --- a/schainpy/model/io/jroIO_digitalRF.py +++ b/schainpy/model/io/jroIO_digitalRF.py @@ -214,7 +214,7 @@ class DigitalRFReader(ProcessingUnit): online delay ''' - + self.i = 0 if not os.path.isdir(path): raise ValueError, "[Reading] Directory %s does not exist" %path @@ -248,7 +248,6 @@ class DigitalRFReader(ProcessingUnit): self.__deltaHeigth = 1e6*0.15/self.__sample_rate ## why 0.15? this_metadata_file = self.digitalReadObj.get_digital_metadata(channelNameList[channelList[0]]) - print this_metadata_file metadata_bounds = this_metadata_file.get_bounds() self.fixed_metadata_dict = this_metadata_file.read(metadata_bounds[0])[metadata_bounds[0]] ## GET FIRST HEADER self.__processingHeader = self.fixed_metadata_dict['processingHeader'] @@ -321,12 +320,10 @@ class DigitalRFReader(ProcessingUnit): if end_index < endUTCSecond*self.__sample_rate: endUTCSecond = end_index/self.__sample_rate - print ippKm if not nSamples: if not ippKm: raise ValueError, "[Reading] nSamples or ippKm should be defined" nSamples = int(ippKm / (1e6*0.15/self.__sample_rate)) - print nSamples channelBoundList = [] channelNameListFiltered = [] @@ -565,7 +562,7 @@ class DigitalRFReader(ProcessingUnit): return # print self.profileIndex - ##@profile + def run(self, **kwargs): ''' This method will be called many times so here you should put all your code @@ -573,7 +570,7 @@ class DigitalRFReader(ProcessingUnit): if not self.isConfig: self.setup(**kwargs) - self.i = self.i+1 + #self.i = self.i+1 self.getData(seconds=self.__delay) return @@ -624,7 +621,8 @@ class DigitalRFWriter(Operation): self.__nSamples = dataOut.systemHeaderObj.nSamples self.__nProfiles = dataOut.nProfiles self.__blocks_per_file = dataOut.processingHeaderObj.dataBlocksPerFile - self.arr_data = arr_data = numpy.ones((self.__nSamples, 2), dtype=[('r', self.__dtype), ('i', self.__dtype)]) + + self.arr_data = arr_data = numpy.ones((self.__nSamples, len(self.dataOut.channelList)), dtype=[('r', self.__dtype), ('i', self.__dtype)]) file_cadence_millisecs = long(1.0 * self.__blocks_per_file * self.__nProfiles * self.__nSamples / self.__sample_rate) * 1000 sub_cadence_secs = file_cadence_millisecs / 500 @@ -693,7 +691,7 @@ class DigitalRFWriter(Operation): return - def run(self, dataOut, frequency=49.92e6, path=None, fileCadence=1000, dirCadence=100, metadataCadence=1, **kwargs): + def run(self, dataOut, frequency=49.92e6, path=None, fileCadence=100, dirCadence=25, metadataCadence=1, **kwargs): ''' This method will be called many times so here you should put all your code Inputs: @@ -703,13 +701,14 @@ class DigitalRFWriter(Operation): self.dataOut = dataOut if not self.isConfig: self.setup(dataOut, path, frequency, fileCadence, dirCadence, metadataCadence, **kwargs) + self.writeMetadata() self.writeData() - self.currentSample += 1 - if self.dataOut.flagDataAsBlock or self.currentSample == 1: - self.writeMetadata() - if self.currentSample == self.__nProfiles: self.currentSample = 0 + ## self.currentSample += 1 + ## if self.dataOut.flagDataAsBlock or self.currentSample == 1: + ## self.writeMetadata() + ## if self.currentSample == self.__nProfiles: self.currentSample = 0 def close(self): print '[Writing] - Closing files ' diff --git a/schainpy/model/io/jroIO_voltage.py b/schainpy/model/io/jroIO_voltage.py index 6210887..dfec026 100644 --- a/schainpy/model/io/jroIO_voltage.py +++ b/schainpy/model/io/jroIO_voltage.py @@ -79,9 +79,9 @@ class VoltageReader(JRODataReader, ProcessingUnit): Return: None """ - + ProcessingUnit.__init__(self, **kwargs) - + self.i = 0 self.isConfig = False self.datablock = None diff --git a/schainpy/scripts/JASMET30_MetDet.py b/schainpy/scripts/JASMET30_MetDet.py index 870f1f0..2286c39 100644 --- a/schainpy/scripts/JASMET30_MetDet.py +++ b/schainpy/scripts/JASMET30_MetDet.py @@ -18,7 +18,7 @@ controllerObj.setup(id = '002', name='script02', description="JASMET Meteor Dete # path = '/mnt/jars/2016_08/NOCHE' # path = '/media/joscanoa/DATA_JASMET/JASMET/2016_08/DIA' # path = '/media/joscanoa/DATA_JASMET/JASMET/2016_08/NOCHE' -path = '/media/joscanoa/DATA_JASMET/JASMET/2016_08/DIA' +path = '/media/nanosat/NewVolumen/JASMET/2016_08/DIA' #Path para los graficos pathfig = os.path.join(os.environ['HOME'],'Pictures/JASMET30/201608/graphics') diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index ae7148b..9bf6eed 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/testDigitalRF.py b/schainpy/scripts/testDigitalRF.py index c5b255f..4d584df 100644 --- a/schainpy/scripts/testDigitalRF.py +++ b/schainpy/scripts/testDigitalRF.py @@ -24,15 +24,15 @@ def main(): #Creating a reader object with its parameters #schainpy.model.io.jroIO_usrp.USRPReader.setup() readUnitConfObj = controllerObj.addReadUnit(datatype='DigitalRF', - path='/media/jchavez/DATA/mocked_data', + path='/home/nanosat/data/', startDate='2000/07/03', endDate='2017/07/03', startTime='00:00:00', endTime='23:59:59', online=0) - procUnitConfObj0 = controllerObj.addProcUnit(datatype='Voltage', - inputId=readUnitConfObj.getId()) + # procUnitConfObj0 = controllerObj.addProcUnit(datatype='Voltage', + # inputId=readUnitConfObj.getId()) # opObj10 = procUnitConfObj0.addOperation(name='selectHeights') # opObj10.addParameter(name='minHei', value='0', format='float') diff --git a/schainpy/scripts/testDigitalRFWriter.py b/schainpy/scripts/testDigitalRFWriter.py index 5e235a7..c1addc5 100644 --- a/schainpy/scripts/testDigitalRFWriter.py +++ b/schainpy/scripts/testDigitalRFWriter.py @@ -12,7 +12,7 @@ if __name__ == '__main__': controllerObj.setup(id = '191', name='test01', description=desc) readUnitConfObj = controllerObj.addReadUnit(datatype='VoltageReader', - path='/home/jchavez/jicamarca/jro_data/rawdata/', + path='/home/nanosat/data/John', startDate='2010/10/28', endDate='2017/10/28', startTime='00:00:00', @@ -30,7 +30,7 @@ if __name__ == '__main__': # opObj11.addParameter(name='wintitle', value='Scope', format='str') opObj10 = procUnitConfObj0.addOperation(name='DigitalRFWriter', optype='other') - opObj10.addParameter(name='path', value='/media/jchavez/DATA/mocked_data/voltage', format='str') + opObj10.addParameter(name='path', value='/home/nanosat/data/digitalrf', format='str') # opObj10.addParameter(name='minHei', value='0', format='float') # opObj10.addParameter(name='maxHei', value='8', format='float')