schain-jc Commit - r26:0d3203b6912d · Jicamarca Repository

Desplazamiento automatico de los puntos de FFT en el modulo de lectura de espectros.

Miguel Valdez -

r26:0d3203b6912d

parent child

Context file:

r26:0d3203b6912d

Collapse all files

schainpy/Graphics/BaseGraph.py +13 -5

                     self.ylabel = ylabel
                     self.__colormap = colormap
-                def plotBox(self, xmin, xmax, ymin, ymax):
+                def plotBox(self, xmin, xmax, ymin, ymax, xopt=None, yopt=None):
                     """
                     """
                                   float(ymin),
                                   float(ymax)
                                   )
-                    plplot.plbox(self.__xopt, 0.0, 0, self.__yopt, 0.0, 0)
+                    if xopt == None: xopt = self.__xopt
+                    if yopt == None: yopt = self.__yopt
+                    plplot.plbox(xopt, 0.0, 0, yopt, 0.0, 0)
                     plplot.pllab(self.xlabel, self.ylabel, self.title)
                         powObj.setName(key)
                         powObj.setOpt("bcntg","bc")
                         powObj.setup(title="Power Profile",
-                                     xlabel="dBs",
+                                     xlabel="dB",
                                      ylabel="")
                         self.graphObjDict[key] = powObj
                 def setScreenPos(self, width='small'):
                     if width == 'small':
-                        xi = 0.12; yi = 0.12; xw = 0.86; yw = 0.70; xcmapw = 0.05; xpoww = 0.26; deltaxcmap = 0.02; deltaxpow = 0.06
+                        xi = 0.13; yi = 0.12; xw = 0.86; yw = 0.70; xcmapw = 0.05; xpoww = 0.26; deltaxcmap = 0.02; deltaxpow = 0.05
                     if width == 'medium':
                         xi = 0.07; yi = 0.10; xw = 0.90; yw = 0.60; xcmapw = 0.05; xpoww = 0.24; deltaxcmap = 0.02; deltaxpow = 0.06
                         cmapObj.colorbarPlot(0., 1., zmin, zmax)
                     if self.__showPowerProfile:
-                        power = numpy.average(data, axis=0)
+                        power = numpy.max(data, axis=0)
                         step = (ymax - ymin)/(nY-1)
                         heis = numpy.arange(ymin, ymax + step, step)
                         plplot.pllsty(2)
                         powObj.plotBox(zmin, zmax, ymin, ymax)
                         plplot.pllsty(1)
+                        powObj.plotBox(zmin, zmax, ymin, ymax, xopt='bc', yopt='bc')
+                        plplot.plcol0(9)
                         powObj.basicXYPlot(power, heis)
+                        plplot.plcol0(1)
             class ColorPlotX():

schainpy/Graphics/SpectraPlot.py +14 -7

                 def setup(self, titleList=None, xlabelList=None, ylabelList=None, showColorbar=False, showPowerProfile=True, XAxisAsTime=False):
                     nChan = int(self.m_Spectra.m_SystemHeader.numChannels)
+                    channels = range(nChan)
-                    myTitle = ""
+                    myXlabel = "Radial Velocity (m/s)"
-                    myXlabel = ""
+                    myYlabel = "Range (km)"
-                    myYlabel = ""
-                    for i in range(nChan):
+                    for i in channels:
                         if titleList != None:
                             myTitle = titleList[i]
                             myXlabel = xlabelList[i]
                             myYlabel = ylabelList[i]
