schain Commit - r1274:b6957aa66e1c · Jicamarca Repository

update de operacion voltACFLags en jroproc_voltage.py y VoltACFPLot en jroplot_voltage.py

avaldez -

r1274:b6957aa66e1c

parent child

Context file:

r1274:b6957aa66e1c

schainpy/model/graphics/jroplot_voltage.py +7 -33

                 			  widthplot  = self.WIDTH,
                 			  heightplot = self.HEIGHT,
                 			  show       = show)
                 	nrow, ncol  = self.getSubplots()
                 	counter = 0
                 	for y in range(nrow):
                         for x in range(ncol):
                             self.addAxes(nrow, ncol*ncolspan,y, x*ncolspan, colspan, 1)
                                 raise ValueError, "Channel %d is not in dataOut.channelList"
                             channelIndexList.append(dataOut.channelList.index(channel))
                     #factor       =  dataOut.normFactor
                     y            =  dataOut.getHeiRange()
                 	#print y, dataOut.heightList[0]
                 	#import time
                 	#time.sleep(10)
                     deltaHeight  =  dataOut.heightList[1]-dataOut.heightList[0]
-                    z            =  dataOut.data
+                    z            =  dataOut.data_acfLag
+                	shape     =  dataOut.data_acfLag.shape
-            	shape     =  dataOut.data.shape
                 	hei_index =  numpy.arange(shape[2])
                 	hei_plot  =  numpy.arange(nSamples)*resFactor
             	    #escalamiento  -1 a 1 a resolucion (factor de resolucion en altura)* deltaHeight
                     #min = numpy.min(z[0,:,0])
                     #max =numpy.max(z[0,:,0])
+                    #print shape[0]
                     for i in range(shape[0]):
+                        #print "amigo i",i
                         for j in range(shape[2]):
                             min = numpy.min(z[i,:,j])
                             max = numpy.max(z[i,:,j])
                             z[i,:,j]= (((z[i,:,j]-min)/(max-min))*deltaHeight*resFactor + j*deltaHeight+dataOut.heightList[0])
                 	if xaxis == "time":
                         x = dataOut.getAcfRange()*1000
                         zdB = z[channel0,:,hei_plot]
                         xlabel = "Time (ms)"
                         ylabel = "VOLT_ACF"
                         thisDatetime = datetime.datetime.utcfromtimestamp(dataOut.getTimeRange()[0])
                         title = wintitle + "VOLT ACF Plot Ch %s %s" %(channel0,thisDatetime.strftime("%d-%b-%Y"))
                             self.isConfig = True
                         self.setWinTitle(title)
                         title = "VOLT ACF Plot: %s" %(thisDatetime.strftime("%d-%b-%Y %H:%M:%S"))
                         axes = self.axesList[0]
                                   ftp=ftp,
                                   wr_period=wr_period,
                                   thisDatetime=thisDatetime)

