From 0d3203b6912d4a414549237b103e6550c2e9cdfd 2012-02-23 22:34:04
From: Miguel Valdez <miguel.urco@jro.igp.gob.pe>
Date: 2012-02-23 22:34:04
Subject: [PATCH] Desplazamiento automatico de los puntos de FFT en el modulo de lectura de espectros.

---

diff --git a/schainpy/Graphics/BaseGraph.py b/schainpy/Graphics/BaseGraph.py
index 6fe6017..c6186f8 100644
--- a/schainpy/Graphics/BaseGraph.py
+++ b/schainpy/Graphics/BaseGraph.py
@@ -211,7 +211,7 @@ class BaseGraph:
         self.ylabel = ylabel
         self.__colormap = colormap
           
-    def plotBox(self, xmin, xmax, ymin, ymax):
+    def plotBox(self, xmin, xmax, ymin, ymax, xopt=None, yopt=None):
         """
         
         """
@@ -224,7 +224,12 @@ class BaseGraph:
                       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)
 
     
@@ -497,7 +502,7 @@ class ColorPlot():
             powObj.setName(key)
             powObj.setOpt("bcntg","bc")
             powObj.setup(title="Power Profile",
-                         xlabel="dBs",
+                         xlabel="dB",
                          ylabel="")
             
             self.graphObjDict[key] = powObj
@@ -529,7 +534,7 @@ class ColorPlot():
     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
@@ -599,7 +604,7 @@ class ColorPlot():
             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)
@@ -610,7 +615,10 @@ class ColorPlot():
             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():
diff --git a/schainpy/Graphics/SpectraPlot.py b/schainpy/Graphics/SpectraPlot.py
index 918971b..0195ac6 100644
--- a/schainpy/Graphics/SpectraPlot.py
+++ b/schainpy/Graphics/SpectraPlot.py
@@ -59,16 +59,23 @@ class Spectrum():
     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 = ""
-        myYlabel = ""
+        myXlabel = "Radial Velocity (m/s)"
+        myYlabel = "Range (km)"
         
-        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,
@@ -86,7 +93,7 @@ class Spectrum():
         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)
@@ -110,7 +117,7 @@ class Spectrum():
         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)
         
@@ -127,7 +134,7 @@ class Spectrum():
         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,
diff --git a/schainpy/IO/HeaderIO.py b/schainpy/IO/HeaderIO.py
index c74e482..dc445ec 100644
--- a/schainpy/IO/HeaderIO.py
+++ b/schainpy/IO/HeaderIO.py
@@ -291,11 +291,17 @@ class ProcessingHeader:
         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
 
@@ -322,6 +328,7 @@ class ProcessingHeader:
         obj.numBaud = self.numBaud
         obj.codes = self.codes
         
+        obj.shif_fft = self.shif_fft
         return obj
     
     def write(self, fp):
diff --git a/schainpy/IO/SpectraIO.py b/schainpy/IO/SpectraIO.py
index ce230cb..db793a5 100644
--- a/schainpy/IO/SpectraIO.py
+++ b/schainpy/IO/SpectraIO.py
@@ -385,9 +385,17 @@ class SpectraReader(DataReader):
         cspc  = numpy.fromfile(self.__fp, self.__dataType, int(pts2read*Npair_CrossSpectra))
         dc  = numpy.fromfile(self.__fp, self.__dataType, int(self.m_ProcessingHeader.numHeights*self.m_SystemHeader.numChannels) )
                 
-        spc = spc.reshape((self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, Npair_SelfSpectra))
-        cspc = cspc.reshape((self.m_ProcessingHeader.profilesPerBlock, self.m_ProcessingHeader.numHeights, Npair_CrossSpectra))
-        dc = dc.reshape((self.m_ProcessingHeader.numHeights, self.m_SystemHeader.numChannels))
+        spc = spc.reshape((Npair_SelfSpectra, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock))
+        cspc = cspc.reshape((Npair_CrossSpectra, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock))
+        dc = dc.reshape((self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights))
+        
+        if not(self.m_ProcessingHeader.shif_fft):
+            spc = numpy.roll(spc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2)
+            cspc = numpy.roll(cspc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2)
+        
+        spc = numpy.transpose(spc, (0,2,1))
+        cspc = numpy.transpose(cspc, (0,2,1))
+        #dc = numpy.transpose(dc, (0,2,1))
         
         data_spc = spc
         data_cspc = cspc['real'] + cspc['imag']*1j
diff --git a/schainpy/Model/Spectra.py b/schainpy/Model/Spectra.py
index f0879c9..da7858d 100644
--- a/schainpy/Model/Spectra.py
+++ b/schainpy/Model/Spectra.py
@@ -46,6 +46,8 @@ class Spectra(Data):
         self.nProfiles = None
         
         self.dataType = None
+        
+        self.noise = None
 
     def copy(self):
         obj = Spectra()
@@ -63,5 +65,7 @@ class Spectra(Data):
         
         obj.nProfiles = self.nProfiles
         
+        obj.noise = self.noise
+        
         return obj
         
\ No newline at end of file
diff --git a/schainpy/Model/Voltage.py b/schainpy/Model/Voltage.py
index 8f59fcb..88b9a93 100644
--- a/schainpy/Model/Voltage.py
+++ b/schainpy/Model/Voltage.py
@@ -45,6 +45,8 @@ class Voltage(Data):
         
         self.flagResetProcessing = False
         
+        self.noise = noise
+        
     def copy(self):
         obj = Voltage()
         obj.m_BasicHeader = self.m_BasicHeader.copy()
@@ -61,5 +63,7 @@ class Voltage(Data):
         obj.dataType = self.dataType
         obj.flagResetProcessing = self.flagResetProcessing
         
+        obj.noise = self.noise
+        
         return obj
         
\ No newline at end of file
diff --git a/schainpy/TestSChain.py b/schainpy/TestSChain.py
index 73d69c7..927f430 100644
--- a/schainpy/TestSChain.py
+++ b/schainpy/TestSChain.py
@@ -33,7 +33,7 @@ class TestSChain():
         #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):        
@@ -54,7 +54,7 @@ class TestSChain():
         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()