From f11c2da27e745aa9cf792b0cd1a9464e6eedf5bd 2017-09-07 16:18:45 From: ebocanegra Date: 2017-09-07 16:18:45 Subject: [PATCH] 07/09/2017 --- diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index e5b0d0d..47b644a 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -7,8 +7,11 @@ import os import datetime import numpy +import matplotlib.pyplot as plt + from figure import Figure, isRealtime, isTimeInHourRange from plotting_codes import * +from matplotlib.pyplot import savefig class SpectraPlot(Figure): @@ -39,6 +42,8 @@ class SpectraPlot(Figure): self.__xfilter_ena = False self.__yfilter_ena = False + + self.indice=1 def getSubplots(self): @@ -149,6 +154,27 @@ class SpectraPlot(Figure): thisDatetime = datetime.datetime.utcfromtimestamp(dataOut.getTimeRange()[0]) title = wintitle + " Spectra" + + + + print 'len de X',len(x), numpy.shape(x), 'len de spc line',len(dataOut.data_spc[1,:,15]), numpy.shape(dataOut.data_spc) + print 'Altura:', y[0], y[1], y[13], y[14], y[10] + #a=z[1,:,15] + +# fig = plt.figure(10+self.indice) +# plt.plot( x[0:128], zdB[0,:,10] ) +# plt.axis([-12, 12, 15, 50]) +# plt.title(" %s" %( '%s %s'%(thisDatetime.strftime("%Y/%m/%d"),thisDatetime.strftime("%H:%M:%S"))) ) +# plt.ylabel('Intensidad [dB]') +# plt.xlabel('Velocidad [m/s]') +# fig.savefig('/home/erick/Documents/Pics/to{}.png'.format(self.indice)) +# +# plt.show() +# +# self.indice=self.indice+1 + + + if ((dataOut.azimuth!=None) and (dataOut.zenith!=None)): title = title + '_' + 'azimuth,zenith=%2.2f,%2.2f'%(dataOut.azimuth, dataOut.zenith) @@ -217,6 +243,7 @@ class SpectraPlot(Figure): ftp=ftp, wr_period=wr_period, thisDatetime=thisDatetime) + class CrossSpectraPlot(Figure): @@ -244,6 +271,8 @@ class CrossSpectraPlot(Figure): self.EXP_CODE = None self.SUB_EXP_CODE = None self.PLOT_POS = None + + self.indice=0 def getSubplots(self): @@ -385,6 +414,7 @@ class CrossSpectraPlot(Figure): self.isConfig = True self.setWinTitle(title) + for i in range(self.nplots): pair = dataOut.pairsList[pairsIndexList[i]] @@ -413,6 +443,19 @@ class CrossSpectraPlot(Figure): coherence = numpy.abs(coherenceComplex) # phase = numpy.arctan(-1*coherenceComplex.imag/coherenceComplex.real)*180/numpy.pi phase = numpy.arctan2(coherenceComplex.imag, coherenceComplex.real)*180/numpy.pi + + +# print 'FASE', numpy.shape(phase), y[10] +# fig = plt.figure(10+self.indice) +# plt.plot( x[0:128],phase[:,10] ) +# #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 [grados]') +# plt.xlabel('Velocidad [m/s]') +# fig.savefig('/home/erick/Documents/Pics/to{}.png'.format(self.indice)) +# +# plt.show() +# self.indice=self.indice+1 title = "Coherence Ch%d * Ch%d" %(pair[0], pair[1]) axes0 = self.axesList[i*self.__nsubplots+2] diff --git a/schainpy/model/graphics/jroplot_spectra.pyc b/schainpy/model/graphics/jroplot_spectra.pyc index 23c18722e4f7fcef15be8a19847bcd3ba2173410..9ca4bf8a86c3823e275518c8449fb2de484b84cf 100644 GIT binary patch delta 9587 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 delta 9661 zc%02zdvILUc|T`Yd-Z;13J5rYhp9@W-iX<%oZrp2u>KHUeq`m#SX`LUM*g8 z+`(I8qsq%%sgrGLzUa)WtSmsW2v7(p1~iD#JXdoyij4qzeS-uY?}R63Zl4X!9PWEg)7Fa@i|cA?$tx{vs+DF_O0LVx(dw2;oI7N78;f+Zn)o~I#zPl7=8%0@F6>~D z4k~oAwKa>~EYi)Ux`bNN6qO5AnC2p9G?397$+#QHh#Sc~O)Rp3X>ws3nMTXe4;N`gwr;**h541u}BXpwJwN^*3GmYrpXSr zGOaJlw0`+&4nN_u%ikL@<9<+`M@r1N_>Lp)oGU28x|lTYVlPW!*7J@OX30l6z?G6& z+v4vztF-ObV-5J#3+L>^fLAd2Ho7h`{dFbN-p3+Ru68iY<0=-BiZ;L^Qhs)_NIBE4 zM!=kA3YP;Ob`Qor?S71lSIRv~kJJG_7Z+O^#F2_o@m9sA%2fSOTL8^su(e%WzvemK zE!M2v#5=|Iwa-;;LlcL{fWI_-B3kZ(2drrt^{lo7apo!hfk_QfMHrMKm{BY zFIU}FIEdm+fE&au)wN}vC=LL20y@M!)!UsTC|+$^PlsXr>QV8Z)k_MR!q14=nthy$ zXKNlED93Agr0JHL7n@5QR`>4Pe?(PC*a0U1T>vaeeMFq=^3>+YB0dscFF~;>oc<){ zSH_BJD>y$T_nK3^OgbE|9`pnK*mV8BgPmv!cr*seHD{!+7oT!D#i#7~s#=1|0&A;D zOcQmx)uF?OJ-dhY>{ZLqKpm$05hK}5kEk``P~FkZ81JW;`8o{G%XohBkIgKJmaYAw zpuV6I=5*VwPU-3LN++CZ1^6w7DCrhgmv0{fHB_*Yv%r z?V9t1$W3Zb?45>R<;xBFVoPIApR5tyipJXP^XZo?y-rC)wKzCfu#N(97rai9Mv=T5 z&@H~%x-B;z^P>D=XRf=C+$h@GnxjWpoT6bpq>iHgC?H@F;Z}eLa2uc&;025Ukl?8w zp!EPI0FwZ$Obr8W2HaxtzzS~~HR>G;t3Fgs1A>4Vz-*QvGkh4bd`R{os?P&H3^ItBaUs6f@u1@oS>Y6c&i8Yhc(1cnqPwg0x)0*DN0~|DJj-Mm zxUW72SYDi5ACkq_5Ix{vk~kRxRTiu3{yra2%mK+M*gQhs;Dj$pir{09IP8C0M42jd0reB5WIlhP&1fvJ5(yw@9CL44le zu{XAccoyY3*6%iy=UG5j`Dw7C_Rpw1Kjz}9{JtW!+wxg&?C~p}Q+U7d4%Eth-RoJC zW$*vUzuB=l$Wq@CcHCgy2AHNZH26!u|yxsa|)pp+kEB zdjb2bKu;1R@#IdoLIGJQUf=1A-oQ*wL!FXTiReShvb-RXplD{O67K`?tc60M#0q{g zP{4}pXYhIyzMJsrSm1U3X(NP)jjPot(!IYkgDzdIrU1tQ^JdJ@6hpr7q<7Y*A4J#~ z>Cf2Qv17iF`bE6A07ytxuN6IMQk5z1*@=Z2zOYowFpD>=&&a$gNx`h(I|WD;u&JA@ zh$bifEg+M4B}6HqTZugCdCL}LR?@d6%gYY|&JsPLVtHb5*VBbb$|ZL0uI(VEU6xik z{#6#Ajs0@>ySz*>ogLR8@y_1H98+utNo;lxUAu~$C!sGHrR8Dq;=XWpX>nk(pNu_q z&2Tnlaqf>R%S(XEN^FX(0WV8lGAfG$w)_`SexP%`r7M@@HR}1;%?DmpmX#RKA-5Ew zdk$TbCNaYlA&?mL0w7gajL7|xIcRsYpWL?BjN;(D?jJuM_T!uoml$!4TA!5kRPpD< z8MQ6?Wy_h^fQ@ZEO=L(75+Y-5QVE4nznbECLxK|8u#6%^S>^6C=8Ns!@A}opdk^aihqDV?Y+Z{>5)0QOsyV!93_jhGVX2?pHCkrpi z;@Q~aH)y;t>3}3Ej%;-i^%JQP44O`J1)mwSi*3Fe3o|7S({}ND-^FM~cC+|7&7Etl zesk)G4OW;ePwADCg&d*;=7iOU?cxg)8+dnY`lip@B^_Hl{d^BdTbACfIO91qk_dE4 zkKdQ-IXF_s!~(tvUr-Bp$9#dXvDtqU3rylOHTJav0qO-XO{>0 zCy#IEec~6#)k_)mmjU(Kl^LbJ3RoSB8Z0-i%%ZG0Go|ic<6K53cH#;h+vx@%)5)Hq zCb~RpN?9^%PI~3hA&ELomOn0!IxNAQ=!(?2*D_5Sf3UxheoXrO9)D2t%^TJ|o9d6$ z`#ytDOQw(9;`+K9h*);<-Qe9BiSGpyo`W;~urK-Wob6IiX3+hi&Ar(U(S~7{&uhKn?a*vGT`8MA8T)#8k*}e9SPbQhb3JJ=yS6HpZd7icKiPQL|Br?Uju%FX_T1L z&`XlK^~_Fs!#?!~sK?sq#z%sW4twv4f4luwz9c6%T1o?jy?^CHv-f_nH2;$$q4fn}jpXWC>hc>cVYUuaZ}q&jwP;ei}!n~v!EZ0U3KL`Nc#T8)f| zKSnohIl$tV=;4`wUo$dnhzV__V>9|>lAu&Yk&78ABe_12GG~<+k_6HiI?s{3SjX=b zl4m+eCnwJbE{({*dP-py{{b{QW&q`sDut9tYsN z9`*Nt_W*wY{1Nb{)DenOM}TswoW?@QhLRnS18@KoKrSGUCtVACC^Y0o==dZP!|)U1 zrMyV~C4TPY@oPwNZlN;v+Sw7s)i0m@pUG-AG5pY!_wp2uyoA{mOYl>uL+{iQ)LlS{ z@}^SGlJlmjD@o?4$26JCdNV+}_9HR%usiCvn1F4H#Av}6nh6`ZW~SqOhO;_ddyf%+ zJTe8@j|}8Ge^_5ZF(o^qtC2{xj3-m=5_O~nb2AXEluccO$7Q9`9ksrEUFkw0#doyd zOq%!elenK>m2k53oKB2-%b=f%alas19yu^gQM0UK(lM1129IHNBaM3*@GZc%0j~g_ zHZ4Q~755SSznV0?4T-Bi_~n$_$&yE19V8-IFCS{rN~)WrwNClGL45JiW*2=^f)utdIE-EfGRa{@FIESeh0g!Cf$;J7uTe>I#+c7<(%>{e|wEg3Y dSVfXl{@B*@0-N(?=j+aIJ701}oM)V0|39peXf*%; diff --git a/schainpy/model/io/jroIO_bltr.py b/schainpy/model/io/jroIO_bltr.py index ac987de..c5d884f 100644 --- a/schainpy/model/io/jroIO_bltr.py +++ b/schainpy/model/io/jroIO_bltr.py @@ -762,6 +762,7 @@ class BLTRReader (ProcessingUnit, FileHeaderBLTR, RecordHeaderBLTR, JRODataReade #print ' ' #print ' ' #Height=35 + for i in range(self.nRdPairs): chan_index0 = self.dataOut.pairsList[i][0] diff --git a/schainpy/model/io/jroIO_bltr.pyc b/schainpy/model/io/jroIO_bltr.pyc index f9676dd2718ff9e7c1ef67023db3d93a8be14671..fc13781c7c9f5373e838e57435de5c28aca8af2c 100644 GIT binary patch delta 54 zc$@(?0LlNUr2(m>0S5!~4GPqVq_GEpNdXA6h)J9R0f@6DOq2lukh8i?g#iJclR!_A M0fV#BPu2nf*Dxd$%m4rY delta 54 zc$@(?0LlNUr2(m>0S5!~4GL~lld%VYNdX75h)J9R0f)0COq2lukF&Z>g#iJblR!_A M0fMvAPu2nf))Q6~8vp 0.: velocityX=numpy.append(velocityX, Vzon)#Vmag else: - print 'Vzon',Vzon + #print 'Vzon',Vzon velocityX=numpy.append(velocityX, numpy.NaN) if abs(Vmer)<100. and abs(Vmer) > 0.: velocityY=numpy.append(velocityY, Vmer)#Vang else: - print 'Vmer',Vmer + #print 'Vmer',Vmer velocityY=numpy.append(velocityY, numpy.NaN) if dbSNR[Height] > SNRlimit: @@ -1123,7 +1126,8 @@ class FullSpectralAnalysis(Operation): # FirstMoment[Height] = numpy.NaN # velocityX[Height] = numpy.NaN # velocityY[Height] = numpy.NaN - + + data_output[0]=numpy.array(velocityX) data_output[1]=numpy.array(velocityY) @@ -1135,6 +1139,7 @@ class FullSpectralAnalysis(Operation): print 'velocityX',data_output[0] print ' ' print 'velocityY',data_output[1] + print 'PhaseLine',PhaseLine #print numpy.array(velocityY) print ' ' #print 'SNR' @@ -1144,6 +1149,7 @@ class FullSpectralAnalysis(Operation): dataOut.data_output=data_output + return @@ -1164,7 +1170,7 @@ class FullSpectralAnalysis(Operation): phase=numpy.ones([spc.shape[0],spc.shape[1]]) CSPCSamples=numpy.ones([spc.shape[0],spc.shape[1]],dtype=numpy.complex_) coherence=numpy.ones([spc.shape[0],spc.shape[1]]) - PhaseSlope=numpy.ones(spc.shape[0]) + PhaseSlope=numpy.zeros(spc.shape[0]) PhaseInter=numpy.ones(spc.shape[0]) xFrec=VelRange @@ -1202,11 +1208,11 @@ class FullSpectralAnalysis(Operation): print ' ' #print 'dataSNR', dbSNR.shape, dbSNR[0,40:120] - print 'SmoothSPC', SmoothSPC.shape, SmoothSPC[0:20] - print 'noise',noise - print 'zline',zline.shape, zline[0:20] - print 'FactNorm',FactNorm.shape, FactNorm[0:20] - print 'FactNorm suma', numpy.sum(FactNorm) + #print 'SmoothSPC', SmoothSPC.shape, SmoothSPC[0:20] + #print 'noise',noise + #print 'zline',zline.shape, zline[0:20] + #print 'FactNorm',FactNorm.shape, FactNorm[0:20] + #print 'FactNorm suma', numpy.sum(FactNorm) for i in range(spc.shape[0]): @@ -1227,12 +1233,12 @@ class FullSpectralAnalysis(Operation): phase[i] = self.moving_average( numpy.arctan2(CSPCSamples[i].imag, CSPCSamples[i].real),N=1)#*180/numpy.pi - print 'cspcLine', cspcLine.shape, cspcLine[0:20] - print 'CSPCFactor', CSPCFactor#, CSPCFactor[0:20] - print numpy.sum(ySamples[chan_index0]), numpy.sum(ySamples[chan_index1]), -noise[i] - print 'CSPCNorm', CSPCNorm.shape, CSPCNorm[0:20] - print 'CSPCNorm suma', numpy.sum(CSPCNorm) - print 'CSPCSamples', CSPCSamples.shape, CSPCSamples[0,0:20] + #print 'cspcLine', cspcLine.shape, cspcLine[0:20] + #print 'CSPCFactor', CSPCFactor#, CSPCFactor[0:20] + #print numpy.sum(ySamples[chan_index0]), numpy.sum(ySamples[chan_index1]), -noise[i] + #print 'CSPCNorm', CSPCNorm.shape, CSPCNorm[0:20] + #print 'CSPCNorm suma', numpy.sum(CSPCNorm) + #print 'CSPCSamples', CSPCSamples.shape, CSPCSamples[0,0:20] '''****** Getting fij width ******''' @@ -1246,17 +1252,17 @@ class FullSpectralAnalysis(Operation): meanGauss=sum(xSamples*yMean) / len(xSamples) sigma=sum(yMean*(xSamples-meanGauss)**2) / len(xSamples) - print '****************************' - print 'len(xSamples): ',len(xSamples) - print 'yMean: ', yMean.shape, yMean[0:20] - print 'ySamples', ySamples.shape, ySamples[0,0:20] - print 'xSamples: ',xSamples.shape, xSamples[0:20] + #print '****************************' + #print 'len(xSamples): ',len(xSamples) + #print 'yMean: ', yMean.shape, yMean[0:20] + #print 'ySamples', ySamples.shape, ySamples[0,0:20] + #print 'xSamples: ',xSamples.shape, xSamples[0:20] - print 'meanGauss',meanGauss - print 'sigma',sigma + #print 'meanGauss',meanGauss + #print 'sigma',sigma #if (abs(meanGauss/sigma**2) > 0.0001) : #0.000000001): - if dbSNR > SNRlimit : + if dbSNR > SNRlimit and abs(meanGauss/sigma**2) > 0.0001: try: popt,pcov = curve_fit(self.gaus,xSamples,yMean,p0=[1,meanGauss,sigma]) @@ -1302,9 +1308,9 @@ class FullSpectralAnalysis(Operation): else: Range = numpy.array([0,0]) - print ' ' - print 'GCpos',GCpos, ( len(xFrec)- len(xFrec)*0.1) - print 'Rangpos',Rangpos + #print ' ' + #print 'GCpos',GCpos, ( len(xFrec)- len(xFrec)*0.1) + #print 'Rangpos',Rangpos print 'RANGE: ', Range FrecRange=xFrec[Range[0]:Range[1]] @@ -1363,8 +1369,9 @@ class FullSpectralAnalysis(Operation): Vmag=numpy.sqrt(Vzon**2+Vmer**2) Vang=numpy.arctan2(Vmer,Vzon) Vver=xFrec[Vpos] + print 'Height',Height print 'vzon y vmer', Vzon, Vmer - return Vzon, Vmer, Vver, GaussCenter + return Vzon, Vmer, Vver, GaussCenter, PhaseSlope class SpectralMoments(Operation): diff --git a/schainpy/model/proc/jroproc_parameters.pyc b/schainpy/model/proc/jroproc_parameters.pyc index e6641a64344a27eefd15b5d0f31ff9df3abdee1c..162878aff26bff8d961b049b64deff22c47cee68 100644 GIT binary patch delta 8927 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%0D81Ge39eX}FQ^|Lt9NU1+{p+a@<4 zEuLQ&x*ZON-VarS2)>M`QYy0W#3NTKum?Bn*Q%J?@AfpwAPv<*ew2HjO13_R+y^8r zEWhB}o+^+IYq4*QS?X$^=k-;&eUFEVewS&ON-oM+4p3ntS)QX@DIJ)FRNc^ov?8G;% zV)W}p!RHFac*%eLe2I0?Q%CW@PX4#& z8(}ZM{)Go~zd*t&Jw}Z9_!EK?2q@gk24lyA}1C0Ct?D}7TWpQB*l_3zvV z$3hq0nG2Soc2&K1mH9kAf6lkOms9dH@249g>NIw^0;Ia9Qgm`PHD)5)W&Y87`{C12 z@P9U&MYVyC?PfJtdG^O8mK?F)Js0^#^Hm=&w|=S>88>^vx)z_ya<;$61 z@85&yU~{a{J7fXwdy`5#VxtjEGH4DS48tOW7MjI~y{lba zyQ5E51ihF^-^l7!L z9G}U^3WJt*xwxz#?Op^s5!{Dh7lM5Vo<{I2f@cssk6Iv`ZM$=M( zejfVZbTPmKq3A!Ih5jyF?8fpKPZK6R{s$ciG3viPdeNt<*o&fUdZc0_l5eDDC23yo zLu>(R&$OKGlK0Y$yvTob{u-zx@5~X-yFWDjFONi9Y0`*60b|jl zNBFlFs$mSD{_Ss|n1AtYx){5nFN$G8;@4d)$cjVx_?e3;fyj8A*eB}Qdx3AeIKfVO zUqnt1%KZ+p{p!T@$BSbVF~-yZyG9PQ_+0)L`3Ii#U4Hd+LnN*PiyR%Day^Z9S`qTh zcQpIuWh_#zfF8mKqnu=`o)#HEYkg`5B3A2&fcm;ZT_7`fj4=MmF&V&|EV@ys4<}mTHGos$lOtfR1ecZEM96_nO11b$ij$PP;vq@7DG^4_>qJ4= zN-3i{T+SwUdw@!$Kj4%Hdp{Q}f{ou!qm)!x=FPDsPN~^a7If zpf>$cVHzUyUesy6 zQ`CPRJ&+BIajpp*5RA-h!9k%y_zp>yRGig5~DXMY#*_Y9HH?!=Hn zmlw;s755aVh7-!6DRA{DHC*tjV<|}jF0XH?w>{u5lHXJ;rSKk{Q$8&f;awl@DFZO% z{>&V@kB69+OE|vDR%JsKBrBn*kds6cQp%M^oK^lZ6*BUM8<7{mZtcqHRbN#?jg1q^ z#A#s9#X(3^bph7u)9p6Iwo_-p$Ky)dG`IuaQ7%n`eX)aVydSS6rSp`j23Qr2uUIUf2!&Q)C z?MJ)-wYUkfjmqgNSY_%K`0jAkHLz6@+y77vDgERz^_!DEtn?suGrGvCyQl!c7F-xo z@Nw^5q!I%9QuQ!mk05vy!QBY%AtMpY*1y>x@Xuv@*7*g{t^95t>@m$me}$L-0-|8_ zOWOMYj#-PvoTauynjK%E;XoZ6UKRMR@abz|hXk)FJqzHfib0FU>2u@jl9mX&^hBV5 zp==m~hvg|>)k2D5sDU(d8NGWbxi#<+_>`Y&zy}AFwYBhU6ovVZYQWyU5Nskz_b-Gk zQ9sfPkdf$Ht`|k;RCw3*u+ISNlo?B4f(5;)m5#s?$XcXpnV+ZonEZ(@Qe8=3FRF}J zB))&P&*$hRx2h!*zrsbFuAE&0pTVQbn@b_rdK@=@sLxviJL;ed{uJ)6gKC2n$7p(w zl_%iNiOO5c;j9^*8%QTN40ro0y`Cm_vpg9YrYNUxfN|zh#LJWsE1*I;3d*l;fKf{G z3P`omuuP7oAnH->UIDfJgZ-QSPtbN{EDeScMNok@Z_86KYH=1)2kt?q(5?I|pjII> z+DhrW#_Mgr#^)2$fv|j-n2K<k-_DU=D(M z1VJP3JiTW0EP>w>C*n0xY%xpPpXiwAvS_3DQ!cMlzF7r-ha1AD8{k`*|Fer6(9_|e zD-wuwo?SaTG6m9=p~^H|(zj2)(4Iy!jGu;Z{~9=sU2vfjdS*Ozg?q$|bf=Q! zh1=kz@E$J|M%qpW%E^>8Qw#MjL_LL?(i^yXP-}ShF6s4Y+)P+L&;c7YM@c;k- delta 9590 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 diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml index 01b08b8..7e5c5a4 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 be284f1..cc7a32b 100644 --- a/schainpy/scripts/testBLTR_block.py +++ b/schainpy/scripts/testBLTR_block.py @@ -151,7 +151,7 @@ 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='ymin', value='0', format='float') -opObj10.addParameter(name='ymax', value='10', format='float') +opObj10.addParameter(name='ymax', value='7', format='float') opObj10.addParameter(name='zmin', value='-4', format='float') opObj10.addParameter(name='zmax', value='4', format='float') opObj10.addParameter(name='zmin_ver', value='-200', format='float') diff --git a/schainpy/scripts/testProcBLTR.py b/schainpy/scripts/testProcBLTR.py index 0e6a08d..930019d 100644 --- a/schainpy/scripts/testProcBLTR.py +++ b/schainpy/scripts/testProcBLTR.py @@ -101,6 +101,7 @@ 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 = procUnitConfObj2.addOperation(name='WindProfilerPlot', optype='other') opObj22.addParameter(name='id', value='4', format='int') @@ -115,8 +116,8 @@ opObj22.addParameter(name='zmax_ver', value='250', 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') -opObj22.addParameter(name='xmin', value=0, format='float') -opObj22.addParameter(name='xmax', value=24, format='float') +opObj22.addParameter(name='xmin', value='0', format='float') +opObj22.addParameter(name='xmax', value='24', format='float') opObj22.addParameter(name='ymin', value='225', format='float') #opObj22.addParameter(name='ymax', value='2000', format='float') opObj22.addParameter(name='save', value='1', format='int')