From 2445b97595f3c416abb65edbdcaeda357ec32e3c 2014-04-15 05:20:06 From: Daniel Valdez Date: 2014-04-15 05:20:06 Subject: [PATCH] se agregan variables para salvar graficos en disco para el ultimo bloque de datos --- diff --git a/schainpy/model/jrodata.py b/schainpy/model/jrodata.py index 32cff4a..13ee9e0 100644 --- a/schainpy/model/jrodata.py +++ b/schainpy/model/jrodata.py @@ -124,6 +124,10 @@ class JROData: realtime = False beacon_heiIndexList = None + + last_block = None + + blocknow = None def __init__(self): diff --git a/schainpy/model/jrodataIO.py b/schainpy/model/jrodataIO.py index dd2e64b..807bbb5 100644 --- a/schainpy/model/jrodataIO.py +++ b/schainpy/model/jrodataIO.py @@ -985,6 +985,7 @@ class JRODataReader(JRODataIO, ProcessingUnit): self.set = set - 1 self.path = path self.foldercounter = foldercounter + last_set = None else: print "Searching files in offline mode ..." @@ -1004,7 +1005,10 @@ class JRODataReader(JRODataIO, ProcessingUnit): self.fileIndex = -1 self.pathList = pathList self.filenameList = filenameList - + file_name = os.path.basename(filenameList[-1]) + basename, ext = os.path.splitext(file_name) + last_set = int(basename[-3:]) + self.online = online self.delay = delay ext = ext.lower() @@ -1021,7 +1025,8 @@ class JRODataReader(JRODataIO, ProcessingUnit): sys.exit(-1) # self.updateDataHeader() - + if last_set != None: + self.dataOut.last_block = last_set * self.processingHeaderObj.dataBlocksPerFile + self.basicHeaderObj.dataBlock return self.dataOut def getBasicHeader(self): @@ -1070,7 +1075,7 @@ class JRODataReader(JRODataIO, ProcessingUnit): if self.flagIsNewBlock: print "Block No. %04d, Total blocks %04d -> %s" %(self.basicHeaderObj.dataBlock, self.nTotalBlocks, self.dataOut.datatime.ctime()) - + self.dataOut.blocknow = self.basicHeaderObj.dataBlock def printInfo(self): if self.__printInfo == False: