From cdbd858cadba04086b77ef1613e20fe58f5ea788 2015-08-13 15:22:47 From: Miguel Valdez Date: 2015-08-13 15:22:47 Subject: [PATCH] Bug fixed: Padding decode data with zeros at the first heights was eliminated. --- diff --git a/schainpy/model/data/jroamisr.py b/schainpy/model/data/jroamisr.py index 630da15..dc87704 100644 --- a/schainpy/model/data/jroamisr.py +++ b/schainpy/model/data/jroamisr.py @@ -65,7 +65,7 @@ class AMISR: def copy(self, inputObj=None): - if inputObj == None: + if inputObj is None: return copy.deepcopy(self) for key in inputObj.__dict__.keys(): diff --git a/schainpy/model/data/jrodata.py b/schainpy/model/data/jrodata.py index 0764574..1b46264 100644 --- a/schainpy/model/data/jrodata.py +++ b/schainpy/model/data/jrodata.py @@ -619,14 +619,14 @@ class Spectra(JROData): 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 diff --git a/schainpy/model/io/jroIO_amisr.py b/schainpy/model/io/jroIO_amisr.py index 234296b..adf4e9d 100644 --- a/schainpy/model/io/jroIO_amisr.py +++ b/schainpy/model/io/jroIO_amisr.py @@ -668,7 +668,7 @@ class AMISRReader(ProcessingUnit): 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 diff --git a/schainpy/model/io/jroIO_voltage.py b/schainpy/model/io/jroIO_voltage.py index 296550c..6b35992 100644 --- a/schainpy/model/io/jroIO_voltage.py +++ b/schainpy/model/io/jroIO_voltage.py @@ -332,7 +332,7 @@ class VoltageReader(JRODataReader, ProcessingUnit): self.getFirstHeader() - if self.datablock == None: + if self.datablock is None: self.dataOut.flagNoData = True return 0 diff --git a/schainpy/model/proc/jroproc_base.py b/schainpy/model/proc/jroproc_base.py index 300250d..1baf171 100644 --- a/schainpy/model/proc/jroproc_base.py +++ b/schainpy/model/proc/jroproc_base.py @@ -116,7 +116,7 @@ class ProcessingUnit(object): # if name != 'run': # return True - if self.dataOut == None: + if self.dataOut is None: return False if self.dataOut.isEmpty(): diff --git a/schainpy/model/proc/jroproc_correlation.py b/schainpy/model/proc/jroproc_correlation.py index dda51f2..baf01ef 100644 --- a/schainpy/model/proc/jroproc_correlation.py +++ b/schainpy/model/proc/jroproc_correlation.py @@ -165,7 +165,7 @@ class CorrelationProc(ProcessingUnit): 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') diff --git a/schainpy/model/proc/jroproc_heispectra.py b/schainpy/model/proc/jroproc_heispectra.py index 2f8b69d..a00b59c 100644 --- a/schainpy/model/proc/jroproc_heispectra.py +++ b/schainpy/model/proc/jroproc_heispectra.py @@ -222,7 +222,7 @@ class IncohInt4SpectraHeis(Operation): 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 @@ -308,7 +308,7 @@ class IncohInt4SpectraHeis(Operation): self.__lastdatatime = datatime - if avgdata == None: + if avgdata is None: return None, None avgdatatime = self.__initime diff --git a/schainpy/model/proc/jroproc_parameters.py b/schainpy/model/proc/jroproc_parameters.py index 1c6c1fa..c860d23 100644 --- a/schainpy/model/proc/jroproc_parameters.py +++ b/schainpy/model/proc/jroproc_parameters.py @@ -75,7 +75,7 @@ class ParametersProc(ProcessingUnit): 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), @@ -174,7 +174,7 @@ class ParametersProc(ProcessingUnit): 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 @@ -1280,7 +1280,7 @@ class ParametersProc(ProcessingUnit): 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 @@ -1726,7 +1726,7 @@ class WindProfiler(Operation): self.__isConfig = True - if self.__buffer == None: + if self.__buffer is None: self.__buffer = dataOut.data_param self.__firstdata = copy.copy(dataOut) @@ -1963,7 +1963,7 @@ class PhaseCalibration(Operation): self.__isConfig = True - if self.__buffer == None: + if self.__buffer is None: self.__buffer = dataOut.data_param.copy() else: diff --git a/schainpy/model/proc/jroproc_spectra.py b/schainpy/model/proc/jroproc_spectra.py index 5a91998..d6e71ae 100644 --- a/schainpy/model/proc/jroproc_spectra.py +++ b/schainpy/model/proc/jroproc_spectra.py @@ -130,7 +130,7 @@ class SpectraProc(ProcessingUnit): 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), @@ -776,12 +776,12 @@ class IncohInt(Operation): 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 @@ -798,15 +798,15 @@ class IncohInt(Operation): 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 @@ -929,7 +929,7 @@ class IncohInt(Operation): self.__lastdatatime = datatime - if avgdata_spc == None: + if avgdata_spc is None: return None, None, None, None avgdatatime = self.__initime diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 2ad223c..e2caecf 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -378,7 +378,7 @@ class CohInt(Operation): 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 @@ -464,7 +464,7 @@ class CohInt(Operation): self.__lastdatatime = datatime - if avgdata == None: + if avgdata is None: return None, None avgdatatime = self.__initime @@ -608,7 +608,7 @@ class Decoder(Operation): 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 @@ -630,7 +630,7 @@ class Decoder(Operation): if not self.isConfig: - if code == None: + if code is None: code = dataOut.code else: code = numpy.array(code).reshape(nCode,nBaud)