schain Commit - r1394:99588b4ace71 · Jicamarca Repository

valid en jroproc_parameters

avaldez -

r1394:99588b4ace71

parent child

Context file:

r1394:99588b4ace71

schainpy/model/graphics/jroplot_parameters.py +10 -2

                     data = {}
                     meta = {}
-                    data['weather'] = 10*numpy.log10(dataOut.data_360[0]/(250.0))
+                    if hasattr(dataOut, 'dataPP_POWER'):
+                        factor = 1
+                    if hasattr(dataOut, 'nFFTPoints'):
+                        factor = dataOut.normFactor
+                    print("factor",factor)
+                    data['weather'] = 10*numpy.log10(dataOut.data_360[0]/(factor))
+                    print("weather",data['weather'])
                     data['azi']     = dataOut.data_azi
                     return data, meta
                             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)
                         else:
                             plt.clf()
-                            cgax, pm = wrl.vis.plot_ppi(self.res_weather,r=r,az=self.res_azi,fig=self.figures[0], proj='cg', vmin=0, vmax=60)
+                            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)
                     caax = cgax.parasites[0]
                     paax = cgax.parasites[1]
                     cbar = plt.gcf().colorbar(pm, pad=0.075)

schainpy/model/proc/jroproc_parameters.py +3 -4

                     vec_snr = numpy.zeros(oldspec.shape[1])
                     # oldspec = numpy.ma.masked_invalid(oldspec)
                     for ind in range(oldspec.shape[1]):
                         spec = oldspec[:,ind]
                             ss1 = m
                         valid = numpy.arange(int(m + bb0 - ss1 + 1)) + ss1
+                        #valid = numpy.arange(1,oldspec.shape[0])# valid perfil completo igual pulsepair
                         signal_power = ((spec2[valid] - n0) * fwindow[valid]).mean()    # D. Scipión added with correct definition
                         total_power = (spec2[valid] * fwindow[valid]).mean()            # D. Scipión added with correct definition
                         power = ((spec2[valid] - n0) * fwindow[valid]).sum()
                     #print(len(self.list_adq))
                     utc_ped_list=[]
                     for i in range(len(self.list_pedestal)):
-                        print(i)
+                        #print(i)# OJO IDENTIFICADOR DE SINCRONISMO
                         utc_ped_list.append(self.gettimeutcfromDirFilename(path=self.path_ped,file=self.list_pedestal[i]))
                     #utc_ped_list= utc_ped_list
                     #print("line 4049",data.dataPP_POW.shape,data.dataPP_POW[:10])
                     #print("line 4049",data.azimuth.shape,data.azimuth)
                     if self.mode==0:
-                        self.__buffer[:,self.__profIndex,:]= data.dataPP_POW
+                        self.__buffer[:,self.__profIndex,:]= data.dataPP_POWER# PRIMER MOMENTO
                     if self.mode==1:
                         self.__buffer[:,self.__profIndex,:]= data.data_pow
                     #print("me casi",self.index,data.azimuth[self.index])

