##// END OF EJS Templates
schain-jc
RSS
-Agrupamiento de las clases Voltage y Spectra dentro del módulo JROData...
Miguel Valdez -
r137:6bce11d32050
parent child
Show More
Show file before | Show file after | Hide comments
@@ -11,7 +11,7 import numpy
11 path = os.path.split(os.getcwd())[0]
11 path = os.path.split(os.getcwd())[0]
12 sys.path.append(path)
12 sys.path.append(path)
13
13
14 from IO.JROHeader import SystemHeader, RadarControllerHeader
14 from IO.JROHeaderIO import SystemHeader, RadarControllerHeader
15
15
16 class JROData:
16 class JROData:
17
17
@@ -73,4 +73,99 class JROData:
73
73
74 def deepcopy(self):
74 def deepcopy(self):
75
75
76 return copy.deepcopy(self) No newline at end of file
76 return copy.deepcopy(self)
77
78 class Voltage(JROData):
79
80 nCohInt = None
81
82 data = None
83
84 def __init__(self):
85 '''
86 Constructor
87 '''
88
89 self.m_RadarControllerHeader = RadarControllerHeader()
90
91 self.m_SystemHeader = SystemHeader()
92
93 self.type = "Voltage"
94
95 #data es un numpy array de 2 dmensiones ( canales, alturas)
96 self.data = None
97
98 self.dtype = None
99
100 self.nChannels = 0
101
102 self.nHeights = 0
103
104 self.nProfiles = None
105
106 self.heightList = None
107
108 self.channelList = None
109
110 self.channelIndexList = None
111
112 self.flagNoData = True
113
114 self.flagTimeBlock = False
115
116 self.dataUtcTime = None
117
118 self.nCohInt = None
119
120 class Spectra(JROData):
121
122 data_spc = None
123
124 data_cspc = None
125
126 data_dc = None
127
128 nFFTPoints = None
129
130 nPairs = None
131
132 pairsList = None
133
134 nIncohInt = None
135
136 def __init__(self):
137 '''
138 Constructor
139 '''
140
141 self.m_RadarControllerHeader = RadarControllerHeader()
142
143 self.m_SystemHeader = SystemHeader()
144
145 self.type = "Spectra"
146
147 #data es un numpy array de 2 dmensiones ( canales, alturas)
148 # self.data = None
149
150 self.dtype = None
151
152 self.nChannels = 0
153
154 self.nHeights = 0
155
156 self.nProfiles = None
157
158 self.heightList = None
159
160 self.channelList = None
161
162 self.channelIndexList = None
163
164 self.flagNoData = True
165
166 self.flagTimeBlock = False
167
168 self.dataUtcTime = None
169
170 self.nIncohInt = None
171 No newline at end of file
Show file before | Show file after | Hide comments
@@ -14,7 +14,7 import time, datetime
14 path = os.path.split(os.getcwd())[0]
14 path = os.path.split(os.getcwd())[0]
15 sys.path.append(path)
15 sys.path.append(path)
16
16
17 from JROHeader import *
17 from JROHeaderIO import *
18 from Data.JROData import JROData
18 from Data.JROData import JROData
19
19
20 def isNumber(str):
20 def isNumber(str):
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy2/IO/JROHeader.py to schainpy2/IO/JROHeaderIO.py
NO CONTENT: file renamed from schainpy2/IO/JROHeader.py to schainpy2/IO/JROHeaderIO.py
Show file before | Show file after | Hide comments
@@ -13,13 +13,11 import time, datetime
13 path = os.path.split(os.getcwd())[0]
13 path = os.path.split(os.getcwd())[0]
14 sys.path.append(path)
14 sys.path.append(path)
15
15
16 from IO.JROHeader import *
16 from JROHeaderIO import *
17 from Data.Spectra import Spectra
18
19 from JRODataIO import JRODataReader
17 from JRODataIO import JRODataReader
20 from JRODataIO import JRODataWriter
18 from JRODataIO import JRODataWriter
21 from JRODataIO import isNumber
22
19
20 from Data.JROData import Spectra
23
21
24 class SpectraReader(JRODataReader):
22 class SpectraReader(JRODataReader):
25 """
23 """
@@ -51,7 +49,11 class SpectraReader(JRODataReader):
51
49
52 readerObj.getData()
50 readerObj.getData()
53
51
54 print readerObj.dataOutObj.data
52 print readerObj.data_spc
53
54 print readerObj.data_cspc
55
56 print readerObj.data_dc
55
57
56 if readerObj.flagNoMoreFiles:
58 if readerObj.flagNoMoreFiles:
57 break
59 break
@@ -375,7 +377,7 class SpectraReader(JRODataReader):
375
377
376 self.dataOutObj.radarControllerHeaderObj = self.radarControllerHeaderObj.copy()
378 self.dataOutObj.radarControllerHeaderObj = self.radarControllerHeaderObj.copy()
377
379
378 return 1
380 return self.data_spc
379
381
380
382
381 class SpectraWriter(JRODataWriter):
383 class SpectraWriter(JRODataWriter):
Show file before | Show file after | Hide comments
@@ -13,11 +13,11 import time, datetime
13 path = os.path.split(os.getcwd())[0]
13 path = os.path.split(os.getcwd())[0]
14 sys.path.append(path)
14 sys.path.append(path)
15
15
16 from JROHeader import *
16 from JROHeaderIO import *
17 from JRODataIO import JRODataReader
17 from JRODataIO import JRODataReader
18 from JRODataIO import JRODataWriter
18 from JRODataIO import JRODataWriter
19
19
20 from Data.Voltage import Voltage
20 from Data.JROData import Voltage
21
21
22 class VoltageReader(JRODataReader):
22 class VoltageReader(JRODataReader):
23 """
23 """
@@ -314,7 +314,7 class VoltageReader(JRODataReader):
314
314
315 self.dataOutObj.flagNoData = False
315 self.dataOutObj.flagNoData = False
316
316
317 return 1
317 return self.dataOutObj.data
318
318
319
319
320 class VoltageWriter(JRODataWriter):
320 class VoltageWriter(JRODataWriter):
Show file before | Show file after | Hide comments
@@ -11,7 +11,7 import time
11 path = os.path.split(os.getcwd())[0]
11 path = os.path.split(os.getcwd())[0]
12 sys.path.append(path)
12 sys.path.append(path)
13
13
14 from Data.Spectra import Spectra
14 from Data.JROData import Spectra
15 from IO.SpectraIO import SpectraWriter
15 from IO.SpectraIO import SpectraWriter
16 #from Graphics.SpectraPlot import Spectrum
16 #from Graphics.SpectraPlot import Spectrum
17 #from JRONoise import Noise
17 #from JRONoise import Noise
Show file before | Show file after | Hide comments
@@ -12,11 +12,12 import datetime
12 path = os.path.split(os.getcwd())[0]
12 path = os.path.split(os.getcwd())[0]
13 sys.path.append(path)
13 sys.path.append(path)
14
14
15 from Data.Voltage import Voltage
15 from Data.JROData import Voltage
16 from IO.VoltageIO import VoltageWriter
16 from IO.VoltageIO import VoltageWriter
17 from Graphics2.schainPlotTypes import ScopeFigure
17 from Graphics2.schainPlotTypes import ScopeFigure
18
18
19 class VoltageProcessor:
19 class VoltageProcessor:
20
20 dataInObj = None
21 dataInObj = None
21 dataOutObj = None
22 dataOutObj = None
22 integratorObjIndex = None
23 integratorObjIndex = None
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now