schain Commit - r1407:f9e5aa2bcc6e · Jicamarca Repository

correcion de escritura 360 y ploteo completo de PP y Spectro

avaldezp -

r1407:f9e5aa2bcc6e

parent child

Context file:

r1407:f9e5aa2bcc6e

Collapse all files

schainpy/model/graphics/jroplot_parameters.py +90 -17

@@ -409,6 +409,77 class WeatherPlot(Plot):
409	data['azi'] = dataOut.data_azi	409	data['azi'] = dataOut.data_azi
410	return data, meta	410	return data, meta
411		411
		412	def get2List(self,angulos):
		413	list1=[]
		414	list2=[]
		415	for i in reversed(range(len(angulos))):
		416	diff_ = angulos[i]-angulos[i-1]
		417	if diff_ >1.5:
		418	list1.append(i-1)
		419	list2.append(diff_)
		420	return list(reversed(list1)),list(reversed(list2))
		421
		422	def fixData360(self,list_,ang_):
		423	if list_[0]==-1:
		424	vec = numpy.where(ang_<ang_[0])
		425	ang_[vec] = ang_[vec]+360
		426	return ang_
		427	return ang_
		428
		429
		430	def fixData360HL(self,angulos):
		431	vec = numpy.where(angulos>=360)
		432	angulos[vec]=angulos[vec]-360
		433	return angulos
		434
		435	def search_pos(self,pos,list_):
		436	for i in range(len(list_)):
		437	if pos == list_[i]:
		438	return True,i
		439	i=None
		440	return False,i
		441
		442	def fixDataComp(self,ang_,list1_,list2_):
		443	size = len(ang_)
		444	size2 = 0
		445	for i in range(len(list2_)):
		446	size2=size2+list2_[i]-1
		447	new_size= size+size2
		448	ang_new = numpy.zeros(new_size)
		449	ang_new2 = numpy.zeros(new_size)
		450
		451	tmp = 0
		452	c = 0
		453	for i in range(len(ang_)):
		454	ang_new[tmp +c] = ang_[i]
		455	ang_new2[tmp+c] = ang_[i]
		456	condition , value = self.search_pos(i,list1_)
		457	if condition:
		458	pos = tmp + c + 1
		459	for k in range(list2_[value]-1):
		460	ang_new[pos+k] = ang_new[pos+k-1]+1
		461	ang_new2[pos+k] = numpy.nan
		462	tmp = pos +k
		463	c = 0
		464	c=c+1
		465	return ang_new,ang_new2
		466
		467
		468	def globalCheckPED(self,angulos):
		469	l1,l2 = self.get2List(angulos)
		470	if len(l1)>0:
		471	angulos2 = self.fixData360(list_=l1,ang_=angulos)
		472	l1,l2 = self.get2List(angulos2)
		473
		474	ang1_,ang2_ = self.fixDataComp(ang_=angulos2,list1_=l1,list2_=l2)
		475	ang1_ = self.fixData360HL(ang1_)
		476	ang2_ = self.fixData360HL(ang2_)
		477
		478	else:
		479	ang1_= angulos
		480	ang2_= angulos
		481	return ang1_,ang2_
		482
