| @@ -162,6 +162,8 class JRODataIO: | |||||
| 162 |
|
162 | |||
| 163 | c = 3E8 |
|
163 | c = 3E8 | |
| 164 |
|
164 | |||
|
|
165 | __isConfig = False | |||
|
|
166 | ||||
| 165 | basicHeaderObj = BasicHeader() |
|
167 | basicHeaderObj = BasicHeader() | |
| 166 |
|
168 | |||
| 167 | systemHeaderObj = SystemHeader() |
|
169 | systemHeaderObj = SystemHeader() | |
| @@ -768,6 +770,16 class JRODataReader(JRODataIO): | |||||
| 768 |
|
770 | |||
| 769 | def readBlock(): |
|
771 | def readBlock(): | |
| 770 | pass |
|
772 | pass | |
|
|
773 | ||||
|
|
774 | def run(self, **kwargs): | |||
|
|
775 | ||||
|
|
776 | if not(self.__isConfig): | |||
|
|
777 | ||||
|
|
778 | self.dataOutObj = dataOut | |||
|
|
779 | self.setup(**kwargs) | |||
|
|
780 | self.__isConfig = True | |||
|
|
781 | ||||
|
|
782 | self.putData() | |||
| 771 |
|
783 | |||
| 772 | class JRODataWriter(JRODataIO): |
|
784 | class JRODataWriter(JRODataIO): | |
| 773 |
|
785 | |||
| @@ -788,8 +800,6 class JRODataWriter(JRODataIO): | |||||
| 788 |
|
800 | |||
| 789 | nWriteBlocks = 0 |
|
801 | nWriteBlocks = 0 | |
| 790 |
|
802 | |||
| 791 | isConfig = False |
|
|||
| 792 |
|
||||
| 793 | def __init__(self, dataOutObj=None): |
|
803 | def __init__(self, dataOutObj=None): | |
| 794 | raise ValueError, "Not implemented" |
|
804 | raise ValueError, "Not implemented" | |
| 795 |
|
805 | |||
| @@ -1015,10 +1025,11 class JRODataWriter(JRODataIO): | |||||
| 1015 |
|
1025 | |||
| 1016 | def run(self, dataOut, **kwargs): |
|
1026 | def run(self, dataOut, **kwargs): | |
| 1017 |
|
1027 | |||
| 1018 | if not(self.isConfig): |
|
1028 | if not(self.__isConfig): | |
| 1019 |
|
1029 | |||
| 1020 | self.dataOutObj = dataOut |
|
1030 | self.dataOutObj = dataOut | |
| 1021 | self.setup(**kwargs) |
|
1031 | self.setup(**kwargs) | |
|
|
1032 | self.__isConfig = True | |||
| 1022 |
|
1033 | |||
| 1023 | self.putData() |
|
1034 | self.putData() | |
| 1024 |
|
1035 | |||
| @@ -1088,6 +1099,8 class VoltageReader(JRODataReader): | |||||
| 1088 | None |
|
1099 | None | |
| 1089 | """ |
|
1100 | """ | |
| 1090 |
|
1101 | |||
|
|
1102 | self.__isConfig = False | |||
|
|
1103 | ||||
| 1091 | self.datablock = None |
|
1104 | self.datablock = None | |
| 1092 |
|
1105 | |||
| 1093 | self.utc = 0 |
|
1106 | self.utc = 0 | |
| @@ -1362,7 +1375,7 class VoltageWriter(JRODataWriter): | |||||
| 1362 |
|
1375 | |||
| 1363 | self.profileIndex = 0 |
|
1376 | self.profileIndex = 0 | |
| 1364 |
|
1377 | |||
| 1365 | self.isConfig = False |
|
1378 | self.__isConfig = False | |
| 1366 |
|
1379 | |||
| 1367 | self.fp = None |
|
1380 | self.fp = None | |
| 1368 |
|
1381 | |||
| @@ -1685,7 +1698,9 class SpectraReader(JRODataReader): | |||||
| 1685 |
|
1698 | |||
| 1686 | Return : None |
|
1699 | Return : None | |
| 1687 | """ |
|
1700 | """ | |
| 1688 |
|
1701 | |||
|
|
1702 | self.__isConfig = False | |||
|
|
1703 | ||||
| 1689 | self.pts2read_SelfSpectra = 0 |
|
1704 | self.pts2read_SelfSpectra = 0 | |
| 1690 |
|
1705 | |||
| 1691 | self.pts2read_CrossSpectra = 0 |
|
1706 | self.pts2read_CrossSpectra = 0 | |
| @@ -2019,6 +2034,8 class SpectraWriter(JRODataWriter): | |||||
| 2019 |
|
2034 | |||
| 2020 | self.dataOutObj = dataOutObj |
|
2035 | self.dataOutObj = dataOutObj | |
| 2021 |
|
2036 | |||
|
|
2037 | self.__isConfig = False | |||
|
|
2038 | ||||
| 2022 | self.nTotalBlocks = 0 |
|
2039 | self.nTotalBlocks = 0 | |
| 2023 |
|
2040 | |||
| 2024 | self.data_spc = None |
|
2041 | self.data_spc = None | |
General Comments 0
You need to be logged in to leave comments.
Login now