+                        if self.m_Spectra.noise != None:
+                            noise = '%4.2fdB' %(self.m_Spectra.noise[i])
+                        else:
+                            noise = '--'
+                        myTitle = "Channel: %d - Noise: %s" %(i, noise)
                         self.__addGraph(i+1,
                                         title=myTitle,
                                         xlabel=myXlabel,
                     nx = int(numpy.sqrt(self.nGraphs)+1)
                     #ny = int(self.nGraphs/nx)
-                    plplot.plsetopt("geometry", "%dx%d" %(400*nx, 300*nx))
+                    plplot.plsetopt("geometry", "%dx%d" %(300*nx, 240*nx))
                     plplot.plsdev("xcairo")
                     plplot.plscolbg(255,255,255)
                     plplot.plscol0(1,0,0,0)
                     if not(self.__isPlotIni):
                         self.iniPlot()
-                    data = numpy.log10(self.m_Spectra.data_spc)
+                    data = 10.*numpy.log10(self.m_Spectra.data_spc)
                     nX, nY, nChan = numpy.shape(data)
                     plplot.plbop()
                     for i in range(self.nGraphs):
                         self.graphObjList[i].iniSubpage()
-                        self.graphObjList[i].plotData(data[:,:,i],
+                        self.graphObjList[i].plotData(data[i,:,:],
                                                       x,
                                                       y,
                                                       xmin=xmin,

schainpy/IO/HeaderIO.py +7 0

                     self.deltaHeight = self.samplingWindow['dh']
                     self.samplesWin = self.samplingWindow['nsa']
                     self.spectraComb = numpy.fromfile(fp,'u1',2*self.totalSpectra)
                     if self.processFlags & PROCFLAG.DEFINE_PROCESS_CODE == PROCFLAG.DEFINE_PROCESS_CODE:
                         self.numCode = numpy.fromfile(fp,'<u4',1)
                         self.numBaud = numpy.fromfile(fp,'<u4',1)
                         self.codes = numpy.fromfile(fp,'<f4',self.numCode*self.numBaud).reshape(self.numBaud,self.numCode)
+                    if self.processFlags & PROCFLAG.SHIFT_FFT_DATA == PROCFLAG.SHIFT_FFT_DATA:
+                        self.shif_fft = True
+                    else:
+                        self.shif_fft = False
                     return 1
                     obj.numBaud = self.numBaud
                     obj.codes = self.codes
+                    obj.shif_fft = self.shif_fft
                     return obj
                 def write(self, fp):

schainpy/IO/SpectraIO.py +11 -3

@@ -385,9 +385,17 class SpectraReader(DataReader):
385	cspc = numpy.fromfile(self.__fp, self.__dataType, int(pts2read*Npair_CrossSpectra))	385	cspc = numpy.fromfile(self.__fp, self.__dataType, int(pts2read*Npair_CrossSpectra))
386	dc = numpy.fromfile(self.__fp, self.__dataType, int(self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels) )	386	dc = numpy.fromfile(self.__fp, self.__dataType, int(self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels) )
387		387
388	spc = spc.reshape((self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, Npair_SelfSpectra))	388	spc = spc.reshape((Npair_SelfSpectra, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock))
389	cspc = cspc.reshape((self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, Npair_CrossSpectra))	389	cspc = cspc.reshape((Npair_CrossSpectra, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock))
390	dc = dc.reshape((self.m_~~Processing~~Header.num~~Height~~s, self.m_~~System~~Header.num~~Channel~~s))	390	dc = dc.reshape((self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights))
		391
		392	if not(self.m_ProcessingHeader.shif_fft):
		393	spc = numpy.roll(spc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2)
		394	cspc = numpy.roll(cspc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2)
		395
		396	spc = numpy.transpose(spc, (0,2,1))
		397	cspc = numpy.transpose(cspc, (0,2,1))
		398	#dc = numpy.transpose(dc, (0,2,1))
391		399
392	data_spc = spc	400	data_spc = spc
393	data_cspc = cspc['real'] + cspc['imag']*1j	401	data_cspc = cspc['real'] + cspc['imag']*1j

schainpy/Model/Spectra.py +4 0

                     self.dataType = None
+                    self.noise = None
                 def copy(self):
                     obj = Spectra()
                     obj.m_BasicHeader = self.m_BasicHeader.copy()
                     obj.nProfiles = self.nProfiles
+                    obj.noise = self.noise
                     return obj
   No newline at end of file

schainpy/Model/Voltage.py +4 0

                     self.flagResetProcessing = False
+                    self.noise = noise
                 def copy(self):
                     obj = Voltage()
                     obj.m_BasicHeader = self.m_BasicHeader.copy()
                     obj.dataType = self.dataType
                     obj.flagResetProcessing = self.flagResetProcessing
+                    obj.noise = self.noise
                     return obj
   No newline at end of file

schainpy/TestSChain.py +2 -2

                     #self.path = '/remote/puma/2004_11/DVD/'
                     self.ppath = "/home/roj-idl71/tmp/data"
-                    self.startDateTime = datetime.datetime(2011,1,1,17,49,0)
+                    self.startDateTime = datetime.datetime(2011,1,24,18,20,0)
                     self.endDateTime = datetime.datetime(2011,1,30,18,10,0)
                 def createObjects(self):
                     ini = time.time()
                     while(True):
                         self.readerObj.getData()
-                        self.plotObj.plotData(showColorbar=False, showPowerProfile=True)
+                        self.plotObj.plotData(zmin=40, zmax=140, showColorbar=True, showPowerProfile=True)
             #            self.writerObj.putData()

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