schain-jc Commit - r1132:b323193ace39

Fix saving shifted pdata, add shift_fft parameter in SpectraProc to correct shifted pdata

jespinoza -

r1132:b323193ace39

parent child

Context file:

r1132:b323193ace39

Collapse all files

schainpy/model/io/jroIO_spectra.py +3 -3

                         dc = dc.reshape( (self.systemHeaderObj.nChannels, self.processingHeaderObj.nHeights) ) #transforma a un arreglo 2D
-                    if not(self.processingHeaderObj.shif_fft):
+                    if self.processingHeaderObj.shif_fft:
                         #desplaza a la derecha en el eje 2 determinadas posiciones
                         shift = int(self.processingHeaderObj.profilesPerBlock/2)
                         spc = numpy.roll( spc, shift , axis=2 )
                     """
                     spc = numpy.transpose( self.data_spc, (0,2,1) )
-                    if not( self.processingHeaderObj.shif_fft ):
+                    if self.processingHeaderObj.shif_fft:
                         spc = numpy.roll( spc, self.processingHeaderObj.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                     data = spc.reshape((-1))
                     data = data.astype(self.dtype[0])
                     if self.data_cspc is not None:
                         data = numpy.zeros( self.shape_cspc_Buffer, self.dtype )
                         cspc = numpy.transpose( self.data_cspc, (0,2,1) )
-                        if not( self.processingHeaderObj.shif_fft ):
+                        if self.processingHeaderObj.shif_fft:
                             cspc = numpy.roll( cspc, self.processingHeaderObj.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones
                         data['real'] = cspc.real
                         data['imag'] = cspc.imag

schainpy/model/proc/jroproc_spectra.py +10 -1

                     self.dataOut.blockSize = blocksize
                     self.dataOut.flagShiftFFT = True
-                def run(self, nProfiles=None, nFFTPoints=None, pairsList=[], ippFactor=None):
+                def run(self, nProfiles=None, nFFTPoints=None, pairsList=[], ippFactor=None, shift_fft=False):
                     self.dataOut.flagNoData = True
                             pairsList = itertools.combinations(self.dataOut.channelList, 2)
                         if self.dataOut.data_cspc is not None:
                             self.__selectPairs(pairsList)
+                        if shift_fft:
+                            #desplaza a la derecha en el eje 2 determinadas posiciones
+                            shift = int(self.dataOut.nFFTPoints/2)
+                            self.dataOut.data_spc = numpy.roll(self.dataOut.data_spc, shift , axis=1)
+                            if self.dataOut.data_cspc is not None:
+                                #desplaza a la derecha en el eje 2 determinadas posiciones
+                                self.dataOut.data_cspc = numpy.roll(self.dataOut.cspc, shift, axis=1)
                         return True
                     if self.dataIn.type == "Voltage":

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