From dc5534725adfbc3699813b17d621a54092532278 2018-02-21 13:36:20 From: ebocanegra Date: 2018-02-21 13:36:20 Subject: [PATCH] Claire, Erick Bocanegra 21-02-18 --- diff --git a/schainpy/model/data/jrodata.py b/schainpy/model/data/jrodata.py index 73bf497..62752c5 100644 --- a/schainpy/model/data/jrodata.py +++ b/schainpy/model/data/jrodata.py @@ -636,7 +636,9 @@ class Spectra(JROData): return freqrange def getVelRange(self, extrapoints=0): - + + print 'VELMAX', self.getVmax() + asdasdasd deltav = self.getVmax() / (self.nFFTPoints*self.ippFactor) velrange = deltav*(numpy.arange(self.nFFTPoints+extrapoints)-self.nFFTPoints/2.) #- deltav/2 diff --git a/schainpy/model/data/jroheaderIO.py b/schainpy/model/data/jroheaderIO.py index c03853d..2c28627 100644 --- a/schainpy/model/data/jroheaderIO.py +++ b/schainpy/model/data/jroheaderIO.py @@ -411,7 +411,7 @@ class RadarControllerHeader(Header): code1 = (self.code + 1.0)/2. for ic in range(self.nCode): - tempx = numpy.zeros(numpy.ceil(self.nBaud/32.)) + tempx = numpy.zeros(int(numpy.ceil(self.nBaud/32.))) start = 0 end = 32 for i in range(len(tempx)): diff --git a/schainpy/model/graphics/jroplot_parameters.py b/schainpy/model/graphics/jroplot_parameters.py index 8365cb7..2691d40 100644 --- a/schainpy/model/graphics/jroplot_parameters.py +++ b/schainpy/model/graphics/jroplot_parameters.py @@ -658,7 +658,7 @@ class WindProfilerPlot(Figure): # tmax = None x = dataOut.getTimeRange1(dataOut.paramInterval) - y = dataOut.heightList + y = dataOut.heightList z = dataOut.data_output.copy() nplots = z.shape[0] #Number of wind dimensions estimated nplotsw = nplots @@ -743,6 +743,11 @@ class WindProfilerPlot(Figure): axes = self.axesList[i*self.__nsubplots] z1 = z[i,:].reshape((1,-1))*windFactor[i] + + print 'x', x + print datetime.datetime.utcfromtimestamp(x[0]) + print datetime.datetime.utcfromtimestamp(x[1]) + #z1=numpy.ma.masked_where(z1==0.,z1) axes.pcolorbuffer(x, y, z1, diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index 95eabb5..a16916d 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -128,6 +128,8 @@ class SpectraPlot(Figure): factor = normFactor if xaxis == "frequency": x = dataOut.getFreqRange(1)/1000. + print 'FRECUENCIA MAXIMA', numpy.amax(x) + asfasfasdfaf print '#######################################################' print 'xlen', len(x) print x diff --git a/schainpy/model/graphics/mpldriver.py b/schainpy/model/graphics/mpldriver.py index 65b77f9..a8076ec 100644 --- a/schainpy/model/graphics/mpldriver.py +++ b/schainpy/model/graphics/mpldriver.py @@ -176,7 +176,7 @@ def set_linedata(ax, x, y, idline): def pline(iplot, x, y, xlabel='', ylabel='', title=''): - ax = iplot.get_axes() + ax = iplot.axes printLabels(ax, xlabel, ylabel, title) @@ -253,7 +253,7 @@ def pcolor(imesh, z, xlabel='', ylabel='', title=''): cmap.set_bad('white',1.) z = z.T - ax = imesh.get_axes() + ax = imesh.axes printLabels(ax, xlabel, ylabel, title) imesh.set_array(z.ravel()) ax.grid(True) @@ -340,7 +340,7 @@ def createPmultiline(ax, x, y, xmin, xmax, ymin, ymax, xlabel='', ylabel='', tit def pmultiline(iplot, x, y, xlabel='', ylabel='', title=''): - ax = iplot.get_axes() + ax = iplot.axes printLabels(ax, xlabel, ylabel, title) @@ -417,7 +417,7 @@ def createPmultilineYAxis(ax, x, y, xmin, xmax, ymin, ymax, xlabel='', ylabel='' def pmultilineyaxis(iplot, x, y, xlabel='', ylabel='', title=''): - ax = iplot.get_axes() + ax = iplot.axes printLabels(ax, xlabel, ylabel, title) for i in range(len(ax.lines)): @@ -462,7 +462,7 @@ def createPolar(ax, x, y, def polar(iplot, x, y, xlabel='', ylabel='', title=''): - ax = iplot.get_axes() + ax = iplot.axes # ax.text(0, -110, ylabel, rotation='vertical', va ='center', ha = 'center',size='11') printLabels(ax, xlabel, ylabel, title) diff --git a/schainpy/model/io/jroIO_param.py b/schainpy/model/io/jroIO_param.py index dadfeb8..862be2c 100644 --- a/schainpy/model/io/jroIO_param.py +++ b/schainpy/model/io/jroIO_param.py @@ -791,6 +791,7 @@ class ParamWriter(Operation): grp.create_dataset('array dimensions', data = self.tableDim, dtype = self.dtype) for i in range(len(self.metadataList)): + print '#####',self.metadataList[i], getattr(self.dataOut, self.metadataList[i]) grp.create_dataset(self.metadataList[i], data=getattr(self.dataOut, self.metadataList[i])) return diff --git a/schainpy/model/proc/jroproc_parameters.py b/schainpy/model/proc/jroproc_parameters.py index a343523..76cde9a 100644 --- a/schainpy/model/proc/jroproc_parameters.py +++ b/schainpy/model/proc/jroproc_parameters.py @@ -626,8 +626,8 @@ class PrecipitationProc(Operation): ''' ============================= ''' SPCmean = numpy.mean(self.spc,0) - ETA = numpy.zeros(self.Num_Hei) - Pr = numpy.sum(SPCmean,0) + ETA = numpy.zeros(self.Num_Hei,self.Num_Bin) + Pr = self.spc[0,:,:] VelMeteoro = numpy.mean(SPCmean,axis=0) print '==================== Vel SHAPE',VelMeteoro @@ -640,7 +640,7 @@ class PrecipitationProc(Operation): for R in range(self.Num_Hei): - ETA[R] = RadarConstant * Pr[R] * R**2 #Reflectivity (ETA) + ETA[:,R] = RadarConstant * Pr[:,R] * R**2 #Reflectivity (ETA) h = R + Altitude #Range from ground to radar pulse altitude del_V[R] = 1 + 3.68 * 10**-5 * h + 1.71 * 10**-9 * h**2 #Density change correction for velocity @@ -1195,36 +1195,36 @@ class FullSpectralAnalysis(Operation): FitGaussCSPC = numpy.array([FitGauss01,FitGauss02,FitGauss12]) - ''' Ploteo por altura ''' - if Height == 28: - for i in range(3): - #print 'FASE', numpy.shape(phase), y[25] - #print numpy.shape(coherence) - fig = plt.figure(10+self.indice) - #plt.plot( x[0:256],coherence[:,25] ) - #cohAv = numpy.average(coherence[i],1) - Pendiente = FrecRange * PhaseSlope[i] - plt.plot( FrecRange, Pendiente) - plt.plot( xFrec,phase[i]) - - CSPCmean = numpy.mean(numpy.abs(CSPCSamples),0) - #plt.plot(xFrec, FitGauss01) - #plt.plot(xFrec, CSPCmean) - #plt.plot(xFrec, numpy.abs(CSPCSamples[0])) - #plt.plot(xFrec, FitGauss) - #plt.plot(xFrec, yMean) - #plt.plot(xFrec, numpy.abs(coherence[0])) - - #plt.axis([-12, 12, 15, 50]) - #plt.title("%s" %( '%s %s, Channel %s'%(thisDatetime.strftime("%Y/%m/%d"),thisDatetime.strftime("%H:%M:%S") , i))) - plt.ylabel('Desfase [rad]') - #plt.ylabel('CSPC normalizado') - plt.xlabel('Frec range [Hz]') +# ''' Ploteo por altura ''' +# if Height == 28: +# for i in range(3): +# #print 'FASE', numpy.shape(phase), y[25] +# #print numpy.shape(coherence) +# fig = plt.figure(10+self.indice) +# #plt.plot( x[0:256],coherence[:,25] ) +# #cohAv = numpy.average(coherence[i],1) +# Pendiente = FrecRange * PhaseSlope[i] +# plt.plot( FrecRange, Pendiente) +# plt.plot( xFrec,phase[i]) +# +# CSPCmean = numpy.mean(numpy.abs(CSPCSamples),0) +# #plt.plot(xFrec, FitGauss01) +# #plt.plot(xFrec, CSPCmean) +# #plt.plot(xFrec, numpy.abs(CSPCSamples[0])) +# #plt.plot(xFrec, FitGauss) +# #plt.plot(xFrec, yMean) +# #plt.plot(xFrec, numpy.abs(coherence[0])) +# +# #plt.axis([-12, 12, 15, 50]) +# #plt.title("%s" %( '%s %s, Channel %s'%(thisDatetime.strftime("%Y/%m/%d"),thisDatetime.strftime("%H:%M:%S") , i))) +# plt.ylabel('Desfase [rad]') +# #plt.ylabel('CSPC normalizado') +# plt.xlabel('Frec range [Hz]') #fig.savefig('/home/erick/Documents/Pics/to{}.png'.format(self.indice)) - plt.show() - self.indice=self.indice+1 +# plt.show() +# self.indice=self.indice+1 diff --git a/schainpy/model/proc/jroproc_spectra.py b/schainpy/model/proc/jroproc_spectra.py index 88742bf..2154351 100644 --- a/schainpy/model/proc/jroproc_spectra.py +++ b/schainpy/model/proc/jroproc_spectra.py @@ -72,6 +72,7 @@ class SpectraProc(ProcessingUnit): self.dataOut.flagNoData """ fft_volt = numpy.fft.fft(self.buffer,n=self.dataOut.nFFTPoints,axis=1) + fft_volt = fft_volt.astype(numpy.dtype('complex')) dc = fft_volt[:,0,:] @@ -138,6 +139,7 @@ class SpectraProc(ProcessingUnit): if self.dataIn.flagDataAsBlock: #data dimension: [nChannels, nProfiles, nSamples] + nVoltProfiles = self.dataIn.data.shape[1] # nVoltProfiles = self.dataIn.nProfiles @@ -160,6 +162,8 @@ class SpectraProc(ProcessingUnit): self.dataOut.flagNoData = True return 0 else: + print 'DATA shape', self.dataIn.data.shape + sadsdf self.buffer[:,self.profIndex,:] = self.dataIn.data.copy() self.profIndex += 1 diff --git a/schainpy/scripts/WindProfiler_SA01.py b/schainpy/scripts/WindProfiler_SA01.py index 9234f96..7d13632 100644 --- a/schainpy/scripts/WindProfiler_SA01.py +++ b/schainpy/scripts/WindProfiler_SA01.py @@ -29,7 +29,7 @@ startTime = '15:30:00' filehdf5 = "SA_2014050.hdf5" #2014051 20 Feb 2014 -# path = '/home/soporte/Data/MST/SA/d2014051' +path = '/media/erick/6F60F7113095A154/CLAIRE/CLAIRE_WINDS_2MHZ/DATA/' #'/home/soporte/Data/MST/SA/d2014051' # pathFigure = '/home/soporte/workspace/Graficos/SA/new/' # xmin = '0.0' # xmax = '8.0' @@ -38,15 +38,15 @@ filehdf5 = "SA_2014050.hdf5" readUnitConfObj = controllerObj.addReadUnit(datatype='VoltageReader', path=path, - startDate='2014/01/01', - endDate='2014/03/31', - startTime=startTime, - endTime='23:59:59', + startDate='2017/08/22', + endDate='2018/08/22', + startTime='00:00:00', + endTime='6:00:59', online=0, delay=5, - walk=0, - getblock=1, - blocksize=32768) + walk=1) + #getblock=1, + #blocksize=32768) opObj11 = readUnitConfObj.addOperation(name='printNumberOfBlock') @@ -59,7 +59,7 @@ opObj11 = procUnitConfObj0.addOperation(name='Decoder', optype='other') opObj11 = procUnitConfObj0.addOperation(name='CohInt', optype='other') # opObj11.addParameter(name='n', value='600', format='int') -opObj11.addParameter(name='n', value='256', format='int') +opObj11.addParameter(name='n', value='4', format='int') opObj11 = procUnitConfObj0.addOperation(name='selectHeightsByIndex') opObj11.addParameter(name='minIndex', value='10', format='float') @@ -67,7 +67,8 @@ opObj11.addParameter(name='maxIndex', value='60', format='float') #--------------------------------------------------------------------------------------------------- procUnitConfObj1 = controllerObj.addProcUnit(datatype='CorrelationProc', inputId=procUnitConfObj0.getId()) procUnitConfObj1.addParameter(name='pairsList', value='(0,0),(1,1),(2,2),(3,3),(1,0),(2,3)', format='pairsList') -# procUnitConfObj1.addParameter(name='removeDC', value='1', format='bool') + +#procUnitConfObj1.addParameter(name='removeDC', value='1', format='bool') # #procUnitConfObj1.addParameter(name='lagT', value='0,1,2,3', format='intlist') # # opObj12 = procUnitConfObj1.addOperation(name='CorrelationPlot', optype='other') @@ -98,24 +99,24 @@ opObj20 = procUnitConfObj2.addOperation(name='SALags', optype='other') opObj21 = procUnitConfObj2.addOperation(name='WindProfiler', optype='other') opObj21.addParameter(name='technique', value='SA', format='str') # # opObj21.addParameter(name='correctFactor', value='-1', format='float') -opObj21.addParameter(name='positionX', value='36,0,36,0', format='floatlist') -opObj21.addParameter(name='positionY', value='36,0,0,36', format='floatlist') -opObj21.addParameter(name='azimuth', value='51.06', format='float') - -# opObj22 = procUnitConfObj2.addOperation(name='WindProfilerPlot', optype='other') -# opObj22.addParameter(name='id', value='4', format='int') -# opObj22.addParameter(name='wintitle', value='Wind Profiler', format='str') -# opObj22.addParameter(name='save', value='1', format='bool') -# opObj22.addParameter(name='figpath', value = pathFigure, format='str') -# opObj22.addParameter(name='zmin', value='-15', format='int') -# opObj22.addParameter(name='zmax', value='15', format='int') -# opObj22.addParameter(name='zmin_ver', value='-80', format='float') -# opObj22.addParameter(name='zmax_ver', value='80', format='float') -# opObj22.addParameter(name='SNRmin', value='-20', format='int') -# opObj22.addParameter(name='SNRmax', value='40', format='int') -# opObj22.addParameter(name='SNRthresh', value='-3.5', format='float') -# opObj22.addParameter(name='xmin', value=xmin, format='float') -# opObj22.addParameter(name='xmax', value=xmax, format='float') +opObj21.addParameter(name='positionX', value='1.5,0,1.5', format='floatlist') +opObj21.addParameter(name='positionY', value='0.875,0,-0.875', format='floatlist') +opObj21.addParameter(name='azimuth', value='0.0', format='float') + +opObj22 = procUnitConfObj2.addOperation(name='WindProfilerPlot', optype='other') +opObj22.addParameter(name='id', value='4', format='int') +opObj22.addParameter(name='wintitle', value='Wind Profiler', format='str') +#opObj22.addParameter(name='save', value='1', format='bool') +#opObj22.addParameter(name='figpath', value = pathFigure, format='str') +opObj22.addParameter(name='zmin', value='-15', format='int') +opObj22.addParameter(name='zmax', value='15', format='int') +opObj22.addParameter(name='zmin_ver', value='-80', format='float') +opObj22.addParameter(name='zmax_ver', value='80', format='float') +opObj22.addParameter(name='SNRmin', value='-20', format='int') +opObj22.addParameter(name='SNRmax', value='40', format='int') +opObj22.addParameter(name='SNRthresh', value='-3.5', format='float') +opObj22.addParameter(name='xmin', value=xmin, format='float') +opObj22.addParameter(name='xmax', value=xmax, format='float') #----------------------------------------------------------------------------------- @@ -126,4 +127,4 @@ controllerObj.readXml(filename) controllerObj.createObjects() controllerObj.connectObjects() -controllerObj.run() \ No newline at end of file +controllerObj.run() diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index 7e5c5a4..8979c10 100644 --- a/schainpy/scripts/schain.xml +++ b/schainpy/scripts/schain.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/schainpy/scripts/testBLTR_block.py b/schainpy/scripts/testBLTR_block.py index cc7a32b..e95f64c 100644 --- a/schainpy/scripts/testBLTR_block.py +++ b/schainpy/scripts/testBLTR_block.py @@ -15,7 +15,7 @@ from schainpy.controller import Project filename = 'test1.xml' # path = '/home/jespinoza/workspace/data/bltr/' -path = '/media/erick/6F60F7113095A154/BLTR/' +path = '/home/erick/Documents/Data/BLTR_Data/sswma/'#'/media/erick/6F60F7113095A154/BLTR/' desc = "read bltr data sswma file" figpath = '/media/erick/6F60F7113095A154/BLTR/' pathhdf5 = '/tmp/' @@ -23,128 +23,28 @@ pathhdf5 = '/tmp/' controllerObj = Project() controllerObj.setup(id = '191', name='test1', description=desc) -readUnitConfObj = controllerObj.addReadUnit(datatype='testBLTRReader', +readUnitConfObj = controllerObj.addReadUnit(datatype='BLTRParamReader', path=path, startDate='2017/01/17', endDate='2018/01/01', - startTime='00:00:00', + startTime='06:00:00', endTime='23:59:59', - ext='sswma') + verbose=0, + ) -procUnitConfObj1 = controllerObj.addProcUnit(datatype='BLTRProcess', +procUnitConfObj1 = controllerObj.addProcUnit(datatype='BLTRParametersProc', inputId=readUnitConfObj.getId()) + +procUnitConfObj1.addParameter(name='mode', value='1', format='int') +# procUnitConfObj1.addParameter(name='snr_threshold', value='10', format='float') -'''-------------------------------------------Processing--------------------------------------------''' - -'''MODE 1: LOW ATMOSPHERE: 0- 3 km''' -# opObj10 = procUnitConfObj1.addOperation(name='SnrFilter') -# opObj10.addParameter(name='snr_val', value='-10', format='float') -# opObj10.addParameter(name='modetofilter', value='1', format='int') -# -# opObj10 = procUnitConfObj1.addOperation(name='OutliersFilter') -# opObj10.addParameter(name='svalue', value='meridional', format='str') -# opObj10.addParameter(name='svalue2', value='inTime', format='str') -# opObj10.addParameter(name='method', value='0', format='float') -# opObj10.addParameter(name='factor', value='1', format='float') -# opObj10.addParameter(name='filter', value='0', format='float') -# opObj10.addParameter(name='npoints', value='5', format='float') -# opObj10.addParameter(name='modetofilter', value='1', format='int') -# # -# opObj10 = procUnitConfObj1.addOperation(name='OutliersFilter') -# opObj10.addParameter(name='svalue', value='zonal', format='str') -# opObj10.addParameter(name='svalue2', value='inTime', format='str') -# opObj10.addParameter(name='method', value='0', format='float') -# opObj10.addParameter(name='factor', value='1', format='float') -# opObj10.addParameter(name='filter', value='0', format='float') -# opObj10.addParameter(name='npoints', value='5', format='float') -# opObj10.addParameter(name='modetofilter', value='1', format='int') -# # -# opObj10 = procUnitConfObj1.addOperation(name='OutliersFilter') -# opObj10.addParameter(name='svalue', value='vertical', format='str') -# opObj10.addParameter(name='svalue2', value='inHeight', format='str') -# opObj10.addParameter(name='method', value='0', format='float') -# opObj10.addParameter(name='factor', value='2', format='float') -# opObj10.addParameter(name='filter', value='0', format='float') -# opObj10.addParameter(name='npoints', value='9', format='float') -# opObj10.addParameter(name='modetofilter', value='1', format='int') -# - -''' MODE 2: 0 - 10 km ''' - -opObj10 = procUnitConfObj1.addOperation(name='SnrFilter') -opObj10.addParameter(name='snr_val', value='-20', format='float') -opObj10.addParameter(name='modetofilter', value='2', format='int') - -opObj10 = procUnitConfObj1.addOperation(name='OutliersFilter') -opObj10.addParameter(name='svalue', value='meridional', format='str') -opObj10.addParameter(name='svalue2', value='inTime', format='str') -opObj10.addParameter(name='method', value='0', format='float') -opObj10.addParameter(name='factor', value='2', format='float') -opObj10.addParameter(name='filter', value='0', format='float') -opObj10.addParameter(name='npoints', value='9', format='float') -opObj10.addParameter(name='modetofilter', value='2', format='int') -# # -opObj10 = procUnitConfObj1.addOperation(name='OutliersFilter') -opObj10.addParameter(name='svalue', value='zonal', format='str') -opObj10.addParameter(name='svalue2', value='inTime', format='str') -opObj10.addParameter(name='method', value='0', format='float') -opObj10.addParameter(name='factor', value='2', format='float') -opObj10.addParameter(name='filter', value='0', format='float') -opObj10.addParameter(name='npoints', value='9', format='float') -opObj10.addParameter(name='modetofilter', value='2', format='int') -# # -opObj10 = procUnitConfObj1.addOperation(name='OutliersFilter') -opObj10.addParameter(name='svalue', value='vertical', format='str') -opObj10.addParameter(name='svalue2', value='inHeight', format='str') -opObj10.addParameter(name='method', value='0', format='float') -opObj10.addParameter(name='factor', value='2', format='float') -opObj10.addParameter(name='filter', value='0', format='float') -opObj10.addParameter(name='npoints', value='9', format='float') -opObj10.addParameter(name='modetofilter', value='2', format='int') - -# '''-----------------------------------------Writing-------------------------------------------''' -# -# # opObj10 = procUnitConfObj1.addOperation(name='testBLTRWriter',optype='other') -# # opObj10.addParameter(name='path', value = pathhdf5) -# # opObj10.addParameter(name='modetowrite', value = '2',format='int') -# # -# # opObj10 = procUnitConfObj1.addOperation(name='testBLTRWriter',optype='other') -# # opObj10.addParameter(name='path', value = pathhdf5) -# # opObj10.addParameter(name='modetowrite', value = '1',format='int') -# -# '''----------------------------------------Plotting--------------------------------------------''' -# -opObj10 = procUnitConfObj1.addOperation(name='prePlot') -opObj10.addParameter(name='modeselect',value='1',format='int') -# # -opObj10 = procUnitConfObj1.addOperation(name='WindProfilerPlot', optype='other') -opObj10.addParameter(name='id', value='1', format='int') -opObj10.addParameter(name='wintitle', value='', format='str') -opObj10.addParameter(name='channelList', value='0', format='intlist') -#opObj10.addParameter(name='save', value='1', format='bool') -#opObj10.addParameter(name='figpath', value=figpath, format='str') -opObj10.addParameter(name='SNRmin', value='-10', format='int') -opObj10.addParameter(name='SNRmax', value='50', format='int') -opObj10.addParameter(name='SNRthresh', value='0', format='float') -opObj10.addParameter(name='xmin', value='0', format='float') -opObj10.addParameter(name='xmax', value='24', format='float') -opObj10.addParameter(name='ymax', value='3', format='float') -opObj10.addParameter(name='zmin', value='-20', format='float') -opObj10.addParameter(name='zmax', value='20', format='float') -opObj10.addParameter(name='zmin_ver', value='-200', format='float') -opObj10.addParameter(name='zmax_ver', value='200', format='float') -#opObj10.addParameter(name='showprofile', value='1', format='bool') -#opObj10.addParameter(name='show', value='1', format='bool') - -opObj10 = procUnitConfObj1.addOperation(name='prePlot') -opObj10.addParameter(name='modeselect',value='2',format='int') -# + opObj10 = procUnitConfObj1.addOperation(name='WindProfilerPlot', optype='other') opObj10.addParameter(name='id', value='2', format='int') opObj10.addParameter(name='wintitle', value='', format='str') -#opObj10.addParameter(name='channelList', value='0', format='intlist') -opObj10.addParameter(name='save', value='1', format='bool') -opObj10.addParameter(name='figpath', value=figpath, format='str') + +# opObj10.addParameter(name='save', value='1', format='bool') +# opObj10.addParameter(name='figpath', value=figpath, format='str') opObj10.addParameter(name='SNRmin', value='-20', format='int') opObj10.addParameter(name='SNRmax', value='40', format='int') opObj10.addParameter(name='SNRthresh', value='0', format='float') @@ -159,13 +59,5 @@ opObj10.addParameter(name='zmax_ver', value='200', format='float') #opObj10.addParameter(name='showprofile', value='1', format='bool') #opObj10.addParameter(name='show', value='1', format='bool') -# # print "Escribiendo el archivo XML" -# controllerObj.writeXml(filename) -# # print "Leyendo el archivo XML" -# controllerObj.readXml(filename) - -# controllerObj.createObjects() -# controllerObj.connectObjects() -# controllerObj.run() controllerObj.start() diff --git a/schainpy/scripts/testProcBLTR.py b/schainpy/scripts/testProcBLTR.py index 930019d..34ffffb 100644 --- a/schainpy/scripts/testProcBLTR.py +++ b/schainpy/scripts/testProcBLTR.py @@ -20,9 +20,9 @@ controllerObj = Project() controllerObj.setup(id='191', name='test01', description=desc) -readUnitConfObj = controllerObj.addReadUnit(datatype='BLTRReader', - path='/media/erick/6F60F7113095A154/BLTR/', - +readUnitConfObj = controllerObj.addReadUnit(datatype='BLTRSpectraReader', + #path='/media/erick/6F60F7113095A154/BLTR/', + path='/home/erick/Documents/Data/BLTR_Data/fdt/', endDate='2017/10/19', startTime='13:00:00', startDate='2016/11/8', @@ -39,11 +39,11 @@ readUnitConfObj = controllerObj.addReadUnit(datatype='BLTRReader', procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId()) - opObj11 = procUnitConfObj1.addOperation(name='IncohInt', optype='other') -opObj11.addParameter(name='n', value='3', format='float') +opObj11.addParameter(name='n', value='2', format='float') opObj10 = procUnitConfObj1.addOperation(name='removeDC') +#opObj10 = procUnitConfObj1.addOperation(name='removeInterference2') # opObj10 = procUnitConfObj1.addOperation(name='calcMag') @@ -101,8 +101,8 @@ opObj11.addParameter(name='xaxis', value='Velocity', format='str') procUnitConfObj2 = controllerObj.addProcUnit(datatype='Parameters', inputId=procUnitConfObj1.getId()) opObj11 = procUnitConfObj2.addOperation(name='SpectralMoments', optype='other') opObj22 = procUnitConfObj2.addOperation(name='FullSpectralAnalysis', optype='other') -opObj22.addParameter(name='SNRlimit', value='-4', format='float') -# +opObj22.addParameter(name='SNRlimit', value='7', format='float') + opObj22 = procUnitConfObj2.addOperation(name='WindProfilerPlot', optype='other') opObj22.addParameter(name='id', value='4', format='int') opObj22.addParameter(name='wintitle', value='Wind Profiler', format='str') @@ -111,8 +111,8 @@ opObj22.addParameter(name='save', value='1', format='bool') opObj22.addParameter(name='zmin', value='-20', format='int') opObj22.addParameter(name='zmax', value='20', format='int') -opObj22.addParameter(name='zmin_ver', value='-250', format='float') -opObj22.addParameter(name='zmax_ver', value='250', format='float') +opObj22.addParameter(name='zmin_ver', value='-300', format='float') +opObj22.addParameter(name='zmax_ver', value='300', format='float') opObj22.addParameter(name='SNRmin', value='-5', format='int') opObj22.addParameter(name='SNRmax', value='30', format='int') # opObj22.addParameter(name='SNRthresh', value='-3.5', format='float') diff --git a/schainpy/scripts/testProcData.py b/schainpy/scripts/testProcData.py index 3b04842..d36d86c 100644 --- a/schainpy/scripts/testProcData.py +++ b/schainpy/scripts/testProcData.py @@ -17,14 +17,22 @@ def main(): controllerObj.setup(id = '191', name='test01', description=desc) readUnitConfObj = controllerObj.addReadUnit(datatype='Spectra', - path='/home/erick/Documents/Data/d2015106', - startDate='2010/12/18', - endDate='2017/12/22', - startTime='00:00:00', - endTime='23:59:59', + path='/media/erick/6F60F7113095A154/CLAIRE/CLAIRE_WINDS_2MHZ/DATA/pdata', + #path='/home/erick/Documents/Data/Claire_Data/raw', + startDate='2017/07/20', + endDate='2017/07/26', + startTime='10:02:00', + endTime='10:11:00', online=0, - walk=0, - expLabel='') + walk=1) +# path='/home/erick/Documents/Data/d2015106', +# startDate='2010/12/18', +# endDate='2017/12/22', +# startTime='00:00:00', +# endTime='23:59:59', +# online=0, +# walk=0, +# expLabel='') procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId()) @@ -60,7 +68,7 @@ def main(): procUnitConfObj2 = controllerObj.addProcUnit(datatype='Parameters', inputId=readUnitConfObj.getId()) opObj11 = procUnitConfObj2.addOperation(name='GaussianFit', optype='other') - opObj11.addParameter(name='vel_arr', value='32,0,0,0', format='intList') + #opObj11.addParameter(name='vel_arr', value='32,0,0,0', format='intList') opObj11.addParameter(name='SNRlimit', value='-3', format='int') #opObj12 = procUnitConfObj2.addOperation(name='ParametersPlot', optype='other') diff --git a/schainpy/scripts/testRawData.py b/schainpy/scripts/testRawData.py index 2359277..c8ee5f2 100644 --- a/schainpy/scripts/testRawData.py +++ b/schainpy/scripts/testRawData.py @@ -7,87 +7,232 @@ if __name__ == '__main__': desc = "Segundo Test" filename = "schain.xml" + pathW='/media/erick/6F60F7113095A154/CLAIRE/CLAIRE_WINDS_2MHZ/DATA/pdatatest/test1024' + figpath = '/media/erick/6F60F7113095A154/CLAIRE/CLAIRE_WINDS_2MHZ/Images/test1024' + controllerObj = Project() - controllerObj.setup(id = '191', name='test01', description=desc) + controllerObj.setup(id='191', name='test01', description=desc) readUnitConfObj = controllerObj.addReadUnit(datatype='VoltageReader', - path='/Volumes/SOUSY/', - startDate='2014/10/28', - endDate='2014/10/28', - startTime='15:40:00', - endTime='16:20:00', + path='/media/erick/6F60F7113095A154/CLAIRE/CLAIRE_WINDS_2MHZ/DATA/', + #path='/home/erick/Documents/Data/Claire_Data/raw', + startDate='2017/08/22', + endDate='2017/08/22', + startTime='01:00:00', + endTime='06:00:00', online=0, walk=1) + opObj00 = readUnitConfObj.addOperation(name='printInfo') +# +# procUnitConfObj0 = controllerObj.addProcUnit(datatype='VoltageProc', +# inputId=readUnitConfObj.getId()) +# +# opObj10 = procUnitConfObj0.addOperation(name='selectHeights') +# opObj10.addParameter(name='minHei', value='0', format='float') +# opObj10.addParameter(name='maxHei', value='8', format='float') +# +# opObj10 = procUnitConfObj0.addOperation(name='filterByHeights') +# opObj10.addParameter(name='window', value='2', format='float') +# +# opObj10 = procUnitConfObj0.addOperation(name='Decoder', optype='external') +# opObj10.addParameter(name='code', value='1,-1', format='intlist') +# opObj10.addParameter(name='nCode', value='2', format='float') +# opObj10.addParameter(name='nBaud', value='1', format='float') +# +# +# opObj10 = procUnitConfObj0.addOperation(name='CohInt', optype='external') +# opObj10.addParameter(name='n', value='1296', format='float') + opObj00 = readUnitConfObj.addOperation(name='printNumberOfBlock') procUnitConfObj0 = controllerObj.addProcUnit(datatype='VoltageProc', inputId=readUnitConfObj.getId()) - - opObj10 = procUnitConfObj0.addOperation(name='selectHeights') - opObj10.addParameter(name='minHei', value='0', format='float') - opObj10.addParameter(name='maxHei', value='8', format='float') - - opObj10 = procUnitConfObj0.addOperation(name='filterByHeights') - opObj10.addParameter(name='window', value='2', format='float') - opObj10 = procUnitConfObj0.addOperation(name='Decoder', optype='external') - opObj10.addParameter(name='code', value='1,-1', format='intlist') - opObj10.addParameter(name='nCode', value='2', format='float') - opObj10.addParameter(name='nBaud', value='1', format='float') - - - opObj10 = procUnitConfObj0.addOperation(name='CohInt', optype='external') - opObj10.addParameter(name='n', value='1296', format='float') + opObj10 = procUnitConfObj0.addOperation(name='setRadarFrequency') + opObj10.addParameter(name='frequency', value='445.09e6', format='float') + + #opObj10 = procUnitConfObj0.addOperation(name='CohInt', optype='external') + #opObj10.addParameter(name='n', value='1', format='float') + + #opObj10 = procUnitConfObj0.addOperation(name='selectHeights') + #opObj10.addParameter(name='minHei', value='1', format='float') + #opObj10.addParameter(name='maxHei', value='15', format='float') + + #opObj10 = procUnitConfObj0.addOperation(name='selectFFTs') + #opObj10.addParameter(name='minHei', value='', format='float') + #opObj10.addParameter(name='maxHei', value='', format='float') + procUnitConfObj1 = controllerObj.addProcUnit(datatype='SpectraProc', inputId=procUnitConfObj0.getId()) - #Creating a processing object with its parameters - #schainpy.model.proc.jroproc_spectra.SpectraProc.run() - #If you need to add more parameters can use the "addParameter method" - procUnitConfObj1.addParameter(name='nFFTPoints', value='128', format='int') - - opObj10 = procUnitConfObj1.addOperation(name='IncohInt', optype='external') - opObj10.addParameter(name='n', value='2', format='float') + # Creating a processing object with its parameters + # schainpy.model.proc.jroproc_spectra.SpectraProc.run() + # If you need to add more parameters can use the "addParameter method" + procUnitConfObj1.addParameter(name='nFFTPoints', value='1024', format='int') + + + opObj10 = procUnitConfObj1.addOperation(name='removeDC') + #opObj10 = procUnitConfObj1.addOperation(name='removeInterference') + #opObj10 = procUnitConfObj1.addOperation(name='IncohInt', optype='external') + #opObj10.addParameter(name='n', value='30', format='float') - #Using internal methods - #schainpy.model.proc.jroproc_spectra.SpectraProc.selectChannels() + + + #opObj10 = procUnitConfObj1.addOperation(name='selectFFTs') + #opObj10.addParameter(name='minFFT', value='-15', format='float') + #opObj10.addParameter(name='maxFFT', value='15', format='float') + + + + opObj10 = procUnitConfObj1.addOperation(name='SpectraWriter', optype='other') + opObj10.addParameter(name='blocksPerFile', value='64', format = 'int') + opObj10.addParameter(name='path', value=pathW) + # Using internal methods + # schainpy.model.proc.jroproc_spectra.SpectraProc.selectChannels() # opObj10 = procUnitConfObj1.addOperation(name='selectChannels') # opObj10.addParameter(name='channelList', value='0,1', format='intlist') - #Using internal methods - #schainpy.model.proc.jroproc_spectra.SpectraProc.selectHeights() + # Using internal methods + # schainpy.model.proc.jroproc_spectra.SpectraProc.selectHeights() # opObj10 = procUnitConfObj1.addOperation(name='selectHeights') # opObj10.addParameter(name='minHei', value='90', format='float') # opObj10.addParameter(name='maxHei', value='180', format='float') - #Using external methods (new modules) + # Using external methods (new modules) # #schainpy.model.proc.jroproc_spectra.IncohInt.setup() # opObj12 = procUnitConfObj1.addOperation(name='IncohInt', optype='other') # opObj12.addParameter(name='n', value='1', format='int') - #Using external methods (new modules) - #schainpy.model.graphics.jroplot_spectra.SpectraPlot.setup() + # Using external methods (new modules) + # schainpy.model.graphics.jroplot_spectra.SpectraPlot.setup() opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='external') opObj11.addParameter(name='id', value='11', format='int') opObj11.addParameter(name='wintitle', value='SpectraPlot', format='str') - opObj11.addParameter(name='zmin', value='-60', format='int') - opObj11.addParameter(name='zmax', value='10', format='int') - opObj11.addParameter(name='save', value='1', format='int') + opObj11.addParameter(name='xaxis', value='velocity', format='str') + # opObj11.addParameter(name='xmin', value='-10', format='int') + # opObj11.addParameter(name='xmax', value='10', format='int') - #Using external methods (new modules) - #schainpy.model.graphics.jroplot_spectra.RTIPlot.setup() +# opObj11.addParameter(name='ymin', value='1', format='float') +# opObj11.addParameter(name='ymax', value='3', format='int') + #opObj11.addParameter(name='zmin', value='10', format='int') + #opObj11.addParameter(name='zmax', value='35', format='int') +# opObj11.addParameter(name='save', value='2', format='int') +# opObj11.addParameter(name='save', value='5', format='int') + # opObj11.addParameter(name='figpath', value=figpath, format='str') + + + opObj11 = procUnitConfObj1.addOperation(name='CrossSpectraPlot', optype='other') + procUnitConfObj1.addParameter(name='pairsList', value='(0,1),(0,2),(1,2)', format='pairsList') + opObj11.addParameter(name='id', value='2005', format='int') + #opObj11.addParameter(name='wintitle', value='CrossSpectraPlot_ShortPulse', format='str') + #opObj11.addParameter(name='exp_code', value='13', format='int') + opObj11.addParameter(name='xaxis', value='Velocity', format='str') + #opObj11.addParameter(name='xmin', value='-6', format='float') + #opObj11.addParameter(name='xmax', value='6', format='float') + opObj11.addParameter(name='zmin', value='15', format='float') + opObj11.addParameter(name='zmax', value='50', format='float') + opObj11.addParameter(name='ymin', value='0', format='float') + opObj11.addParameter(name='ymax', value='7', format='float') + #opObj11.addParameter(name='phase_min', value='-4', format='int') + #opObj11.addParameter(name='phase_max', value='4', format='int') +# + + # Using external methods (new modules) + # schainpy.model.graphics.jroplot_spectra.RTIPlot.setup() opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') opObj11.addParameter(name='id', value='30', format='int') opObj11.addParameter(name='wintitle', value='RTI', format='str') - opObj11.addParameter(name='zmin', value='-60', format='int') - opObj11.addParameter(name='zmax', value='-10', format='int') + opObj11.addParameter(name='zmin', value='15', format='int') + opObj11.addParameter(name='zmax', value='40', format='int') + opObj11.addParameter(name='ymin', value='1', format='int') + opObj11.addParameter(name='ymax', value='7', format='int') opObj11.addParameter(name='showprofile', value='1', format='int') # opObj11.addParameter(name='timerange', value=str(5*60*60*60), format='int') - opObj11.addParameter(name='xmin', value='14', format='float') - opObj11.addParameter(name='xmax', value='23.9', format='float') + opObj11.addParameter(name='xmin', value='1', format='float') + opObj11.addParameter(name='xmax', value='6', format='float') opObj11.addParameter(name='save', value='1', format='int') + + +# '''#########################################################################################''' +# +# +# procUnitConfObj2 = controllerObj.addProcUnit(datatype='Parameters', inputId=procUnitConfObj1.getId()) +# opObj11 = procUnitConfObj2.addOperation(name='SpectralMoments', optype='other') +# +# ''' +# # Discriminacion de ecos +# opObj11 = procUnitConfObj2.addOperation(name='GaussianFit', optype='other') +# opObj11.addParameter(name='SNRlimit', value='0', format='int') +# ''' +# +# ''' +# # Estimacion de Precipitacion +# opObj11 = procUnitConfObj2.addOperation(name='PrecipitationProc', optype='other') +# ''' +# +# opObj22 = procUnitConfObj2.addOperation(name='FullSpectralAnalysis', optype='other') +# +# opObj22.addParameter(name='SNRlimit', value='-10', format='float') +# opObj22.addParameter(name='E01', value='1.500', format='float') +# opObj22.addParameter(name='E02', value='1.500', format='float') +# opObj22.addParameter(name='E12', value='0', format='float') +# opObj22.addParameter(name='N01', value='0.875', format='float') +# opObj22.addParameter(name='N02', value='-0.875', format='float') +# opObj22.addParameter(name='N12', value='-1.750', format='float') +# +# +# opObj22 = procUnitConfObj2.addOperation(name='WindProfilerPlot', optype='other') +# opObj22.addParameter(name='id', value='4', format='int') +# opObj22.addParameter(name='wintitle', value='Wind Profiler', format='str') +# opObj22.addParameter(name='save', value='1', format='bool') +# opObj22.addParameter(name='xmin', value='0', format='float') +# opObj22.addParameter(name='xmax', value='6', format='float') +# opObj22.addParameter(name='ymin', value='1', format='float') +# opObj22.addParameter(name='ymax', value='3.5', format='float') +# opObj22.addParameter(name='zmin', value='-1', format='float') +# opObj22.addParameter(name='zmax', value='1', format='float') +# opObj22.addParameter(name='SNRmin', value='-15', format='float') +# opObj22.addParameter(name='SNRmax', value='20', format='float') +# opObj22.addParameter(name='zmin_ver', value='-200', format='float') +# opObj22.addParameter(name='zmax_ver', value='200', format='float') +# opObj22.addParameter(name='save', value='1', format='int') +# opObj22.addParameter(name='figpath', value=figpath, format='str') +# +# +# +# #opObj11.addParameter(name='zmin', value='75', format='int') +# +# #opObj12 = procUnitConfObj2.addOperation(name='ParametersPlot', optype='other') +# #opObj12.addParameter(name='id',value='4',format='int') +# #opObj12.addParameter(name='wintitle',value='First_gg',format='str') +# ''' +# #Ploteo de Discriminacion de Gaussianas +# +# opObj11 = procUnitConfObj2.addOperation(name='FitGauPlot', optype='other') +# opObj11.addParameter(name='id', value='21', format='int') +# opObj11.addParameter(name='wintitle', value='Rainfall Gaussian', format='str') +# opObj11.addParameter(name='xaxis', value='velocity', format='str') +# opObj11.addParameter(name='showprofile', value='1', format='int') +# opObj11.addParameter(name='zmin', value='75', format='int') +# opObj11.addParameter(name='zmax', value='100', format='int') +# opObj11.addParameter(name='GauSelector', value='1', format='int') +# #opObj11.addParameter(name='save', value='1', format='int') +# #opObj11.addParameter(name='figpath', value='/home/erick/Documents/Data/d2015106') +# +# opObj11 = procUnitConfObj2.addOperation(name='FitGauPlot', optype='other') +# opObj11.addParameter(name='id', value='22', format='int') +# opObj11.addParameter(name='wintitle', value='Wind Gaussian', format='str') +# opObj11.addParameter(name='xaxis', value='velocity', format='str') +# opObj11.addParameter(name='showprofile', value='1', format='int') +# opObj11.addParameter(name='zmin', value='75', format='int') +# opObj11.addParameter(name='zmax', value='100', format='int') +# opObj11.addParameter(name='GauSelector', value='0', format='int') +# ''' +# +# + controllerObj.start()