412	def analizeDATA(self,data_azi):	483	def analizeDATA(self,data_azi):
413	list1 = []	484	list1 = []
414	list2 = []	485	list2 = []
@@ -450,15 +521,15 class WeatherPlot(Plot):
450	return data	521	return data
451		522
452	def replaceNAN(self,data_weather,data_azi,val):	523	def replaceNAN(self,data_weather,data_azi,val):
453	print("----------------activeNEWFUNCTION")	524	####print("----------------activeNEWFUNCTION")
454	data= data_azi	525	data= data_azi
455	data_T= data_weather	526	data_T= data_weather
456	print("data_azi",data_azi)	527	####print("data_azi",data_azi)
457	print("VAL:",val)	528	####print("VAL:",val)
458	print("SHAPE",data_T.shape)	529	####print("SHAPE",data_T.shape)
459	for i in range(len(data)):	530	for i in range(len(data)):
460	if numpy.isnan(data[i]):	531	if numpy.isnan(data[i]):
461	print("NAN")	532	####print("NAN")
462	data_T[i,:]=numpy.ones(data_T.shape[1])*val	533	data_T[i,:]=numpy.ones(data_T.shape[1])*val
463	#data_T[i,:]=numpy.ones(data_T.shape[1])*numpy.nan	534	#data_T[i,:]=numpy.ones(data_T.shape[1])*numpy.nan
464	return data_T	535	return data_T
@@ -467,9 +538,11 class WeatherPlot(Plot):
467	if self.ini==0:	538	if self.ini==0:
468	#------- AZIMUTH	539	#------- AZIMUTH
469	n = (360/res)-len(data_azi)	540	n = (360/res)-len(data_azi)
470	##### new	541	#--------------------- new -------------------------
471	data_azi_old = data_azi	542	####data_azi_old = data_azi
472	data_azi_new = self.~~fixDATA~~(data_azi)	543	data_azi_new ,data_azi_old= self.globalCheckPED(data_azi)
		544	#------------------------
		545	####data_azi_new = self.fixDATA(data_azi)
473	#ata_azi_new = self.fixDATANEW(data_azi)	546	#ata_azi_new = self.fixDATANEW(data_azi)
474		547
475	start = data_azi_new[-1] + res	548	start = data_azi_new[-1] + res
@@ -491,16 +564,17 class WeatherPlot(Plot):
491	# azimuth	564	# azimuth
492	flag=0	565	flag=0
493	start_azi = self.res_azi[0]	566	start_azi = self.res_azi[0]
494	#### new	567	#-----------new------------
495	data_azi_old = data_azi	568	data_azi ,data_azi_old= self.globalCheckPED(data_azi)
496	### weather ###
497	data_weather = self.replaceNAN(data_weather=data_weather,data_azi=data_azi_old,val=self.val_mean)	569	data_weather = self.replaceNAN(data_weather=data_weather,data_azi=data_azi_old,val=self.val_mean)
		570	#--------------------------
		571	####data_azi_old = data_azi
		572	### weather ###
		573	####data_weather = self.replaceNAN(data_weather=data_weather,data_azi=data_azi_old,val=self.val_mean)
498		574
499	if numpy.isnan(data_azi[0]):	575	####if numpy.isnan(data_azi[0]):
500	data_azi[0]=self.last_data_azi+1	576	#### data_azi[0]=self.last_data_azi+1
501	data_azi = self.fixDATA(data_azi)	577	####data_azi = self.fixDATA(data_azi)
502	####
503
504	start = data_azi[0]	578	start = data_azi[0]
505	end = data_azi[-1]	579	end = data_azi[-1]
506	self.last_data_azi= end	580	self.last_data_azi= end
@@ -510,7 +584,6 class WeatherPlot(Plot):
510	start = start +360	584	start = start +360
511	if end <start_azi:	585	if end <start_azi:
512	end = end +360	586	end = end +360
513
514	####print("start",start)	587	####print("start",start)
515	####print("end",end)	588	####print("end",end)
516	#### AQUI SERA LA MAGIA	589	#### AQUI SERA LA MAGIA

schainpy/model/proc/jroproc_parameters.py +41 -41

                     nro_file,utc_ped,utc_ped_1  =self.getNROFile(utc_adq,utc_ped_list)
                     #print("utc_adq",utc_adq)
-                    print("utc_ped",utc_ped)
+                    ####print("utc_ped",utc_ped)
-                    print("DIFF",utc_adq-utc_ped)
+                    ####print("DIFF",utc_adq-utc_ped)
-                    print("nro_file",nro_file)
+                    ####print("nro_file",nro_file)
                     if nro_file < 0:
                         #print("-----------------------------------------------------------------")
                         #print("INSERTANDO ANGULO NAN")
                 def setup_offline(self,dataOut,list_pedestal):
                     print("SETUP OFFLINE")
-                    print(self.path_ped)
+                    ####print(self.path_ped)
                     #print(self.path_adq)
