schain-jc Commit - r611:cdbd858cadba

schainpy/model/data/jroamisr.py +1 -1

                 def copy(self, inputObj=None):
-                    if inputObj == None:
+                    if inputObj is None:
                         return copy.deepcopy(self)
                     for key in inputObj.__dict__.keys():

schainpy/model/data/jrodata.py +2 -2

                 def getFlagCspc(self):
-                    if self.data_cspc == None:
+                    if self.data_cspc is None:
                         return True
                     return False
                 def getFlagDc(self):
-                    if self.data_dc == None:
+                    if self.data_dc is None:
                         return True
                     return False

schainpy/model/io/jroIO_amisr.py +1 -1

                         self.readNextBlock()
-                    if self.datablock == None: # setear esta condicion cuando no hayan datos por leers
+                    if self.datablock is None: # setear esta condicion cuando no hayan datos por leers
                         self.dataOut.flagNoData = True
                         return 0

schainpy/model/io/jroIO_voltage.py +1 -1

                         self.getFirstHeader()
-                    if self.datablock == None:
+                    if self.datablock is None:
                         self.dataOut.flagNoData = True
                         return 0

schainpy/model/proc/jroproc_base.py +1 -1

             #         if name != 'run':
             #             return True
-                    if self.dataOut == None:
+                    if self.dataOut is None:
                         return False
                     if self.dataOut.isEmpty():

schainpy/model/proc/jroproc_correlation.py +1 -1

                         self.dataOut.nPoints = nPoints
             #             channels = numpy.sort(list(set(list(itertools.chain.from_iterable(pairsList)))))
-                        if self.buffer == None:
+                        if self.buffer is None:
                             self.buffer = numpy.zeros((self.dataIn.nChannels,self.dataIn.nProfiles,self.dataIn.nHeights),dtype='complex')

schainpy/model/proc/jroproc_heispectra.py +2 -2

                     data = numpy.reshape(data, (1, nChannels, nHeis))
                     #If the buffer is empty then it takes the data value
-                    if self.__buffer == None:
+                    if self.__buffer is None:
                         self.__buffer = data
                         self.__profIndex += 1
                         return
                     self.__lastdatatime = datatime
-                    if avgdata == None:
+                    if avgdata is None:
                         return None, None
                     avgdatatime = self.__initime

schainpy/model/proc/jroproc_parameters.py +5 -5

                             self.nSeconds = nSeconds
                             self.nProfiles= int(numpy.floor(nSeconds/(self.dataIn.ippSeconds*self.dataIn.nCohInt)))
-                        if self.buffer == None:
+                        if self.buffer is None:
                                 self.buffer = numpy.zeros((self.dataIn.nChannels,
                                                            self.nProfiles,
                                                            self.dataIn.nHeights),
                     elif (self.smooth < 3): smooth = 0
                     if (type1 == None): type1 = 0
-                    if (fwindow == None): fwindow = numpy.zeros(oldfreq.size) + 1
+                    if (fwindow is None): fwindow = numpy.zeros(oldfreq.size) + 1
                     if (snrth == None): snrth = -3
                     if (dc == None): dc = 0
                     if (aliasing == None): aliasing = 0
                                 error1 = p0*numpy.nan
                             #Save
-                            if self.dataOut.data_param == None:
+                            if self.dataOut.data_param is None:
                                 self.dataOut.data_param = numpy.zeros((nGroups, p0.size, nHeights))*numpy.nan
                                 self.dataOut.data_error = numpy.zeros((nGroups, p0.size + 1, nHeights))*numpy.nan
                             self.__isConfig = True
-                        if self.__buffer == None:
+                        if self.__buffer is None:
                             self.__buffer = dataOut.data_param
                             self.__firstdata = copy.copy(dataOut)
                         self.__isConfig = True
-                    if self.__buffer == None:
+                    if self.__buffer is None:
                         self.__buffer = dataOut.data_param.copy()
                     else:

schainpy/model/proc/jroproc_spectra.py +7 -7

                         self.dataOut.nFFTPoints = nFFTPoints
                         self.dataOut.pairsList = pairsList
-                        if self.buffer == None:
+                        if self.buffer is None:
                             self.buffer = numpy.zeros((self.dataIn.nChannels,
                                                        nProfiles,
                                                        self.dataIn.nHeights),
                     if not self.__withOverapping:
                         self.__buffer_spc += data_spc
-                        if data_cspc == None:
+                        if data_cspc is None:
                             self.__buffer_cspc = None
                         else:
                             self.__buffer_cspc += data_cspc
-                        if data_dc == None:
+                        if data_dc is None:
                             self.__buffer_dc = None
                         else:
                             self.__buffer_dc += data_dc
                         data_dc = numpy.reshape(data_dc, (1, -1, nHeis))
                     #If the buffer is empty then it takes the data value
-                    if self.__buffer_spc == None:
+                    if self.__buffer_spc is None:
                         self.__buffer_spc = data_spc
-                        if data_cspc == None:
+                        if data_cspc is None:
                             self.__buffer_cspc = None
                         else:
                             self.__buffer_cspc += data_cspc
-                        if data_dc == None:
+                        if data_dc is None:
                             self.__buffer_dc = None
                         else:
                             self.__buffer_dc += data_dc
                     self.__lastdatatime = datatime
-                    if avgdata_spc == None:
+                    if avgdata_spc is None:
                         return None, None, None, None
                     avgdatatime = self.__initime

schainpy/model/proc/jroproc_voltage.py +4 -4

                     data = numpy.reshape(data, (1, nChannels, nHeis))
                     #If the buffer is empty then it takes the data value
-                    if self.__buffer == None:
+                    if self.__buffer is None:
                         self.__buffer = data
                         self.__profIndex += 1
                         return
                     self.__lastdatatime = datatime
-                    if avgdata == None:
+                    if avgdata is None:
                         return None, None
                     avgdatatime = self.__initime
                     code = self.code[self.__profIndex]
                     for i in range(self.__nChannels):
-                        self.datadecTime[i,:] = numpy.correlate(data[i,:], code, mode='same')
+                        self.datadecTime[i,:] = numpy.correlate(data[i,:], code, mode='full')[self.nBaud-1:]
                     return self.datadecTime
                     if not self.isConfig:
-                        if code == None:
+                        if code is None:
                             code = dataOut.code
                         else:
                             code = numpy.array(code).reshape(nCode,nBaud)

	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