schain-jc Commit - r992:7a6f35bfb333

fix meteors processing bugs

José Chávez -

r992:7a6f35bfb333

parent child

Context file:

r992:7a6f35bfb333

Collapse all files

schainpy/model/data/jroheaderIO.py +3 -3

                         try:
                             if hasattr(fp, 'read'):
-                                self.nCode = numpy.fromfile(fp, '<u4', 1)
+                                self.nCode = numpy.fromfile(fp, '<u4', 1)[0]
                                 self.length += self.nCode.nbytes
-                                self.nBaud = numpy.fromfile(fp, '<u4', 1)
+                                self.nBaud = numpy.fromfile(fp, '<u4', 1)[0]
                                 self.length += self.nBaud.nbytes
                             else:
                                 self.nCode = numpy.fromstring(fp[self.length:], '<u4', 1)[0]
                                 self.length += self.nBaud.nbytes
                         except Exception, e:
                             print "RadarControllerHeader: " + str(e)
                             return 0
                         code = numpy.empty([self.nCode,self.nBaud],dtype='i1')
                         for ic in range(self.nCode):

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

                     return velEst
-                def run(self, dataOut, technique, **kwargs):
+                def run(self, dataOut, technique, nHours=1, hmin=70, hmax=110, **kwargs):
                     param = dataOut.data_param
                     if dataOut.abscissaList != None:
                         absc = dataOut.abscissaList[:-1]
-                    noise = dataOut.noise
+                    # noise = dataOut.noise
                     heightList = dataOut.heightList
                     SNR = dataOut.data_SNR
                         jgammaArray = numpy.hstack((jgamma,jgamma+0.5*numpy.pi,jgamma-0.5*numpy.pi))
                         #Histogram
-                        nBins = 64.0
+                        nBins = 64
                         rmin = -0.5*numpy.pi
                         rmax = 0.5*numpy.pi
                         phaseHisto = numpy.histogram(jgammaArray, bins=nBins, range=(rmin,rmax))
                     range_angle = numpy.array([10*numpy.pi,numpy.pi,numpy.pi/2,numpy.pi/4])
                     ntimes = len(range_angle)
-                    nstepsx = 20.0
+                    nstepsx = 20
-                    nstepsy = 20.0
+                    nstepsy = 20
                     for iz in range(ntimes):
                         min_xangle = -range_angle[iz]/2 + center_xangle
                     hCorr = hi[ind_h, :]
                     ind_hCorr = numpy.where(numpy.logical_and(hi > minHeight, hi < maxHeight))
-                    hCorr = hi[ind_hCorr]
+                    hCorr = hi[ind_hCorr][:len(ind_h)]
                     heights[ind_h] = hCorr
                     #Setting Error

schainpy/model/proc/jroproc_voltage.py +2 0

                     for i in range(self.__nChannels):
                         for j in range(self.__nProfiles):
+                            print self.datadecTime[i,j,:].shape
+                            print numpy.correlate(data[i,j,:], code_block[j,:], mode='full')[self.nBaud-1:].shape
                             self.datadecTime[i,j,:] = numpy.correlate(data[i,j,:], code_block[j,:], mode='full')[self.nBaud-1:]
                     return self.datadecTime

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