-                    print(len(self.list_pedestal))
+                    ####print(len(self.list_pedestal))
                     #print(len(self.list_adq))
                     utc_ped_list=[]
                     for i in range(len(self.list_pedestal)):
                     #utc_ped_list= utc_ped_list
                     ###utc_adq     = self.gettimeutcadqfromDirFilename(path=self.path_adq,file=self.list_adq[0])
-                    print("dios existe donde esta")
+                    ####print("dios existe donde esta")
-                    print("utc_ped_list",utc_ped_list)
+                    #####print("utc_ped_list",utc_ped_list)
                     #print("utc_adq",utc_adq)
                     # utc_adq_dataOut
                     utc_adq_dataOut =dataOut.utctime
-                    print("OFFLINE-UTC_ADQ_dataout",utc_adq_dataOut)
+                    ####print("OFFLINE-UTC_ADQ_dataout",utc_adq_dataOut)
                     nro_file,utc_ped,utc_ped_1 = self.getNROFile(utc_adq=utc_adq_dataOut, utc_ped_list= utc_ped_list)
-                    print("nro_file",nro_file,"utc_ped",utc_ped)
+                    ####print("nro_file",nro_file,"utc_ped",utc_ped)
-                    print("nro_file",i)
+                    ####print("nro_file",i)
                     nro_key_p    = int((utc_adq_dataOut-utc_ped)/self.t_Interval_p)-1 # ojito al -1 estimado alex
-                    print("nro_key_p",nro_key_p)
+                    ####print("nro_key_p",nro_key_p)
                     ff_pedestal  = self.list_
                     pedestal[nro_file]
                     #angulo       = self.getDatavaluefromDirFilename(path=self.path_ped,file=ff_pedestal,value="azimuth")
                     angulo       = self.getDatavaluefromDirFilename(path=self.path_ped,file=ff_pedestal,value="azi_pos")
-                    print("utc_pedestal_init             :",utc_ped+nro_key_p*self.t_Interval_p)
+                    ####print("utc_pedestal_init             :",utc_ped+nro_key_p*self.t_Interval_p)
                     if nro_key_p>0:
                         print("angulo_array                  :",angulo[nro_key_p])
                     self.nro_file  = nro_file
                 def setup_online(self,dataOut):
                     utc_adq =dataOut.utctime
-                    print("Online-utc_adq",utc_adq)
+                    ####print("Online-utc_adq",utc_adq)
-                    print(len(self.list_pedestal))
+                    ####print(len(self.list_pedestal))
                     utc_ped_list=[]
                     for i in range(len(self.list_pedestal)):
                         utc_ped_list.append(self.gettimeutcfromDirFilename(path=self.path_ped,file=self.list_pedestal[i]))
-                    print(utc_ped_list[:20])
+                    ####print(utc_ped_list[:20])
-                    #print(utc_ped_list[488:498])
+                    ####print(utc_ped_list[488:498])
-                    print("ultimo UTC-PEDESTAL",utc_ped_list[-1])
+                    ####print("ultimo UTC-PEDESTAL",utc_ped_list[-1])
                     nro_file,utc_ped,utc_ped_1 = self.getNROFile(utc_adq=utc_adq, utc_ped_list= utc_ped_list)
-                    print("nro_file",nro_file,"utc_ped",utc_ped,"utc_ped_1",utc_ped_1)
+                    ####print("nro_file",nro_file,"utc_ped",utc_ped,"utc_ped_1",utc_ped_1)
-                    print("name_PEDESTAL",self.list_pedestal[nro_file])
+                    ####print("name_PEDESTAL",self.list_pedestal[nro_file])
                     nro_key_p    = int((utc_adq-utc_ped)/self.t_Interval_p)-1
-                    print("nro_key_p",nro_key_p)
+                    ####print("nro_key_p",nro_key_p)
                     ff_pedestal  = self.list_pedestal[nro_file]
                     #angulo       = self.getDatavaluefromDirFilename(path=self.path_ped,file=ff_pedestal,value="azimuth")
                     angulo       = self.getDatavaluefromDirFilename(path=self.path_ped,file=ff_pedestal,value="azi_pos")
