diff --git a/schainpy/model/io/jroIO_digitalRF.py b/schainpy/model/io/jroIO_digitalRF.py index 114d5da..50dd973 100644 --- a/schainpy/model/io/jroIO_digitalRF.py +++ b/schainpy/model/io/jroIO_digitalRF.py @@ -110,7 +110,7 @@ class DigitalRFReader(ProcessingUnit): self.dataOut.nProfiles = int(nProfiles) self.dataOut.heightList = self.__firstHeigth + \ - numpy.arange(self.__nSamples, dtype=numpy.float) * \ + numpy.arange(self.__nSamples, dtype=numpy.float32) * \ self.__deltaHeigth self.dataOut.channelList = list(range(self.__num_subchannels)) @@ -233,7 +233,7 @@ class DigitalRFReader(ProcessingUnit): nCode=1, nBaud=1, flagDecodeData=False, - code=numpy.ones((1, 1), dtype=numpy.int), + code=numpy.ones((1, 1), dtype=numpy.int32), **kwargs): ''' In this method we should set all initial parameters. @@ -404,7 +404,7 @@ class DigitalRFReader(ProcessingUnit): self.__thisUnixSample = int(startUTCSecond * self.__sample_rate) - self.__samples_to_read self.__data_buffer = numpy.zeros( - (self.__num_subchannels, self.__samples_to_read), dtype=numpy.complex) + (self.__num_subchannels, self.__samples_to_read), dtype=complex) self.__setFileHeader() self.isConfig = True diff --git a/schainpy/model/io/jroIO_hf.py b/schainpy/model/io/jroIO_hf.py index 9738168..4ff6b2a 100644 --- a/schainpy/model/io/jroIO_hf.py +++ b/schainpy/model/io/jroIO_hf.py @@ -686,7 +686,7 @@ class HFReader(ProcessingUnit): def __setLocalVariables(self): - self.datablock = numpy.zeros((self.nChannels, self.nHeights, self.nProfiles), dtype=numpy.complex) + self.datablock = numpy.zeros((self.nChannels, self.nHeights, self.nProfiles), dtype=complex) # @@ -743,7 +743,7 @@ class HFReader(ProcessingUnit): self.dataOut.nProfiles = 1 - self.dataOut.heightList = self.__firstHeigth + numpy.arange(self.__nSamples, dtype=numpy.float) * self.__deltaHeigth + self.dataOut.heightList = self.__firstHeigth + numpy.arange(self.__nSamples, dtype=numpy.float32) * self.__deltaHeigth self.dataOut.channelList = list(range(self.nChannels)) diff --git a/schainpy/model/io/jroIO_param.py b/schainpy/model/io/jroIO_param.py index 04b0603..fd66935 100644 --- a/schainpy/model/io/jroIO_param.py +++ b/schainpy/model/io/jroIO_param.py @@ -360,13 +360,24 @@ class HDFWriter(Operation): Operation.__init__(self) return - def setup(self, path=None, blocksPerFile=10, metadataList=None, dataList=None, setType=None, description=None): + def set_kwargs(self, **kwargs): + + for key, value in kwargs.items(): + setattr(self, key, value) + + def set_kwargs_obj(self, obj, **kwargs): + + for key, value in kwargs.items(): + setattr(obj, key, value) + + def setup(self, path=None, blocksPerFile=10, metadataList=None, dataList=None, setType=None, description=None, **kwargs): self.path = path self.blocksPerFile = blocksPerFile self.metadataList = metadataList self.dataList = [s.strip() for s in dataList] self.setType = setType self.description = description + self.set_kwargs(**kwargs) if self.metadataList is None: self.metadataList = self.dataOut.metadata_list @@ -385,7 +396,7 @@ class HDFWriter(Operation): if dataAux is None: continue - elif isinstance(dataAux, (int, float, numpy.integer, numpy.float)): + elif isinstance(dataAux, (int, float, numpy.integer, numpy.float32)): dsDict['nDim'] = 0 else: dsDict['nDim'] = len(dataAux.shape) @@ -422,13 +433,14 @@ class HDFWriter(Operation): return False def run(self, dataOut, path, blocksPerFile=10, metadataList=None, - dataList=[], setType=None, description={}): + dataList=[], setType=None, description={}, **kwargs): self.dataOut = dataOut + self.set_kwargs_obj(self.dataOut, **kwargs) if not(self.isConfig): self.setup(path=path, blocksPerFile=blocksPerFile, metadataList=metadataList, dataList=dataList, - setType=setType, description=description) + setType=setType, description=description, **kwargs) self.isConfig = True self.setNextFile() @@ -508,15 +520,17 @@ class HDFWriter(Operation): return key return name else: - if 'Metadata' in self.description: - meta = self.description['Metadata'] + if 'Data' in self.description: + data = self.description['Data'] + if 'Metadata' in self.description: + data.update(self.description['Metadata']) else: - meta = self.description - if name in meta: - if isinstance(meta[name], list): - return meta[name][x] - elif isinstance(meta[name], dict): - for key, value in meta[name].items(): + data = self.description + if name in data: + if isinstance(data[name], list): + return data[name][x] + elif isinstance(data[name], dict): + for key, value in data[name].items(): return value[x] if 'cspc' in name: return 'pair{:02d}'.format(x) @@ -524,7 +538,7 @@ class HDFWriter(Operation): return 'channel{:02d}'.format(x) def writeMetadata(self, fp): - + if self.description: if 'Metadata' in self.description: grp = fp.create_group('Metadata') @@ -706,7 +720,7 @@ class ASCIIWriter(Operation): if dataAux is None: continue - elif isinstance(dataAux, (int, float, numpy.integer, numpy.float)): + elif isinstance(dataAux, (int, float, numpy.integer, numpy.float32)): dsDict['nDim'] = 0 else: dsDict['nDim'] = len(dataAux.shape) diff --git a/schainpy/model/io/jroIO_simulator.py b/schainpy/model/io/jroIO_simulator.py index 7f359e9..9695905 100644 --- a/schainpy/model/io/jroIO_simulator.py +++ b/schainpy/model/io/jroIO_simulator.py @@ -332,7 +332,7 @@ class SimulatorReader(JRODataReader, ProcessingUnit): Hdoppler = self.Hdoppler Adoppler = self.Adoppler - self.datablock = numpy.zeros([channels, prof_gen, Samples], dtype=numpy.complex64) + self.datablock = numpy.zeros([channels, prof_gen, Samples], dtype=complex) for i in range(channels): for k in range(prof_gen): #-----------------------NOISE--------------- @@ -358,7 +358,7 @@ class SimulatorReader(JRODataReader, ProcessingUnit): #----------------DOPPLER SIGNAL............................................... time_vec = numpy.linspace(0, (prof_gen - 1) * ippSec, int(prof_gen)) + self.nReadBlocks * ippSec * prof_gen + (self.nReadFiles - 1) * ippSec * prof_gen fd = Fdoppler # +(600.0/120)*self.nReadBlocks - d_signal = Adoppler * numpy.array(numpy.exp(1.0j * 2.0 * math.pi * fd * time_vec), dtype=numpy.complex64) + d_signal = Adoppler * numpy.array(numpy.exp(1.0j * 2.0 * math.pi * fd * time_vec), dtype=complex) #-------------Senal con ancho espectral-------------------- if prof_gen % 2 == 0: min = int(prof_gen / 2.0 - 1.0) @@ -371,7 +371,7 @@ class SimulatorReader(JRODataReader, ProcessingUnit): A = 20 specw_sig = specw_sig / w specw_sig = numpy.sinc(specw_sig) - specw_sig = A * numpy.array(specw_sig, dtype=numpy.complex64) + specw_sig = A * numpy.array(specw_sig, dtype=complex) #------------------ DATABLOCK + DOPPLER-------------------- HD = int(Hdoppler / self.AcqDH_0) for i in range(12): diff --git a/schainpy/model/io/jroIO_usrp.py b/schainpy/model/io/jroIO_usrp.py index 286663d..03d7b55 100644 --- a/schainpy/model/io/jroIO_usrp.py +++ b/schainpy/model/io/jroIO_usrp.py @@ -86,7 +86,7 @@ class USRPReader(ProcessingUnit): self.dataOut.nProfiles = nProfiles - self.dataOut.heightList = self.__firstHeigth + numpy.arange(self.__nSamples, dtype=numpy.float) * self.__deltaHeigth + self.dataOut.heightList = self.__firstHeigth + numpy.arange(self.__nSamples, dtype=numpy.float32) * self.__deltaHeigth self.dataOut.channelList = self.__channelList @@ -257,7 +257,7 @@ class USRPReader(ProcessingUnit): nCode = 1 nBaud = 1 - code = numpy.ones((nCode, nBaud), dtype=numpy.int) + code = numpy.ones((nCode, nBaud), dtype=numpy.int32) if codeType: nCode = this_metadata_file['nCode'].value @@ -341,7 +341,7 @@ class USRPReader(ProcessingUnit): self.__thisUnixSample = int(startUTCSecond * self.__sample_rate) - self.__samples_to_read - self.__data_buffer = numpy.zeros((self.__nChannels, self.__samples_to_read), dtype=numpy.complex) + self.__data_buffer = numpy.zeros((self.__nChannels, self.__samples_to_read), dtype=complex) self.__setFileHeader() self.isConfig = True