schain Commit - r1594:16c6f41ffb3e · Jicamarca Repository

Remove numpy.float, numpy.int, numpy.complex

Juan C. Espinoza -

r1594:16c6f41ffb3e

parent child

Context file:

r1594:16c6f41ffb3e

Collapse all files

schainpy/model/io/jroIO_digitalRF.py +3 -3

                     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))
                           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.
                     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

schainpy/model/io/jroIO_hf.py +2 -2

                 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)
                     #
                     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))

schainpy/model/io/jroIO_param.py +28 -14

                     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
                         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)
                         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()
                                     return key
                         return name
                     else:
-                        if 'Metadata' in self.description:
+                        if 'Data' in self.description:
-                            meta = self.description['Metadata']
+                            data = self.description['Data']
+                            if 'Metadata' in self.description:
+                                data.update(self.description['Metadata'])
                         else:
-                            meta = self.description
+                            data = self.description
-                        if name in meta:
+                        if name in data:
-                            if isinstance(meta[name], list):
+                            if isinstance(data[name], list):
-                                return meta[name][x]
+                                return data[name][x]
-                            elif isinstance(meta[name], dict):
+                            elif isinstance(data[name], dict):
-                                for key, value in meta[name].items():
+                                for key, value in data[name].items():
                                     return value[x]
                         if 'cspc' in name:
                             return 'pair{:02d}'.format(x)
                             return 'channel{:02d}'.format(x)
                 def writeMetadata(self, fp):
                     if self.description:
                         if 'Metadata' in self.description:
                             grp = fp.create_group('Metadata')
                         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)

schainpy/model/io/jroIO_simulator.py +3 -3

                     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---------------
                     #----------------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)
                     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):

schainpy/model/io/jroIO_usrp.py +3 -3

                     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
                     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
                     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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages