diff --git a/schainpy/IO/TestReader.py b/schainpy/IO/TestReader.py index f979e38..1d7be27 100644 --- a/schainpy/IO/TestReader.py +++ b/schainpy/IO/TestReader.py @@ -6,7 +6,7 @@ Created on 23/01/2012 import Voltage import datetime -import time +import time, datetime objReader = Voltage.VoltageReader() @@ -15,8 +15,8 @@ path = '/home/roj-idl71/Data/RAWDATA/DP_Faraday/' #path = '/remote/puma/2011_03/DP_Faraday' -startDateTime = datetime.datetime(2011,3,11,16,0,0) -endDateTime = datetime.datetime(2011,3,12,20,1,0) +startDateTime = datetime.datetime(2011,3,11,16,40,0) +endDateTime = datetime.datetime(2011,3,11,16,59,0) t0 = time.time() objReader.setup(path, startDateTime, endDateTime) @@ -26,9 +26,10 @@ print time.time() - t0 while(not(objReader.noMoreFiles)): objReader.getData() -# if objReader.flagIsNewFile: + if objReader.flagIsNewBlock: + print "Block No %04d, Time: %s" %(objReader.nReadBlocks, datetime.datetime.fromtimestamp(objReader.m_BasicHeader.utc)) # print objReader.m_BasicHeader.dataBlock #print objReader.objStructShortHeader.dataBlock - #print time.localtime(objReader.m_BasicHeader.utc) + \ No newline at end of file diff --git a/schainpy/IO/Voltage.py b/schainpy/IO/Voltage.py index 6507b75..2ed1590 100644 --- a/schainpy/IO/Voltage.py +++ b/schainpy/IO/Voltage.py @@ -43,12 +43,16 @@ class VoltageReader(DataReader): __maxTimeStep = 5 - flagResetProcessing = 0 - __flagIsNewFile = 0 + flagResetProcessing = 0 + + flagIsNewBlock = 0 + noMoreFiles = 0 + nReadBlocks = 0 + online = 0 filename = None @@ -241,8 +245,7 @@ class VoltageReader(DataReader): elif data_type == 5: tmp=numpy.dtype([('real',' self.__maxTimeStep: self.flagResetProcessing = 1 + self.nReadBlocks = 0 return 1 @@ -334,6 +338,10 @@ class VoltageReader(DataReader): self.__flagIsNewFile = 0 + self.flagIsNewBlock = 1 + + self.nReadBlocks += 1 + self.__buffer = data self.__buffer_id = 0 @@ -361,6 +369,7 @@ class VoltageReader(DataReader): lectura es necesario hacer una nueva lectura de los bloques de datos usando "readNextBlock" """ self.flagResetProcessing = 0 + self.flagIsNewBlock = 0 if self.__hasNotDataInBuffer(): self.readNextBlock()