-                    print("utc_pedestal_init             :",utc_ped+nro_key_p*self.t_Interval_p)
+                    ####print("utc_pedestal_init             :",utc_ped+nro_key_p*self.t_Interval_p)
-                    print("angulo_array                  :",angulo[nro_key_p])
+                    ####print("angulo_array                  :",angulo[nro_key_p])
                     self.nro_file  = nro_file
                     self.nro_key_p = nro_key_p
                     print(self.path_ped)
                     #print(self.path_adq)
                     self.list_pedestal = self.getfirstFilefromPath(path=self.path_ped,meta="PE",ext=".hdf5")
-                    print("LIST NEW", self.list_pedestal[:20])
+                    ####print("LIST NEW", self.list_pedestal[:20])
                     #self.list_adq      = self.getfirstFilefromPath(path=self.path_adq,meta="D",ext=".hdf5")
                     print("*************Longitud list pedestal****************",len(self.list_pedestal))
                     '''
                     return diff_utc
                 def setNextFileoffline(self,dataOut):
-                    print("error")
+                    ####print("error")
-                    print("no entiendo")
+                    ####print("no entiendo")
                     flag_NOPedfile = False
                     cont_NOPedFile = 0
                     if self.nro_file<0:
-                        print("adq empieza antes")
+                        ####print("adq empieza antes")
                         return numpy.ones(self.blocksPerfile)*numpy.nan
-                    print("INICIO-----------------------------------------")
+                    ####print("INICIO-----------------------------------------")
                     sleep(3)
                     for j in range(self.blocksPerfile):
-                        print(j)
+                        ####print(j)
                         iterador          =  self.nro_key_p + self.f_a_p*self.c_ped
                         self.c_ped        =  self.c_ped + 1
-                        print("Iterador-->", iterador)
+                        ####print("Iterador-->", iterador)
                         if iterador       <  self.n_Muestras_p:
                             self.nro_file =  self.nro_file
                         else:
                                 ###########################
                                 self.nro_file =  self.nro_file +1
                                 ###########################
-                                print("nro_file",self.nro_file)
+                                ####print("nro_file",self.nro_file)
                                 diff_utc = self.checkPedFile(path=self.path_ped,nro_file=self.nro_file)
-                                print("diff_utc",diff_utc)
+                                ####print("diff_utc",diff_utc)
                                 if diff_utc==1:
                                     utc_ped_setnext=self.gettimeutcfromDirFilename(path=self.path_ped,file=self.list_pedestal[self.nro_file])
                                     utc_adq_setnext=dataOut.utctime
-                                    print("utc_pedestal",utc_ped_setnext)
+                                    ####print("utc_pedestal",utc_ped_setnext)
-                                    print("utc_adq",utc_adq_setnext)
+                                    ####print("utc_adq",utc_adq_setnext)
-                                    print("self.c_ped",self.c_ped)
+                                    ####print("self.c_ped",self.c_ped)
                                     #dif        = self.blocksPerfile-(self.nro_key_p+self.f_a_p*(self.c_ped-2))
                                     dif        = self.n_Muestras_p-(self.nro_key_p+self.f_a_p*(self.c_ped-2))
                                     self.c_ped = 1
                                     ##print("tmp else",tmp)
                                     self.nro_key_p= self.f_a_p-dif
                                     iterador = self.nro_key_p
-                                    print("iterador else",iterador)
+                                    ####print("iterador else",iterador)
                                 if diff_utc >1:
-                                    print("FALTAN DATOS DEL PEDESTAL AMIGO WAIT")
+                                    ####print("FALTAN DATOS DEL PEDESTAL AMIGO WAIT")
-                                    sleep(1)
+                                    ####sleep(1)
                                     #aqui no hay DATA pero creo el nro_key_p "como si existiera" y reinicio el c_ped
-                                    print("continua bro")
+                                    ####print("continua bro")
-                                    print("self.c_ped",self.c_ped)
+                                    ####print("self.c_ped",self.c_ped)
                                     dif        = self.n_Muestras_p-(self.nro_key_p+self.f_a_p*(self.c_ped-2))
                                     self.c_ped     = 1
                                     self.nro_key_p = self.f_a_p-dif
                         #print("config TRUE")
                     utc_adq       = dataOut.utctime
-                    print("utc_adq---------------",utc_adq)
+                    ####print("utc_adq---------------",utc_adq)
                     list_pedestal = self.list_pedestal
                     angulo = self.getAnguloProfile(utc_adq=utc_adq,list_pedestal=list_pedestal)
-                    print("angulo**********",angulo)
+                    ####print("angulo**********",angulo)
                     dataOut.flagNoData      = False
                     if numpy.isnan(angulo):
                         dataOut.flagNoData = True

schainpy/scripts/basic_proc00002.py +10 -11

             print("SETUP- RADAR METEOROLOGICO")
             V       = 6
             V       = 10
-            mode    = 1
+            mode    = 0
             #--------------------------PATH -----------------------------
             # path    = '/DATA_RM/23/6v'
             # path    = '/DATA_RM/TEST_INTEGRACION_2M'
             #figpath_spec = "/home/soporte/Pictures/TEST_MOM"
             figpath_spec = "/home/soporte/Pictures/ppi"
             figpath_ppi  = "/home/soporte/Pictures/ppi_SPEC_10DIC"
-            figpath_ppi_pp  = "/home/soporte/Pictures/ppi_2_10"
+            figpath_ppi_pp  = "/home/soporte/Pictures/ppi_PP_10_DIC"
             figpath_pp  = "/home/soporte/Pictures/TEST_POT"
             figpath_pp  = "/home/soporte/Pictures/TEST_POT2"
             #--------------------------OPCIONES-----------------------------------
             plot        = 0
             integration = 1
-            save        = 1
+            save        = 0
             if save == 1:
                 if mode==0:
                     path_save = '/DATA_RM/TEST_HDF5_PP_23/6v'
                     opObj11.addParameter(name='n_Muestras_p', value='100', format='float')
                     opObj11.addParameter(name='f_a_p', value=f_a_p, format='int')
                     opObj11.addParameter(name='online', value='0', format='int')
-                    '''
                     opObj11 = procUnitConfObjB.addOperation(name='Block360')
                     opObj11.addParameter(name='n', value='10', format='int')
                     opObj11.addParameter(name='mode', value=mode, format='int')
