schain-jc Commit - r92:bd7a5985b381 · Jicamarca Repository

El metodo y la clase selector de perfiles han sido añadidos

Miguel Valdez -

r92:bd7a5985b381

parent child

Context file:

r92:bd7a5985b381

Collapse all files

schainpy/Processing/VoltageProcessor.py +83 -27

                     self.integratorIndex = None
                     self.decoderIndex = None
+                    self.profSelectorIndex = None
                     self.writerIndex = None
                     self.plotterIndex = None
                     self.integratorList = []
                     self.decoderList = []
+                    self.profileSelectorList = []
                     self.writerList = []
                     self.plotterList = []
                 def init(self):
                     self.integratorIndex = 0
                     self.decoderIndex = 0
+                    self.profSelectorIndex = 0
                     self.writerIndex = 0
                     self.plotterIndex = 0
                     self.voltageOutObj.copy(self.voltageInObj)
-                def addWriter(self,wrpath):
+                def addWriter(self, wrpath):
                     objWriter = VoltageWriter(self.voltageOutObj)
                     objWriter.setup(wrpath)
                     self.writerList.append(objWriter)
                     plotObj = Osciloscope(self.voltageOutObj,self.plotterIndex)
                     self.plotterList.append(plotObj)
-                def addIntegrator(self,N):
+                def addIntegrator(self, nCohInt):
-                    objCohInt = CoherentIntegrator(N)
+                    objCohInt = CoherentIntegrator(nCohInt)
                     self.integratorList.append(objCohInt)
-                def addDecoder(self,code,ncode,nbaud):
+                def addDecoder(self, code, ncode, nbaud):
                     objDecoder = Decoder(code,ncode,nbaud)
                     self.decoderList.append(objDecoder)
+                def addProfileSelector(self, nProfiles):
+                    objProfSelector = ProfileSelector(nProfiles)
+                    self.profileSelectorList.append(objProfSelector)
                 def writeData(self,wrpath):
                     if self.voltageOutObj.flagNoData:
-                            return 0
+                        return 0
                     if len(self.writerList) <= self.writerIndex:
                         self.addWriter(wrpath)
                 def plotData(self,idProfile, type, xmin=None, xmax=None, ymin=None, ymax=None, winTitle=''):
                     if self.voltageOutObj.flagNoData:
-                            return 0
+                        return 0
                     if len(self.plotterList) <= self.plotterIndex:
                         self.addPlotter()
                     self.plotterIndex += 1
                 def integrator(self, N):
                     if self.voltageOutObj.flagNoData:
-                            return 0
+                        return 0
                     if len(self.integratorList) <= self.integratorIndex:
                         self.addIntegrator(N)
                     self.integratorIndex += 1
                 def decoder(self,code=None,type = 0):
                     if self.voltageOutObj.flagNoData:
-                            return 0
+                        return 0
                     if code == None:
                         code = self.voltageOutObj.m_RadarControllerHeader.code
                     ncode, nbaud = code.shape
                     self.voltageOutObj.heightList = numpy.arange(xi, xf, step)
-                def selectProfiles(self, minIndex, maxIndex):
+                def selectProfiles(self, minIndex, maxIndex, nProfiles):
                     """
                     Selecciona un bloque de datos en base a un grupo indices de alturas segun el rango
                     minIndex <= index <= maxIndex
                     Return:
                         None
                     """
-                    channels = self.voltageOutObj.nChannels
-                    heights = self.voltageOutObj.m_ProcessingHeader.numHeights
+                    if self.voltageOutObj.flagNoData:
-                    newprofiles = maxIndex - minIndex + 1
+                        return 0
-                    #voltage
+                    if self.profSelectorIndex >= len(self.profileSelectorList):
-                    data = numpy.zeros( (channels,newprofiles,heights), dtype='complex' )
+                        self.addProfileSelector(nProfiles)
-                    for i in range(channels):
-                        data[i,:,:] = self.voltageOutObj.data_spc[i,minIndex:maxIndex+1,:]
+                    profileSelectorObj = self.profileSelectorList[self.profSelectorIndex]
-                    self.voltageOutObj.datablock = data
+                    if profileSelectorObj.isProfileInRange(minIndex, maxIndex):
+                        self.voltageOutObj.flagNoData = False
-                    self.voltageOutObj.m_ProcessingHeader.blockSize = data.size
+                        self.profSelectorIndex += 1
-                    self.voltageOutObj.nProfiles = newprofiles
+                        return 1
-                    self.voltageOutObj.m_SystemHeader.numProfiles = newprofiles
+                    self.voltageOutObj.flagNoData = True
+                    self.profSelectorIndex += 1
+                    return 0
                 def selectNtxs(self, ntx):
                     pass
             class Decoder:
                 def __init__(self,code, ncode, nbaud):
                     self.buffer = None
                     self.profCounter = 1
                     self.nCode = ncode
                     self.setCodeFft = False
                 def exe(self, data, ndata=None, type = 0):
                     if ndata == None: ndata = data.shape[1]
                     if type == 0:
                     if type == 1:
                         self.convolutionInTime(data, ndata)
-                def convolutionInFreq(self,data,ndata):
+                def convolutionInFreq(self,data, ndata):
                     newcode = numpy.zeros(ndata)
                     newcode[0:self.nBaud] = self.code[self.codeIndex]
             class CoherentIntegrator:
                 def __init__(self, N):
                     self.profCounter = 1
                     self.data = None
                     self.buffer = None
                     self.flag = False
                     self.nCohInt = N
-                def exe(self,data):
+                def exe(self, data):
                     if self.buffer == None:
                         self.buffer = data
                     self.profCounter += 1
+            class ProfileSelector():
+                indexProfile = None
+                # Tamaño total de los perfiles
+                nProfiles = None
+                def __init__(self, nProfiles):
+                    self.indexProfile = 0
+                    self.nProfiles = nProfiles
+                def isProfileInRange(self, minIndex, maxIndex):
+                    if minIndex < self.indexProfile:
+                        self.indexProfile += 1
+                        return False
+                    if maxIndex > self.indexProfile:
+                        self.indexProfile += 1
+                        return False
+                    self.indexProfile += 1
+                    return True
+                def isProfileInList(self, profileList):
+                    if self.indexProfile not in profileList:
+                        self.indexProfile += 1
+                        return False
+                    self.indexProfile += 1
+                    return True
   No newline at end of file

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