##// END OF EJS Templates
Daniel Valdez -
r159:8ee912d4c03e
parent child
Show More
@@ -369,6 +369,10 class SpectraReader(JRODataReader):
369
369
370 self.dataOutObj.utctime = self.basicHeaderObj.utc + self.basicHeaderObj.miliSecond/1000.#+ self.profileIndex * self.ippSeconds
370 self.dataOutObj.utctime = self.basicHeaderObj.utc + self.basicHeaderObj.miliSecond/1000.#+ self.profileIndex * self.ippSeconds
371
371
372 self.dataOutObj.ippSeconds = self.ippSeconds
373
374 self.dataOutObj.timeInterval = self.ippSeconds * self.processingHeaderObj.nCohInt * self.processingHeaderObj.nIncohInt * self.dataOutObj.nFFTPoints
375
372 self.dataOutObj.flagShiftFFT = self.processingHeaderObj.shif_fft
376 self.dataOutObj.flagShiftFFT = self.processingHeaderObj.shif_fft
373
377
374 # self.profileIndex += 1
378 # self.profileIndex += 1
@@ -297,7 +297,7 class VoltageReader(JRODataReader):
297
297
298 self.dataOutObj.ippSeconds = self.ippSeconds
298 self.dataOutObj.ippSeconds = self.ippSeconds
299
299
300 self.dataOutObj.timeInterval = self.ippSeconds
300 self.dataOutObj.timeInterval = self.ippSeconds * self.processingHeaderObj.nCohInt
301
301
302 self.dataOutObj.nCohInt = self.processingHeaderObj.nCohInt
302 self.dataOutObj.nCohInt = self.processingHeaderObj.nCohInt
303
303
@@ -211,6 +211,8 class SpectraProcessor:
211 self.dataOutObj.flagDeflipData = self.dataInObj.flagDeflipData #asumo q la data esta sin flip
211 self.dataOutObj.flagDeflipData = self.dataInObj.flagDeflipData #asumo q la data esta sin flip
212 self.dataOutObj.flagShiftFFT = self.dataInObj.flagShiftFFT
212 self.dataOutObj.flagShiftFFT = self.dataInObj.flagShiftFFT
213 self.dataOutObj.nIncohInt = 1
213 self.dataOutObj.nIncohInt = 1
214 self.dataOutObj.ippSeconds = self.dataInObj.ippSeconds
215 self.dataOutObj.timeInterval = self.dataInObj.timeInterval
214
216
215 def addWriter(self, wrpath, blocksPerFile):
217 def addWriter(self, wrpath, blocksPerFile):
216
218
@@ -261,6 +263,63 class SpectraProcessor:
261 if len(self.plotObjList) <= self.plotObjIndex:
263 if len(self.plotObjList) <= self.plotObjIndex:
262 self.addSpc(idfigure, nframes, wintitle, driver, colormap, colorbar, showprofile)
264 self.addSpc(idfigure, nframes, wintitle, driver, colormap, colorbar, showprofile)
263
265
266 def addRti(self, idfigure, nframes, wintitle, driver, colormap, colorbar, showprofile):
267 rtiObj = RTIFigure(idfigure, nframes, wintitle, driver, colormap, colorbar, showprofile)
268 self.plotObjList.append(rtiObj)
269
270 def plotRti(self, idfigure=None,
271 starttime=None,
272 endtime=None,
273 rangemin=None,
274 rangemax=None,
275 minvalue=None,
276 maxvalue=None,
277 wintitle='',
278 driver='plplot',
279 colormap='br_greeen',
280 colorbar=True,
281 showprofile=False,
282 xrangestep=None,
283 save=False,
284 gpath=None,
285 ratio=1,
286 channelList=None):
287
288 if self.dataOutObj.flagNoData:
289 return 0
290
291 if channelList == None:
292 channelList = self.dataOutObj.channelList
293
294 nframes = len(channelList)
295
296 if len(self.plotObjList) <= self.plotObjIndex:
297 self.addRti(idfigure, nframes, wintitle, driver, colormap, colorbar, showprofile)
298
299 data = 10.*numpy.log10(self.dataOutObj.data_spc[channelList,:,:])
300
301 currenttime = self.dataOutObj.utctime - time.timezone
302
303 range = self.dataOutObj.heightList
304
305
306 figuretitle = "RTI Plot for Spectra Data" #+ date
307
308 cleardata = False
309
310 deltax = self.dataOutObj.timeInterval
311
312 plotObj = self.plotObjList[self.plotObjIndex]
313
314
315
316
317
318 self.plotObjIndex += 1
319
320
321
322
264
323
265
324
266
325
@@ -97,7 +97,7 class VoltageProcessor:
97 thisdatetime = datetime.datetime.fromtimestamp(self.dataOutObj.utctime)
97 thisdatetime = datetime.datetime.fromtimestamp(self.dataOutObj.utctime)
98 dateTime = "%s"%(thisdatetime.strftime("%d-%b-%Y %H:%M:%S"))
98 dateTime = "%s"%(thisdatetime.strftime("%d-%b-%Y %H:%M:%S"))
99 date = "%s"%(thisdatetime.strftime("%d-%b-%Y"))
99 date = "%s"%(thisdatetime.strftime("%d-%b-%Y"))
100 print thisdatetime
100
101 figuretitle = "RTI Plot Radar Data" #+ date
101 figuretitle = "RTI Plot Radar Data" #+ date
102
102
103 plotObj = self.plotObjList[self.plotObjIndex]
103 plotObj = self.plotObjList[self.plotObjIndex]
@@ -221,7 +221,7 class VoltageProcessor:
221 myCohIntObj = self.integratorObjList[self.integratorObjIndex]
221 myCohIntObj = self.integratorObjList[self.integratorObjIndex]
222 myCohIntObj.exe(data = self.dataOutObj.data, datatime=None)
222 myCohIntObj.exe(data = self.dataOutObj.data, datatime=None)
223
223
224 self.dataOutObj.timeInterval *= nCohInt
224 # self.dataOutObj.timeInterval *= nCohInt
225 self.dataOutObj.flagNoData = True
225 self.dataOutObj.flagNoData = True
226
226
227 if myCohIntObj.isReady:
227 if myCohIntObj.isReady:
General Comments 0
You need to be logged in to leave comments. Login now