| @@ -6,7 +6,7 Created on 23/01/2012 | |||
|
|
6 | 6 | |
|
|
7 | 7 | import Voltage |
|
|
8 | 8 | import datetime |
|
|
9 | import time | |
|
|
9 | import time, datetime | |
|
|
10 | 10 | |
|
|
11 | 11 | objReader = Voltage.VoltageReader() |
|
|
12 | 12 | |
| @@ -15,8 +15,8 path = '/home/roj-idl71/Data/RAWDATA/DP_Faraday/' | |||
|
|
15 | 15 | #path = '/remote/puma/2011_03/DP_Faraday' |
|
|
16 | 16 | |
|
|
17 | 17 | |
|
|
18 | startDateTime = datetime.datetime(2011,3,11,16,0,0) | |
|
|
19 |
endDateTime = datetime.datetime(2011,3,1 |
|
|
|
18 | startDateTime = datetime.datetime(2011,3,11,16,40,0) | |
|
|
19 | endDateTime = datetime.datetime(2011,3,11,16,59,0) | |
|
|
20 | 20 | |
|
|
21 | 21 | t0 = time.time() |
|
|
22 | 22 | objReader.setup(path, startDateTime, endDateTime) |
| @@ -26,9 +26,10 print time.time() - t0 | |||
|
|
26 | 26 | while(not(objReader.noMoreFiles)): |
|
|
27 | 27 | |
|
|
28 | 28 | objReader.getData() |
|
|
29 |
|
|
|
|
29 | if objReader.flagIsNewBlock: | |
|
|
30 | print "Block No %04d, Time: %s" %(objReader.nReadBlocks, datetime.datetime.fromtimestamp(objReader.m_BasicHeader.utc)) | |
|
|
30 | 31 | # print objReader.m_BasicHeader.dataBlock |
|
|
31 | 32 | #print objReader.objStructShortHeader.dataBlock |
|
|
32 | #print time.localtime(objReader.m_BasicHeader.utc) | |
|
|
33 | ||
|
|
33 | 34 | |
|
|
34 | 35 | No newline at end of file |
| @@ -43,12 +43,16 class VoltageReader(DataReader): | |||
|
|
43 | 43 | |
|
|
44 | 44 | __maxTimeStep = 5 |
|
|
45 | 45 | |
|
|
46 | flagResetProcessing = 0 | |
|
|
47 | ||
|
|
48 | 46 | __flagIsNewFile = 0 |
|
|
49 | 47 | |
|
|
48 | flagResetProcessing = 0 | |
|
|
49 | ||
|
|
50 | flagIsNewBlock = 0 | |
|
|
51 | ||
|
|
50 | 52 | noMoreFiles = 0 |
|
|
51 | 53 | |
|
|
54 | nReadBlocks = 0 | |
|
|
55 | ||
|
|
52 | 56 | online = 0 |
|
|
53 | 57 | |
|
|
54 | 58 | filename = None |
| @@ -241,8 +245,7 class VoltageReader(DataReader): | |||
|
|
241 | 245 | elif data_type == 5: |
|
|
242 | 246 | tmp=numpy.dtype([('real','<f8'),('imag','<f8')]) |
|
|
243 | 247 | else: |
|
|
244 | print 'no define data type' | |
|
|
245 | tmp = 0 | |
|
|
248 | raise ValueError, 'Data type was not defined' | |
|
|
246 | 249 | |
|
|
247 | 250 | self.__dataType = tmp |
|
|
248 | 251 | self.__fileSizeByHeader = self.m_ProcessingHeader.dataBlocksPerFile * self.m_ProcessingHeader.blockSize + self.firstHeaderSize + self.basicHeaderSize*(self.m_ProcessingHeader.dataBlocksPerFile - 1) |
| @@ -316,6 +319,7 class VoltageReader(DataReader): | |||
|
|
316 | 319 | self.flagResetProcessing = 0 |
|
|
317 | 320 | if deltaTime > self.__maxTimeStep: |
|
|
318 | 321 | self.flagResetProcessing = 1 |
|
|
322 | self.nReadBlocks = 0 | |
|
|
319 | 323 | |
|
|
320 | 324 | return 1 |
|
|
321 | 325 | |
| @@ -334,6 +338,10 class VoltageReader(DataReader): | |||
|
|
334 | 338 | |
|
|
335 | 339 | self.__flagIsNewFile = 0 |
|
|
336 | 340 | |
|
|
341 | self.flagIsNewBlock = 1 | |
|
|
342 | ||
|
|
343 | self.nReadBlocks += 1 | |
|
|
344 | ||
|
|
337 | 345 | self.__buffer = data |
|
|
338 | 346 | |
|
|
339 | 347 | self.__buffer_id = 0 |
| @@ -361,6 +369,7 class VoltageReader(DataReader): | |||
|
|
361 | 369 | lectura es necesario hacer una nueva lectura de los bloques de datos usando "readNextBlock" |
|
|
362 | 370 | """ |
|
|
363 | 371 | self.flagResetProcessing = 0 |
|
|
372 | self.flagIsNewBlock = 0 | |
|
|
364 | 373 | |
|
|
365 | 374 | if self.__hasNotDataInBuffer(): |
|
|
366 | 375 | self.readNextBlock() |
General Comments 0
You need to be logged in to leave comments.
Login now