##// END OF EJS Templates
schain
RSS
Se traslado el codigo antiguo a la carpeta old y se creo la estructura de directorios Model, Controller y GUI
Miguel Valdez -
r169:661bb8af254a
parent child
Show More
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Controller/Controller.py to schainpy/old/Controller/Controller.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Controller/experiment.cfg to schainpy/old/Controller/experiment.cfg
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/BaseGraph.py to schainpy/old/Graphics/BaseGraph.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/BaseGraph_mpl.py to schainpy/old/Graphics/BaseGraph_mpl.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/SpectraPlot.py to schainpy/old/Graphics/SpectraPlot.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/SpectraPlot2.py to schainpy/old/Graphics/SpectraPlot2.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/VoltagePlot.py to schainpy/old/Graphics/VoltagePlot.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/__init__.py to schainpy/old/Graphics/__init__.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/schainPlot.py to schainpy/old/Graphics/schainPlot.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/schainPlotLib.py to schainpy/old/Graphics/schainPlotLib.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Graphics/schainPlotTypes.py to schainpy/old/Graphics/schainPlotTypes.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/IO/CorrelationIO.py to schainpy/old/IO/CorrelationIO.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/IO/JRODataIO.py to schainpy/old/IO/JRODataIO.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/IO/SpectraIO.py to schainpy/old/IO/SpectraIO.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/IO/VoltageIO.py to schainpy/old/IO/VoltageIO.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/IO/__init__.py to schainpy/old/IO/__init__.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Model/Correlation.py to schainpy/old/Model/Correlation.py
Show file before | Show file after | Hide comments
@@ -39,11 +39,11 class JROData(Data):
39 39 classdocs
40 40 '''
41 41
42 m_RadarControllerHeader = RadarControllerHeader()
42 radarControllerHeaderObj = RadarControllerHeader()
43 43
44 44 m_ProcessingHeader = ProcessingHeader()
45 45
46 m_SystemHeader = SystemHeader()
46 systemHeaderObj = SystemHeader()
47 47
48 48 m_BasicHeader = BasicHeader()
49 49
@@ -86,8 +86,8 class JROData(Data):
86 86 self.m_ProcessingHeader.deltaHeight = step
87 87
88 88 self.m_ProcessingHeader.numHeights = self.nHeights
89 self.m_SystemHeader.numChannels = self.nChannels
90 self.m_SystemHeader.numProfiles = self.nProfiles
89 self.systemHeaderObj.numChannels = self.nChannels
90 self.systemHeaderObj.numProfiles = self.nProfiles
91 91
92 92 def updateObjFromHeader(self):
93 93
@@ -96,10 +96,10 class JROData(Data):
96 96 xf = xi + self.m_ProcessingHeader.numHeights*step
97 97
98 98 self.heightList = numpy.arange(xi, xf, step)
99 self.channelIndexList = numpy.arange(self.m_SystemHeader.numChannels)
100 self.channelList = numpy.arange(self.m_SystemHeader.numChannels)
99 self.channelIndexList = numpy.arange(self.systemHeaderObj.numChannels)
100 self.channelList = numpy.arange(self.systemHeaderObj.numChannels)
101 101
102 102 self.nHeights = len(self.heightList)
103 self.nProfiles = self.m_SystemHeader.numProfiles
103 self.nProfiles = self.systemHeaderObj.numProfiles
104 104 self.nChannels = len(self.channelList)
105 105 No newline at end of file
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Model/JROHeader.py to schainpy/old/Model/JROHeader.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Model/Spectra.py to schainpy/old/Model/Spectra.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Model/Voltage.py to schainpy/old/Model/Voltage.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Model/__init__.py to schainpy/old/Model/__init__.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Processing/CorrelationProcessor.py to schainpy/old/Processing/CorrelationProcessor.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Processing/JRONoise.py to schainpy/old/Processing/JRONoise.py
Show file before | Show file after | Hide comments
@@ -107,8 +107,8 class SpectraProcessor:
107 107 self.dataOutObj.channelIndexList = self.dataInObj.channelIndexList
108 108 self.dataOutObj.m_BasicHeader = self.dataInObj.m_BasicHeader.copy()
109 109 self.dataOutObj.m_ProcessingHeader = self.dataInObj.m_ProcessingHeader.copy()
110 self.dataOutObj.m_RadarControllerHeader = self.dataInObj.m_RadarControllerHeader.copy()
111 self.dataOutObj.m_SystemHeader = self.dataInObj.m_SystemHeader.copy()
110 self.dataOutObj.radarControllerHeaderObj = self.dataInObj.radarControllerHeaderObj.copy()
111 self.dataOutObj.systemHeaderObj = self.dataInObj.systemHeaderObj.copy()
112 112
113 113 self.dataOutObj.dataType = self.dataInObj.dataType
114 114 self.dataOutObj.nPairs = self.nPairs
@@ -118,8 +118,8 class SpectraProcessor:
118 118 self.dataOutObj.nFFTPoints = self.nFFTPoints
119 119 #self.dataOutObj.data = None
120 120
121 self.dataOutObj.m_SystemHeader.numChannels = self.nChannels
122 self.dataOutObj.m_SystemHeader.nProfiles = self.nFFTPoints
121 self.dataOutObj.systemHeaderObj.numChannels = self.nChannels
122 self.dataOutObj.systemHeaderObj.nProfiles = self.nFFTPoints
123 123
124 124 self.dataOutObj.m_ProcessingHeader.totalSpectra = self.nChannels + self.nPairs
125 125 self.dataOutObj.m_ProcessingHeader.profilesPerBlock = self.nFFTPoints
@@ -199,8 +199,8 class SpectraProcessor:
199 199 self.dataOutObj.heightList
200 200 self.dataOutObj.m_BasicHeader
201 201 self.dataOutObj.m_ProcessingHeader
202 self.dataOutObj.m_RadarControllerHeader
203 self.dataOutObj.m_SystemHeader
202 self.dataOutObj.radarControllerHeaderObj
203 self.dataOutObj.systemHeaderObj
204 204 self.profIndex
205 205 self.buffer
206 206 self.dataOutObj.flagNoData
@@ -208,7 +208,7 class SpectraProcessor:
208 208 self.dataOutObj.nPairs
209 209 self.dataOutObj.nChannels
210 210 self.dataOutObj.nProfiles
211 self.dataOutObj.m_SystemHeader.numChannels
211 self.dataOutObj.systemHeaderObj.numChannels
212 212 self.dataOutObj.m_ProcessingHeader.totalSpectra
213 213 self.dataOutObj.m_ProcessingHeader.profilesPerBlock
214 214 self.dataOutObj.m_ProcessingHeader.numHeights
@@ -435,7 +435,7 class SpectraProcessor:
435 435 self.dataOutObj.nChannels
436 436 self.dataOutObj.nPairs
437 437 self.dataOutObj.m_ProcessingHeader.spectraComb
438 self.dataOutObj.m_SystemHeader.numChannels
438 self.dataOutObj.systemHeaderObj.numChannels
439 439
440 440 self.dataOutObj.noise
441 441 Return:
@@ -494,7 +494,7 class SpectraProcessor:
494 494
495 495 self.dataOutObj.m_ProcessingHeader.spectraComb = spectraComb
496 496 self.dataOutObj.m_ProcessingHeader.totalSpectra = nChannels + nPairs
497 self.dataOutObj.m_SystemHeader.numChannels = nChannels
497 self.dataOutObj.systemHeaderObj.numChannels = nChannels
498 498 self.dataOutObj.nChannels = nChannels
499 499 self.dataOutObj.m_ProcessingHeader.blockSize = blocksize
500 500
@@ -565,7 +565,7 class SpectraProcessor:
565 565 self.dataOutObj.m_ProcessingHeader.numHeights
566 566 self.dataOutObj.m_ProcessingHeader.blockSize
567 567 self.dataOutObj.m_ProcessingHeader.firstHeight
568 self.dataOutObj.m_RadarControllerHeader.numHeights
568 self.dataOutObj.radarControllerHeaderObj.numHeights
569 569
570 570 Return:
571 571 None
@@ -612,7 +612,7 class SpectraProcessor:
612 612 self.dataOutObj.m_ProcessingHeader.blockSize = blockSize
613 613 self.dataOutObj.m_ProcessingHeader.numHeights = nHeights
614 614 self.dataOutObj.m_ProcessingHeader.firstHeight = firstHeight
615 self.dataOutObj.m_RadarControllerHeader.numHeights = nHeights
615 self.dataOutObj.radarControllerHeaderObj.numHeights = nHeights
616 616
617 617 self.dataOutObj.heightList = self.dataOutObj.heightList[minIndex:maxIndex+1]
618 618
Show file before | Show file after | Hide comments
@@ -252,7 +252,7 class VoltageProcessor:
252 252 return 0
253 253
254 254 if code == None:
255 code = self.dataOutObj.m_RadarControllerHeader.code
255 code = self.dataOutObj.radarControllerHeaderObj.code
256 256 ncode, nbaud = code.shape
257 257
258 258 if len(self.decoderObjList) <= self.decoderObjIndex:
@@ -271,7 +271,7 class VoltageProcessor:
271 271
272 272 def filterByHei(self, window):
273 273 if window == None:
274 window = self.dataOutObj.m_RadarControllerHeader.txA / self.dataOutObj.m_ProcessingHeader.deltaHeight[0]
274 window = self.dataOutObj.radarControllerHeaderObj.txA / self.dataOutObj.m_ProcessingHeader.deltaHeight[0]
275 275
276 276 newdelta = self.dataOutObj.m_ProcessingHeader.deltaHeight[0] * window
277 277 dim1 = self.dataOutObj.data.shape[0]
@@ -310,7 +310,7 class VoltageProcessor:
310 310 self.dataOutObj.channelIndexList
311 311 self.dataOutObj.nChannels
312 312 self.dataOutObj.m_ProcessingHeader.totalSpectra
313 self.dataOutObj.m_SystemHeader.numChannels
313 self.dataOutObj.systemHeaderObj.numChannels
314 314 self.dataOutObj.m_ProcessingHeader.blockSize
315 315
316 316 Return:
@@ -332,7 +332,7 class VoltageProcessor:
332 332 self.dataOutObj.nChannels = nChannels
333 333
334 334 self.dataOutObj.m_ProcessingHeader.totalSpectra = 0
335 self.dataOutObj.m_SystemHeader.numChannels = nChannels
335 self.dataOutObj.systemHeaderObj.numChannels = nChannels
336 336 self.dataOutObj.m_ProcessingHeader.blockSize = data.size
337 337 return 1
338 338
@@ -398,7 +398,7 class VoltageProcessor:
398 398 self.dataOutObj.m_ProcessingHeader.blockSize
399 399 self.dataOutObj.m_ProcessingHeader.numHeights
400 400 self.dataOutObj.m_ProcessingHeader.firstHeight
401 self.dataOutObj.m_RadarControllerHeader
401 self.dataOutObj.radarControllerHeaderObj
402 402
403 403 Return:
404 404 1 si el metodo se ejecuto con exito caso contrario devuelve 0
@@ -425,7 +425,7 class VoltageProcessor:
425 425 self.dataOutObj.m_ProcessingHeader.blockSize = data.size
426 426 self.dataOutObj.m_ProcessingHeader.numHeights = nHeights
427 427 self.dataOutObj.m_ProcessingHeader.firstHeight = firstHeight
428 self.dataOutObj.m_RadarControllerHeader.numHeights = nHeights
428 self.dataOutObj.radarControllerHeaderObj.numHeights = nHeights
429 429 return 1
430 430
431 431 def selectProfilesByValue(self,indexList, nProfiles):
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Processing/__init__.py to schainpy/old/Processing/__init__.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Utilities/FtpServer.py to schainpy/old/Utilities/FtpServer.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Utilities/FtpServerList.py to schainpy/old/Utilities/FtpServerList.py
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from schainpy/Utilities/__init__.py to schainpy/old/Utilities/__init__.py
General Comments 0
You need to be logged in to leave comments. Login now