schainpy/model/proc/jroproc_voltage.py +22 -18

                         rangeList            :    List of profile ranges. Example: rangeList = ((4, 30), (32, 64), (128, 256))
                     """
-                    print "HOLA MUNDO CRUEL"
+                    #print "HOLA MUNDO CRUEL"
                     if rangeList is not None:
                         if type(rangeList[0]) not in (tuple, list):
                             rangeList = [rangeList]
                     self.isConfig  = False
                     self.profIndex = 0
                     self.buffer    = None
+                    self.channelList = []
                 def setup(self,dataOut ,lags = None,mode =None, fullBuffer= None ,pairsList = None,nAvg = 1):
                 	self.mode      = mode
                 	self.fullBuffer= fullBuffer
                 	self.nAvg      = nAvg
-                    self.pairsList  = pairsList
+                    self.pairsList  = [pairsList]
                 	nChannels      = dataOut.nChannels
                 	nProfiles      = dataOut.nProfiles
                 	nHeights       = dataOut.nHeights
                 	   pairsList = [(0,1)]
                 	   self.pairsList= pairsList
-                    self.selectChannels(self.pairsList)
+                    for i in range(len(self.pairsList)):
+                        self.channelList.append(self.pairsList[i][0])
+                        self.channelList.append(self.pairsList[i][1])
                 	if lags == None:
                         if mode=='time':
                     # buffer de canalaes, perfiles, alturas
                     if self.buffer is None:
-                        self.buffer = numpy.zeros((len(pairsList),nProfiles,nHeights),dtype='complex')
+                        self.buffer = numpy.zeros((nChannels,nProfiles,nHeights),dtype='complex')
                    	if fullBuffer:
-                	    self.tmp = numpy.zeros((len(pairsList), len(self.lags), nProfiles, nHeights), dtype = 'complex')*numpy.nan
+                	    self.tmp = numpy.zeros((len(self.pairsList), len(self.lags), nProfiles, nHeights), dtype = 'complex')*numpy.nan
                     elif mode =='time':
-                		self.tmp = numpy.zeros((len(pairsList), len(self.lags), nHeights),dtype='complex')
+                		self.tmp = numpy.zeros((len(self.pairsList), len(self.lags), nHeights),dtype='complex')
                     elif mode =='height':
-                		self.tmp = numpy.zeros(len(pairsList), (len(self.lags), nProfiles),dtype='complex')
+                		self.tmp = numpy.zeros((len(self.pairsList), len(self.lags), nProfiles),dtype='complex')
                 	print "lags", len(self.lags),self.lags
                 	print "mode",self.mode
                 	print "nChannels", nChannels
                 	print "nProfiles", nProfiles
                 	print "nHeights" , nHeights
+                    print "acf_channels",len(self.pairsList)
+                    print "channelList",self.channelList
                 	print "pairsList", pairsList,len(self.pairsList)
                 	print "fullBuffer", fullBuffer
                 	#print "type(pairsList)",type(pairsList)
                     if not self.isConfig:
                         self.setup(dataOut, lags = lags,mode = mode, fullBuffer= fullBuffer ,pairsList = pairsList,nAvg=nAvg)
                         self.isConfig = True
-                        print "pairsList Ale", self.pairsList
-                        print dataOut.data[pairsList,:].shape
                     if dataOut.type == "Voltage":
                         if dataOut.flagDataAsBlock:
                             print "Not implemented yet"
                             return 0
                         else:
-                            print "shapebuffer",self.buffer[:,0,:].shape
+                            self.buffer[:, self.profIndex, :] = dataOut.data
-                            self.buffer[:, self.profIndex, :] = dataOut.data#error
                             self.profIndex += 1
                         if self.profIndex == self.__nProfiles :
                             data_pre = self.buffer  #data
-                            print "size",data_pre.shape
-                            #  Here is the loop :D
                             for l in range(len(self.pairsList)):
                                 ch0 = self.pairsList[l][0]
                                 ch1 = self.pairsList[l][1]
                             if self.fullBuffer:
                                 self.tmp = numpy.sum(numpy.reshape(self.tmp,(self.tmp.shape[0],self.tmp.shape[1],self.tmp.shape[2]/self.nAvg,self.nAvg,self.tmp.shape[3])),axis=3)
                                 dataOut.nAvg = self.nAvg
                             if self.mode == 'time':
+                                #print "entre"
                                 delta = dataOut.ippSeconds*dataOut.nCohInt
                             else:
                     		    delta = dataOut.heightList[1] - dataOut.heightList[0]
-                            shape= self.tmp.shape # mode time
+                            shape= self.tmp.shape
-                	        # Normalizando
+                            for i in range(len(self.pairsList)):
-                            for i in range(len(pairsList)):
                                 for j in range(shape[2]):
                                     self.tmp[i,:,j]= self.tmp[i,:,j].real/numpy.max(numpy.abs(self.tmp[i,:,j]))
                             #plt.show()
                 	        #import time
                     	    #time.sleep(20)
-                            dataOut.data      = self.tmp
+                            dataOut.data = self.buffer
+                            dataOut.data_acfLag = self.tmp
                             dataOut.mode      = self.mode
                             dataOut.nLags     = len(self.lags)
                             dataOut.nProfiles = len(self.lags)
                             dataOut.lagRange = numpy.array(self.lags)*delta
                             dataOut.flagDataAsBlock = True
                             dataOut.flagNoData = False
+                            self.profIndex = 0
             import time

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