schain Commit - r748:0fab1290f1a0 · Jicamarca Repository

Support for VoltageReader when nTxs is >1 or <1

Miguel Valdez -

r748:0fab1290f1a0

parent child

Context file:

r748:0fab1290f1a0

Collapse all files

schainpy/model/io/jroIO_voltage.py +32 -30

                  def __hasNotDataInBuffer(self):
-                     if self.profileIndex >= self.processingHeaderObj.profilesPerBlock:
+                     if self.profileIndex >= self.processingHeaderObj.profilesPerBlock*self.nTxs:
                          return 1
                      return 0
                      self.dataOut.dtype = self.dtype
-                     self.dataOut.nProfiles = self.processingHeaderObj.profilesPerBlock*self.nTxs
+                     self.dataOut.nProfiles = self.processingHeaderObj.profilesPerBlock
-                     if self.processingHeaderObj.nHeights % self.nTxs != 0:
-                         raise ValueError, "nTxs (%d) should be a multiple of nHeights (%d)" %(self.nTxs, self.processingHeaderObj.nHeights)
-                     xf = self.processingHeaderObj.firstHeight + int(self.processingHeaderObj.nHeights/self.nTxs)*self.processingHeaderObj.deltaHeight
-                     self.dataOut.heightList = numpy.arange(self.processingHeaderObj.firstHeight, xf, self.processingHeaderObj.deltaHeight)
+                     self.dataOut.heightList = numpy.arange(self.processingHeaderObj.nHeights) *self.processingHeaderObj.deltaHeight +  self.processingHeaderObj.firstHeight
                      self.dataOut.channelList = range(self.systemHeaderObj.nChannels)
                      self.dataOut.flagShiftFFT = self.processingHeaderObj.shif_fft
+                 def reshapeData(self):
+                     if self.nTxs < 0:
+                         return
+                     if self.nTxs == 1:
+                         return
+                     if self.nTxs < 1 and self.processingHeaderObj.profilesPerBlock % (1./self.nTxs) != 0:
+                         raise ValueError, "1./nTxs (=%f), should be a multiple of nProfiles (=%d)" %(1./self.nTxs, self.processingHeaderObj.profilesPerBlock)
+                     if self.nTxs > 1 and self.processingHeaderObj.nHeights % self.nTxs != 0:
+                         raise ValueError, "nTxs (=%d), should be a multiple of nHeights (=%d)" %(self.nTxs, self.processingHeaderObj.nHeights)
+                     self.datablock = self.datablock.reshape((self.systemHeaderObj.nChannels, self.processingHeaderObj.profilesPerBlock*self.nTxs, self.processingHeaderObj.nHeights/self.nTxs))
+                     self.dataOut.nProfiles = self.processingHeaderObj.profilesPerBlock*self.nTxs
+                     self.dataOut.heightList = numpy.arange(self.processingHeaderObj.nHeights/self.nTxs) *self.processingHeaderObj.deltaHeight +  self.processingHeaderObj.firstHeight
+                     self.dataOut.radarControllerHeaderObj.ippSeconds = self.radarControllerHeaderObj.ippSeconds/self.nTxs
+                     return
                  def getData(self):
                      """
                      getData obtiene una unidad de datos del buffer de lectura, un perfil,  y la copia al objeto self.dataOut
                              return 0
                          self.getFirstHeader()
+                         self.reshapeData()
                      if self.datablock is None:
                          self.dataOut.flagNoData = True
                          blocks is increased by nTxs (nProfiles *= nTxs)
                          """
                          self.dataOut.flagDataAsBlock = False
+                         self.dataOut.data = self.datablock[:,self.profileIndex,:]
+                         self.dataOut.profileIndex = self.profileIndex
-                         if self.nTxs == 1:
-                             self.dataOut.data = self.datablock[:,self.profileIndex,:]
-                             self.dataOut.profileIndex = self.profileIndex
-                             self.profileIndex += 1
-                         else:
-                             iniHei_ForThisTx = (self.txIndex)*int(self.processingHeaderObj.nHeights/self.nTxs)
-                             endHei_ForThisTx = (self.txIndex+1)*int(self.processingHeaderObj.nHeights/self.nTxs)
-             #                 print iniHei_ForThisTx, endHei_ForThisTx
-                             self.dataOut.data = self.datablock[:, self.profileIndex, iniHei_ForThisTx:endHei_ForThisTx]
-                             self.dataOut.profileIndex = self.profileIndex*self.nTxs + self.txIndex
-                             self.txIndex += 1
-                             if self.txIndex == self.nTxs:
-                                 self.txIndex = 0
-                                 self.profileIndex += 1
+                         self.profileIndex += 1
                      else:
                          """
                          """
                          self.dataOut.flagDataAsBlock = True
                          self.dataOut.data = self.datablock
-                         self.dataOut.profileIndex = self.processingHeaderObj.profilesPerBlock
+                         self.dataOut.profileIndex = self.dataOut.nProfiles - 1
-                         self.profileIndex = self.processingHeaderObj.profilesPerBlock
+                         self.profileIndex = self.dataOut.nProfiles
                      self.dataOut.flagNoData = False

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