schainpy/model/proc/jroproc_spectra.py +22 -22

                     self.dataOut.flagShiftFFT = False
                 def run(self, nProfiles=None, nFFTPoints=None, pairsList=None, ippFactor=None, shift_fft=False):
                     if self.dataIn.type == "Spectra":
                         self.dataOut.copy(self.dataIn)
                         if shift_fft:
                         if ippFactor == None:
                             self.dataOut.ippFactor = 1
                         self.dataOut.nFFTPoints = nFFTPoints
                         if self.buffer is None:
                     self.dataOut.pairsList = pairs
                     return
                 def selectFFTs(self, minFFT, maxFFT ):
                     """
                     Selecciona un bloque de datos en base a un grupo de valores de puntos FFTs segun el rango
                     minFFT<= FFT <= maxFFT
                     """
                     if (minFFT > maxFFT):
                         raise ValueError("Error selecting heights: Height range (%d,%d) is not valid" % (minFFT, maxFFT))
                     self.selectFFTsByIndex(minIndex, maxIndex)
                     return 1
                 def getBeaconSignal(self, tauindex=0, channelindex=0, hei_ref=None):
                     newheis = numpy.where(
                         self.dataOut.heightList > self.dataOut.radarControllerHeaderObj.Taus[tauindex])
                 def selectFFTsByIndex(self, minIndex, maxIndex):
                     """
                     """
                     if (minIndex < 0) or (minIndex > maxIndex):
                     self.dataOut.data_spc = data_spc
                     self.dataOut.data_cspc = data_cspc
                     self.dataOut.data_dc = data_dc
                     self.dataOut.ippSeconds = self.dataOut.ippSeconds*(self.dataOut.nFFTPoints / numpy.shape(data_cspc)[1])
                     self.dataOut.nFFTPoints = numpy.shape(data_cspc)[1]
                     self.dataOut.profilesPerBlock = numpy.shape(data_cspc)[1]
                         xx_inv = numpy.linalg.inv(xx)
                         xx_aux = xx_inv[0, :]
                         for ich in range(num_chan):
                             yy = jspectra[ich, ind_vel, :]
                             jspectra[ich, freq_dc, :] = numpy.dot(xx_aux, yy)
             class removeInterference(Operation):
                 def removeInterference2(self):
                     cspc = self.dataOut.data_cspc
                     spc = self.dataOut.data_spc
                     Heights = numpy.arange(cspc.shape[2])
                     realCspc = numpy.abs(cspc)
                     for i in range(cspc.shape[0]):
                         LinePower= numpy.sum(realCspc[i], axis=0)
                         Threshold = numpy.amax(LinePower)-numpy.sort(LinePower)[len(Heights)-int(len(Heights)*0.1)]
                         InterferenceSum = numpy.sum( realCspc[i,:,SelectedHeights], axis=0 )
                         InterferenceThresholdMin = numpy.sort(InterferenceSum)[int(len(InterferenceSum)*0.98)]
                         InterferenceThresholdMax = numpy.sort(InterferenceSum)[int(len(InterferenceSum)*0.99)]
                         InterferenceRange = numpy.where( ([InterferenceSum > InterferenceThresholdMin]))# , InterferenceSum < InterferenceThresholdMax]) )
                         #InterferenceRange = numpy.where( ([InterferenceRange < InterferenceThresholdMax]))
                         if len(InterferenceRange)<int(cspc.shape[1]*0.3):
                             cspc[i,InterferenceRange,:] = numpy.NaN
                     self.dataOut.data_cspc = cspc
                 def removeInterference(self, interf = 2, hei_interf = None, nhei_interf = None, offhei_interf = None):
                     jspectra = self.dataOut.data_spc
                     if n is not None:
                         self.n = int(n)
                     else:
                         self.__integrationtime = int(timeInterval)
                         self.n = None
                         self.__byTime = True
                 def run(self, dataOut, n=None, timeInterval=None, overlapping=False):
                     if n == 1:
                         return dataOut
                     dataOut.flagNoData = True
                     if not self.isConfig:
                         dataOut.data_spc = avgdata_spc
                         dataOut.data_cspc = avgdata_cspc
                         dataOut.data_dc = avgdata_dc
                         dataOut.nIncohInt *= self.n
                         dataOut.utctime = avgdatatime
                         dataOut.flagNoData = False
                     return dataOut
             class dopplerFlip(Operation):
                 def run(self, dataOut):
                     # arreglo 1: (num_chan, num_profiles, num_heights)
                     self.dataOut = dataOut
                     # JULIA-oblicua, indice 2
                     # arreglo 2: (num_profiles, num_heights)
                     jspectra = self.dataOut.data_spc[2]
                     # canal modificado es re-escrito en el arreglo de canales
                     self.dataOut.data_spc[2] = jspectra_tmp
-                    return self.dataOut
  No newline at end of file
+                    return self.dataOut

schainpy/scripts/basic_proc00001.py +3 -3

             #path    = '/DATA_RM/TEST_19OCTUBRE/10MHZ'
             path    = '/DATA_RM/WR_20_OCT'
             #### path_ped='/DATA_RM/TEST_PEDESTAL/P20211012-082745'
-            #### path_ped='/DATA_RM/TEST_PEDESTAL/P20211019-192244'
+            ####path_ped='/DATA_RM/TEST_PEDESTAL/P20211019-192244'
             figpath_pp  = "/home/soporte/Pictures/TEST_PP"
             figpath_spec = "/home/soporte/Pictures/TEST_MOM"
-            plot        = 1
+            plot        = 0
-            integration = 0
+            integration = 1
             save        = 0
             if save == 1:
                 if mode==0:

schainpy/scripts/basic_proc00002.py +2 -2

             print("* Integracion de datos :",integration)
-            time.sleep(15)
+            time.sleep(5)
             #remotefolder = "/home/wmaster/graficos"
             #######################################################################
             ################# RANGO DE PLOTEO######################################
                    opObj11.addParameter(name='online', value='0', format='int')
                    opObj11 = procUnitConfObjC.addOperation(name='Block360')
-                   opObj11.addParameter(name='n', value='30', format='int')
+                   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

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