From 9bf673cfa96e192f5be8ae2347a17979cc675fb4 2012-11-26 13:51:54 From: Miguel Valdez Date: 2012-11-26 13:51:54 Subject: [PATCH] Adicion del metodo run a la clase jrodataio --- diff --git a/schainpy/model/jrodataIO.py b/schainpy/model/jrodataIO.py index 0253ffc..db26cab 100644 --- a/schainpy/model/jrodataIO.py +++ b/schainpy/model/jrodataIO.py @@ -162,6 +162,8 @@ class JRODataIO: c = 3E8 + __isConfig = False + basicHeaderObj = BasicHeader() systemHeaderObj = SystemHeader() @@ -768,6 +770,16 @@ class JRODataReader(JRODataIO): def readBlock(): pass + + def run(self, **kwargs): + + if not(self.__isConfig): + + self.dataOutObj = dataOut + self.setup(**kwargs) + self.__isConfig = True + + self.putData() class JRODataWriter(JRODataIO): @@ -788,8 +800,6 @@ class JRODataWriter(JRODataIO): nWriteBlocks = 0 - isConfig = False - def __init__(self, dataOutObj=None): raise ValueError, "Not implemented" @@ -1015,10 +1025,11 @@ class JRODataWriter(JRODataIO): def run(self, dataOut, **kwargs): - if not(self.isConfig): + if not(self.__isConfig): self.dataOutObj = dataOut self.setup(**kwargs) + self.__isConfig = True self.putData() @@ -1088,6 +1099,8 @@ class VoltageReader(JRODataReader): None """ + self.__isConfig = False + self.datablock = None self.utc = 0 @@ -1362,7 +1375,7 @@ class VoltageWriter(JRODataWriter): self.profileIndex = 0 - self.isConfig = False + self.__isConfig = False self.fp = None @@ -1685,7 +1698,9 @@ class SpectraReader(JRODataReader): Return : None """ - + + self.__isConfig = False + self.pts2read_SelfSpectra = 0 self.pts2read_CrossSpectra = 0 @@ -2019,6 +2034,8 @@ class SpectraWriter(JRODataWriter): self.dataOutObj = dataOutObj + self.__isConfig = False + self.nTotalBlocks = 0 self.data_spc = None