schain-jc Commit - r1183:cb5edef78583

Changes of voltageProc 2to3

George Yong -

r1183:cb5edef78583

parent child

Context file:

r1183:cb5edef78583

Collapse all files

schainpy/model/proc/jroproc_spectra.py +3 -2

                     if self.dataIn.type == "Voltage":
+                        self.dataOut.flagNoData = True
                         if nFFTPoints == None:
                             raise ValueError("This SpectraProc.run() need nFFTPoints input variable")
                         dataOut.data_spc = avgdata_spc
                         dataOut.data_cspc = avgdata_cspc
                         dataOut.data_dc = avgdata_dc
                         dataOut.nIncohInt *= self.n
                         dataOut.utctime = avgdatatime
                         dataOut.flagNoData = False

schainpy/model/proc/jroproc_voltage.py +8 -9

                         """
                         Si la data es obtenida por bloques, dimension = [nChannels, nProfiles, nHeis]
                         """
-                        buffer = self.dataOut.data[:, :, 0:self.dataOut.nHeights-r]
+                        buffer = self.dataOut.data[:, :, 0:int(self.dataOut.nHeights-r)]
                         buffer = buffer.reshape(self.dataOut.nChannels,self.dataOut.nProfiles,self.dataOut.nHeights/window,window)
                         buffer = numpy.sum(buffer,3)
                     else:
-                        buffer = self.dataOut.data[:,0:self.dataOut.nHeights-r]
+                        buffer = self.dataOut.data[:,0:int(self.dataOut.nHeights-r)]
-                        buffer = buffer.reshape(self.dataOut.nChannels,self.dataOut.nHeights/window,window)
+                        buffer = buffer.reshape(self.dataOut.nChannels,int(self.dataOut.nHeights/window),int(window))
                         buffer = numpy.sum(buffer,2)
                     self.dataOut.data = buffer
                     self.start_index = self.start_index + self.nHeights
                 def run(self, dataOut, m):
                     dataOut.flagNoData = True
                     if not self.isConfig:
                         dataOut.profileIndex = dataOut.nProfiles - 1
                         dataOut.flagNoData = False
-                        return True
+                        return dataOut
                     """
                     data dimension  = [nChannels, nHeis]
                             dataOut.flagNoData = False
                             self.incProfileIndex()
-                        return True
+                        return dataOut
                     if profileRangeList != None:
                             dataOut.flagNoData = False
                             self.incProfileIndex()
-                        return True
+                        return dataOut
                     if rangeList != None:
                                 break
-                        return True
+                        return dataOut
                     if beam != None: #beam is only for AMISR data
                             self.incProfileIndex()
-                        return True
+                        return dataOut
                     raise ValueError("ProfileSelector needs profileList, profileRangeList or rangeList parameter")

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