| @@ -395,7 +395,15 class WeatherPlot(Plot): | |||
|
|
395 | 395 | |
|
|
396 | 396 | data = {} |
|
|
397 | 397 | meta = {} |
|
|
398 | data['weather'] = 10*numpy.log10(dataOut.data_360[0]/(250.0)) | |
|
|
398 | if hasattr(dataOut, 'dataPP_POWER'): | |
|
|
399 | factor = 1 | |
|
|
400 | ||
|
|
401 | if hasattr(dataOut, 'nFFTPoints'): | |
|
|
402 | factor = dataOut.normFactor | |
|
|
403 | ||
|
|
404 | print("factor",factor) | |
|
|
405 | data['weather'] = 10*numpy.log10(dataOut.data_360[0]/(factor)) | |
|
|
406 | print("weather",data['weather']) | |
|
|
399 | 407 | data['azi'] = dataOut.data_azi |
|
|
400 | 408 | return data, meta |
|
|
401 | 409 | |
| @@ -498,7 +506,7 class WeatherPlot(Plot): | |||
|
|
498 | 506 | cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin=1, vmax=60) |
|
|
499 | 507 | else: |
|
|
500 | 508 | plt.clf() |
|
|
501 |
cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin= |
|
|
|
509 | cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin=1, vmax=60) | |
|
|
502 | 510 | caax = cgax.parasites[0] |
|
|
503 | 511 | paax = cgax.parasites[1] |
|
|
504 | 512 | cbar = plt.gcf().colorbar(pm, pad=0.075) |
| @@ -1286,7 +1286,6 class SpectralMoments(Operation): | |||
|
|
1286 | 1286 | vec_snr = numpy.zeros(oldspec.shape[1]) |
|
|
1287 | 1287 | |
|
|
1288 | 1288 | # oldspec = numpy.ma.masked_invalid(oldspec) |
|
|
1289 | ||
|
|
1290 | 1289 | for ind in range(oldspec.shape[1]): |
|
|
1291 | 1290 | |
|
|
1292 | 1291 | spec = oldspec[:,ind] |
| @@ -1325,7 +1324,7 class SpectralMoments(Operation): | |||
|
|
1325 | 1324 | ss1 = m |
|
|
1326 | 1325 | |
|
|
1327 | 1326 | valid = numpy.arange(int(m + bb0 - ss1 + 1)) + ss1 |
|
|
1328 | ||
|
|
1327 | #valid = numpy.arange(1,oldspec.shape[0])# valid perfil completo igual pulsepair | |
|
|
1329 | 1328 | signal_power = ((spec2[valid] - n0) * fwindow[valid]).mean() # D. Scipión added with correct definition |
|
|
1330 | 1329 | total_power = (spec2[valid] * fwindow[valid]).mean() # D. Scipión added with correct definition |
|
|
1331 | 1330 | power = ((spec2[valid] - n0) * fwindow[valid]).sum() |
| @@ -4099,7 +4098,7 class PedestalInformation(Operation): | |||
|
|
4099 | 4098 | #print(len(self.list_adq)) |
|
|
4100 | 4099 | utc_ped_list=[] |
|
|
4101 | 4100 | for i in range(len(self.list_pedestal)): |
|
|
4102 | print(i) | |
|
|
4101 | #print(i)# OJO IDENTIFICADOR DE SINCRONISMO | |
|
|
4103 | 4102 | utc_ped_list.append(self.gettimeutcfromDirFilename(path=self.path_ped,file=self.list_pedestal[i])) |
|
|
4104 | 4103 | |
|
|
4105 | 4104 | #utc_ped_list= utc_ped_list |
| @@ -4384,7 +4383,7 class Block360(Operation): | |||
|
|
4384 | 4383 | #print("line 4049",data.dataPP_POW.shape,data.dataPP_POW[:10]) |
|
|
4385 | 4384 | #print("line 4049",data.azimuth.shape,data.azimuth) |
|
|
4386 | 4385 | if self.mode==0: |
|
|
4387 | self.__buffer[:,self.__profIndex,:]= data.dataPP_POW | |
|
|
4386 | self.__buffer[:,self.__profIndex,:]= data.dataPP_POWER# PRIMER MOMENTO | |
|
|
4388 | 4387 | if self.mode==1: |
|
|
4389 | 4388 | self.__buffer[:,self.__profIndex,:]= data.data_pow |
|
|
4390 | 4389 | #print("me casi",self.index,data.azimuth[self.index]) |
|
|
1 | NO CONTENT: modified file |
| @@ -32,8 +32,8 path = '/DATA_RM/WR_20_OCT' | |||
|
|
32 | 32 |
#### |
|
|
33 | 33 | figpath_pp = "/home/soporte/Pictures/TEST_PP" |
|
|
34 | 34 | figpath_spec = "/home/soporte/Pictures/TEST_MOM" |
|
|
35 |
plot = |
|
|
|
36 |
integration = |
|
|
|
35 | plot = 0 | |
|
|
36 | integration = 1 | |
|
|
37 | 37 | save = 0 |
|
|
38 | 38 | if save == 1: |
|
|
39 | 39 | if mode==0: |
| @@ -69,7 +69,7 if save ==1: | |||
|
|
69 | 69 | |
|
|
70 | 70 | print("* Integracion de datos :",integration) |
|
|
71 | 71 | |
|
|
72 |
time.sleep( |
|
|
|
72 | time.sleep(5) | |
|
|
73 | 73 | #remotefolder = "/home/wmaster/graficos" |
|
|
74 | 74 | ####################################################################### |
|
|
75 | 75 | ################# RANGO DE PLOTEO###################################### |
| @@ -209,7 +209,7 else: | |||
|
|
209 | 209 | opObj11.addParameter(name='online', value='0', format='int') |
|
|
210 | 210 | |
|
|
211 | 211 | opObj11 = procUnitConfObjC.addOperation(name='Block360') |
|
|
212 |
opObj11.addParameter(name='n', value=' |
|
|
|
212 | opObj11.addParameter(name='n', value='10', format='int') | |
|
|
213 | 213 | opObj11.addParameter(name='mode', value=mode, format='int') |
|
|
214 | 214 | |
|
|
215 | 215 | # este bloque funciona bien con divisores de 360 no olvidar 0 10 20 30 40 60 90 120 180 |
General Comments 0
You need to be logged in to leave comments.
Login now