| @@ -5,26 +5,21 Created on 23/01/2012 | |||||
| 5 | @version $Id$ |
|
5 | @version $Id$ | |
| 6 | ''' |
|
6 | ''' | |
| 7 |
|
7 | |||
| 8 |
from DataIO import |
|
8 | from JRODataIO import JRODataIO | |
| 9 | from DataIO import DataWriter |
|
|||
| 10 |
|
9 | |||
| 11 |
class CorrelationReader( |
|
10 | class CorrelationReader(JRODataIO): | |
| 12 |
|
11 | |||
| 13 | def __init__(self): |
|
12 | def __init__(self): | |
| 14 |
|
13 | |||
| 15 | pass |
|
14 | pass | |
| 16 |
|
15 | |||
| 17 |
class CorrelationWriter( |
|
16 | class CorrelationWriter(JRODataIO): | |
| 18 |
|
17 | |||
| 19 | def __init__(self): |
|
18 | def __init__(self): | |
| 20 |
|
||||
| 21 | pass |
|
19 | pass | |
| 22 |
|
20 | |||
| 23 | def puData(self): |
|
21 | def putData(self): | |
| 24 | pass |
|
22 | pass | |
| 25 |
|
23 | |||
| 26 | def writeBlock(self): |
|
24 | def writeBlock(self): | |
| 27 |
pass |
|
25 | pass | |
| No newline at end of file |
|
||||
| 28 |
|
||||
| 29 |
|
||||
| 30 | No newline at end of file |
|
|||
| @@ -166,7 +166,7 def getlastFileFromPath(path, ext): | |||||
| 166 |
|
166 | |||
| 167 | return None |
|
167 | return None | |
| 168 |
|
168 | |||
| 169 |
class JRODataIO |
|
169 | class JRODataIO: | |
| 170 |
|
170 | |||
| 171 | #speed of light |
|
171 | #speed of light | |
| 172 | c = 3E8 |
|
172 | c = 3E8 | |
| @@ -263,17 +263,22 class SpectraReader( JRODataReader ): | |||||
| 263 |
|
263 | |||
| 264 | if not( self.m_ProcessingHeader.shif_fft ): |
|
264 | if not( self.m_ProcessingHeader.shif_fft ): | |
| 265 | spc = numpy.roll( spc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones |
|
265 | spc = numpy.roll( spc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones | |
|
|
266 | ||||
| 266 | if cspc != None: |
|
267 | if cspc != None: | |
| 267 | cspc = numpy.roll( cspc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones |
|
268 | cspc = numpy.roll( cspc, self.m_ProcessingHeader.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones | |
| 268 |
|
269 | |||
| 269 | spc = numpy.transpose( spc, (0,2,1) ) |
|
270 | spc = numpy.transpose( spc, (0,2,1) ) | |
| 270 | if cspc != None: cspc = numpy.transpose( cspc, (0,2,1) ) |
|
|||
| 271 |
|
271 | |||
| 272 | self.data_spc = spc |
|
272 | if cspc != None: | |
|
|
273 | cspc = numpy.transpose( cspc, (0,2,1) ) | |||
|
|
274 | ||||
|
|
275 | ||||
| 273 | if cspc != None: |
|
276 | if cspc != None: | |
| 274 | self.data_cspc = cspc['real'] + cspc['imag']*1j |
|
277 | self.data_cspc = cspc['real'] + cspc['imag']*1j | |
| 275 | else: |
|
278 | else: | |
| 276 | self.data_cspc = None |
|
279 | self.data_cspc = None | |
|
|
280 | ||||
|
|
281 | self.data_spc = spc | |||
| 277 | self.data_dc = dc['real'] + dc['imag']*1j |
|
282 | self.data_dc = dc['real'] + dc['imag']*1j | |
| 278 |
|
283 | |||
| 279 | self.datablockIndex = 0 |
|
284 | self.datablockIndex = 0 | |
| @@ -9,7 +9,7 import sys | |||||
| 9 | import datetime |
|
9 | import datetime | |
| 10 | import time |
|
10 | import time | |
| 11 |
|
11 | |||
| 12 |
class TestIO |
|
12 | class TestIO: | |
| 13 |
|
13 | |||
| 14 | def __init__(self): |
|
14 | def __init__(self): | |
| 15 | self.setValues() |
|
15 | self.setValues() | |
| 1 | NO CONTENT: modified file |
|
NO CONTENT: modified file |
General Comments 0
You need to be logged in to leave comments.
Login now