-                    '''
                     # este bloque funciona bien con divisores de 360 no olvidar 0 10 20 30 40 60 90 120 180
-                    '''
                     opObj11= procUnitConfObjB.addOperation(name='WeatherPlot',optype='other')
                     opObj11.addParameter(name='save', value=figpath_ppi_pp)
                     opObj11.addParameter(name='save_period', value=1)
-                    '''
                 if save==1:
                     opObj10 = procUnitConfObjB.addOperation(name='HDFWriter')
                     opObj10.addParameter(name='path',value=path_save)
                     opObj11.addParameter(name='zmax', value=dBmax)
                     opObj11.addParameter(name='save', value=figpath_mom)
                     opObj11.addParameter(name='showprofile', value=0)
-                    opObj11.addParameter(name='save_period', value=100)
+                    opObj11.addParassmeter(name='save_period', value=100)
                 if integration==1:
                    opObj11.addParameter(name='online', value='0', format='int')
                    opObj11 = procUnitConfObjC.addOperation(name='Block360')
-                   opObj11.addParameter(name='n', value='1', format='int')
+                   opObj11.addParameter(name='n', value='20', format='int')
                    opObj11.addParameter(name='mode', value=mode, format='int')
-                   '''
                    # este bloque funciona bien con divisores de 360 no olvidar 0 10 20 30 40 60 90 120 180
                    opObj11= procUnitConfObjC.addOperation(name='WeatherPlot',optype='other')
                    opObj11.addParameter(name='save', value=figpath_ppi)
                    opObj11.addParameter(name='save_period', value=1)
-                   '''
                 if save==1:
                    opObj10 = procUnitConfObjC.addOperation(name='HDFWriter')

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages