schain Commit - r1259:c52310cc7d94 · Jicamarca Repository

update repository

avaldez -

r1259:c52310cc7d94

parent child

Context file:

r1259:c52310cc7d94

schainpy/model/data/jrodata.py +9 -6

                     return freqrange
                 def getAcfRange(self, extrapoints=0):
+            	#print "GET ACF RANGE"
                     #print "NFFTPoints",self.nFFTPoints
                     #print "IPPFactor", self.ippFactor
-                    deltafreq = 10. / (  self.getFmax() / (self.nFFTPoints * self.ippFactor)   )
+                    #deltafreq = 10. / (  self.getFmax() / (self.nFFTPoints * self.ippFactor)   )
-                    #print "deltafreq",deltafreq
+            	deltatime = 1./(self.getFmax()/ self.ippFactor)
+                    #print "getFmax",self.getFmax()
                     #import time
                     #time.sleep(30)
-                    freqrange = deltafreq * \
+                    timerange = deltatime * \
                         (numpy.arange(self.nFFTPoints + extrapoints) -
-                         self.nFFTPoints / 2.) - deltafreq / 2
+                         self.nFFTPoints / 2.)
+            	#- deltafreq / 2
-                    return freqrange
+            	#print "timerange",timerange
+                    return timerange
                 def getFreqRange(self, extrapoints=0):

schainpy/model/graphics/jroplot_spectra.py +6 -5

                     #z           =  numpy.where(numpy.isfinite(z), z, numpy.NAN)
                     shape        =  dataOut.data_acf.shape
-            	print "shape_plot",shape
+            	#print "shape_plot",shape
                     hei_index    =  numpy.arange(shape[2])
                     hei_plot     =  numpy.arange(nSamples)*resFactor
                         ylabel = "Power (dB)"
                     elif xaxis == "time":
-                        delta= dataOut.getAcfRange()[1]-dataOut.getAcfRange()[0]
+                        #delta= dataOut.getAcfRange()[1]-dataOut.getAcfRange()[0]
-                        x = dataOut.getAcfRange()+delta/2.0
+                        #x = dataOut.getAcfRange()+delta/2.0
+                        x = dataOut.getAcfRange()*1000
                         zdB = z[channel0,:,hei_plot]
                         xlabel = "Time (ms)"
                         ylabel = "ACF"
                                    wintitle=wintitle,
                                    show=show)
-                        if xmin == None: xmin = numpy.nanmin(x)*0.9
+                        if xmin == None: xmin = numpy.nanmin(x)#*0.9
-                        if xmax == None: xmax = numpy.nanmax(x)*1.1
+                        if xmax == None: xmax = numpy.nanmax(x)#*1.1
                         if ymin == None: ymin = numpy.nanmin(zdB)
                         if ymax == None: ymax = numpy.nanmax(zdB)

schainpy/model/proc/jroproc_spectra_acf.py +9 -46

@@ -141,63 +141,26 class SpectraAFCProc(ProcessingUnit):
141	if self.dataIn.type == "Spectra":	141	if self.dataIn.type == "Spectra":
142	self.dataOut.copy(self.dataIn)	142	self.dataOut.copy(self.dataIn)
143	spc = self.dataOut.data_spc	143	spc = self.dataOut.data_spc
144	data = numpy.fft.ifft(spc, axis=1)	144	data = numpy.fft.fftshift( spc, axes=(1,))
145	data = numpy.fft.~~fftsh~~ift(data, axes=(1,))	145	data = numpy.fft.ifft(data, axis=1)
		146	data = numpy.fft.fftshift( data, axes=(1,))
146	acf = numpy.abs(data) # Autocorrelacion LLAMAR A ESTE VALOR ACF	147	acf = numpy.abs(data) # Autocorrelacion LLAMAR A ESTE VALOR ACF
147	if real:	148	if real:
148	acf = data.real	149	acf = data.real
149	if imag:	150	if imag:
150	acf = data.imag	151	acf = data.imag
151	shape = acf.shape # nchannels, nprofiles, nsamples	152	shape = acf.shape # nchannels, nprofiles, nsamples //nchannles, lags , alturas
152		153
153	#import matplotlib.pyplot as plt
154	#print "test",acf.shape
155	#acf_tmp=acf[0,:,]
156	#plt.plot(acf_tmp)
157	#plt.show()
158	#import time
159	#time.sleep(10)
160
161	for j in range(shape[0]):	154	for j in range(shape[0]):
162	for i in range(shape[1]):	155	for i in range(shape[2]):
163	tmp = numpy.argmax(acf[j,:,i])	156	tmp = shape[1]/2
164	if i>30:	157	value = (acf[j,:,i][tmp-1]+acf[j,:,i][tmp+1])/2.0
165	value = (acf[j,:,i][tmp+3]+acf[j,:,i][tmp+4])/2.0	158	acf[j,:,i][tmp] = value
166	acf[j,:,i][tmp] = value
167	acf[j,:,i][tmp-1] = value
168	acf[j,:,i][tmp+1] = value
169	acf[j,:,i][tmp-2] = value
170	acf[j,:,i][tmp+2] = value
171
172	import scipy as sp
173	from scipy import signal
174	#acf[3,:,i] = sp.signal.medfilt(acf[3,:,i],21)
175
176
177
178	#print numpy.argmax(acf[0,:,85])
179	#import matplotlib.pyplot as plt
180	#plt.plot(acf[0,:,85])
181	#a= acf[0,:,85]
182	#b= acf[0,:,0]
183	#print a[200],a[198],a[199], a[201],a[202],a[203]
184	#plt.show()
185	#import time
186	#time.sleep(10)
187
188
189	# Normalizando	159	# Normalizando
190	for i in range(shape[0]):	160	for i in range(shape[0]):
191	for j in range(shape[2]):	161	for j in range(shape[2]):
192	acf[i,:,j]= acf[i,:,j] / numpy.max(numpy.abs(acf[i,:,j]))	162	acf[i,:,j]= acf[i,:,j] / numpy.max(numpy.abs(acf[i,:,j]))
193		163
194	#import matplotlib.pyplot as plt
195	#plt.plot(acf[0,:,85])
196	#plt.show()
197	#import time
198	#time.sleep(20)
199
200
201	self.dataOut.data_acf = acf	164	self.dataOut.data_acf = acf
202	return True	165	return True
203		166

schainpy/model/proc/jroproc_voltage.py +2 -2

                     for i in range(self.buffer.shape[1]):
                         #self.buffer[:,i]    = numpy.flip(dataOut.data[:,i*self.step:i*self.step + self.nsamples])
                         self.buffer[:,i]    = dataOut.data[:,i*self.step:i*self.step + self.nsamples]
+            	    #self.buffer[:,j,self.__nHeis-j*self.step - self.nheights:self.__nHeis-j*self.step] = numpy.flip(dataOut.data[:,j*self.step:j*self.step + self.nheights])
-                        #self.buffer[:,j,self.__nHeis-j*self.step - self.nheights:self.__nHeis-j*self.step] = numpy.flip(dataOut.data[:,j*self.step:j*self.step + self.nheights])
                     for j in range(self.buffer.shape[0]):
                         self.sshProfiles[j] = numpy.transpose(self.buffer[j])
                     profileIndex  =  self.nsamples
                     deltaHeight   =  dataOut.heightList[1] - dataOut.heightList[0]
                     ippSeconds    =  (deltaHeight*1.0e-6)/(0.15)
+            	#print "ippSeconds",ippSeconds
                     try:
                         if dataOut.concat_m  is not None:
                             ippSeconds= ippSeconds/float(dataOut.concat_m)

schainpy/scripts/test_0001.py +4 -3

             #    procUnitConfObj1SPC.addParameter(name='pairsList', value='(1,0),(3,2),(5,4),(7,6)', format='pairsList')
                 opObj11 = procUnitConfObj1SPC.addOperation(name='IncohInt', optype='other')
-                opObj11.addParameter(name='timeInterval', value='5', format='int')
+                opObj11.addParameter(name='timeInterval', value='10', format='int')
                 procUnitConfObj2SPC = controllerObj.addProcUnit(datatype='SpectraAFCProc', inputId=procUnitConfObj1SPC.getId())
+                procUnitConfObj2SPC.addParameter(name='real', value='1', format='int')
                 opObj11 = procUnitConfObj1SPC.addOperation(name='SpectraPlot', optype='other')
                 opObj11.addParameter(name='id', value='1', format='int')
                 opObj11.addParameter(name='wintitle', value = 'October 2019', format='str')
                 opObj11.addParameter(name='xaxis', value='time', format='str')
                 opObj11.addParameter(name='channel', value='0', format='int')
-                opObj11.addParameter(name='nSampleList', value='(40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70)', format='intList')
+                #opObj11.addParameter(name='nSampleList', value='(50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70)', format='intList')
-                opObj11.addParameter(name='resolutionFactor', value='2', format='int')
+                opObj11.addParameter(name='resolutionFactor', value='15', format='int')
                 #opObj11.addParameter(name='zmin', value=0.5, format='int')
                 #opObj11.addParameter(name='zmax', value=-0.5, format='int')
                 #opObj11.addParameter(name='ymin', value='0', format='int')

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