From 871f53f50be6322f43240d92ca37d3addbac1c82 2020-02-24 22:54:11 From: Jose Suclupe Date: 2020-02-24 22:54:11 Subject: [PATCH] voltacf --- diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 067ecd9..a558db7 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -1363,6 +1363,7 @@ class voltACFLags(Operation): self.lags = lags print self.lags self.mode = mode + self.buffer2 = [] self.fullBuffer= fullBuffer self.nAvg = nAvg self.pairsList = [pairsList] @@ -1403,7 +1404,8 @@ class voltACFLags(Operation): elif mode =='time': self.tmp = numpy.zeros((len(self.pairsList), len(self.lags), nHeights),dtype='complex') elif mode =='height': - self.tmp = numpy.zeros((len(self.pairsList), len(self.lags), nProfiles),dtype='complex') + self.tmp = numpy.zeros((len(self.pairsList), len(self.lags), nHeights),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 @@ -1438,19 +1440,50 @@ class voltACFLags(Operation): data_pre = self.buffer #data for l in range(len(self.pairsList)): + #print "l",l ch0 = self.pairsList[l][0] ch1 = self.pairsList[l][1] - for i in range(len(self.lags)): - idx = self.lags[i] + #for i in range(len(self.lags)): + for i in range(self.__nProfiles): + k=i%len(self.lags) + idx = self.lags[k] + if self.mode == 'time': - acf0 = data_pre[ch0,:self.__nProfiles-idx,:]*numpy.conj(data_pre[ch1,idx:,:]) # pair,lag,height - else: - acf0 = data_pre[ch0,:,:self.__nHeights-idx]*numpy.conj(data_pre[ch1,:,idx:]) # pair,lag,profile - if self.fullBuffer: - self.tmp[l,i,:acf0.shape[0],:]= acf0 + acf0 = data_pre[ch0,:self.__nProfiles-idx,:]*numpy.conj(data_pre[ch1,idx:,:]) # pair,lag,height else: - self.tmp[l,i,:]= numpy.sum(acf0,axis=0) + #print "ESTE ES :D" + if idx==0: + acf0 = data_pre[ch0,k,:self.__nHeis]*numpy.conj(data_pre[ch1,k,idx:]) + #acf0 = data_pre[ch0,:,:self.__nHeis-idx]*numpy.conj(data_pre[ch1,:,idx:]) # pair,lag,profile + else: + #print "primera parte del array",(data_pre[ch1,k,idx:].shape) + #print (data_pre[ch1,i+1,:]) + #print "segunda parte del array 6 primeros",(data_pre[ch1,i+1,:idx]) + acu=int(i/(len(self.lags)))*len(self.lags) + #print ("acu",acu) + if k+acu+1==self.__nProfiles: + acu=acu-1 + acf0 = data_pre[ch0,k+acu,:self.__nHeis]*numpy.conj(numpy.concatenate((data_pre[ch1,k+acu,idx:],data_pre[ch1,k+acu+1,:idx]), axis=0)) # pair,lag,profile + + #if k== len(self.lags)-1: + self.tmp[l,k,:]= acf0 + if k == len(self.lags)-1: + self.buffer2.append(self.tmp) + + if i==self.__nProfiles-1: + self.tmp = numpy.sum(self.buffer2,axis = 0) + print self.tmp.shape + self.buffer2=[] + + + + + #if self.fullBuffer: + # self.tmp[l,i,:acf0.shape[0],:]= acf0 + #else: + # #print "l",l ,"i",i ,acf0.shape + # self.tmp[l,i,:]= numpy.sum(acf0,axis=0) 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 diff --git a/schainpy/scripts/gyro_long_mod.py b/schainpy/scripts/gyro_long_mod.py index 1d1cc90..f5ea566 100644 --- a/schainpy/scripts/gyro_long_mod.py +++ b/schainpy/scripts/gyro_long_mod.py @@ -16,8 +16,8 @@ if __name__ == '__main__': desc = "High altitude experiment LONG " filename = "schain.xml" - dpath = '/media/soporte/UUI/gyro20' - figpath = "/media/soporte/UUI/pics_long_test400" + dpath = '/media/topside/UUI/gyro20' + figpath = "/media/topside/UUI/pics_long_test400" remotefolder = "/home/wmaster/graficos" t=['0','24'] db_range=['15','35'] diff --git a/schainpy/scripts/gyro_short_mod.py b/schainpy/scripts/gyro_short_mod.py index 050fa53..40f3ca2 100644 --- a/schainpy/scripts/gyro_short_mod.py +++ b/schainpy/scripts/gyro_short_mod.py @@ -16,8 +16,8 @@ if __name__ == '__main__': desc = "High altitude experiment SHORT " filename = "schain.xml" - dpath = '/media/soporte/UUI/gyro20' - figpath = "/media/soporte/UUI/pics_short" + dpath = '/media/topside/UUI/gyro20' + figpath = "/media/topside/UUI/pics_short" remotefolder = "/home/wmaster/graficos" t=['0','24'] db_range=['15','35'] @@ -68,7 +68,7 @@ if __name__ == '__main__': 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='600', format='int') + opObj11.addParameter(name='timeInterval', value='10', format='int')#600 procUnitConfObj2SPC = controllerObj.addProcUnit(datatype='SpectraAFCProc', inputId=procUnitConfObj1SPC.getId()) @@ -115,8 +115,8 @@ if __name__ == '__main__': #opObj11.addParameter(name='zmax', value=-0.5, format='int') #opObj11.addParameter(name='ymin', value='0', format='int') #opObj11.addParameter(name='ymax', value='0.5', format='int') - #opObj11.addParameter(name='xmin', value='-1.2', format='int') - #opObj11.addParameter(name='xmax', value='1.2', format='int') + opObj11.addParameter(name='xmin', value='0', format='int') + opObj11.addParameter(name='xmax', value='1.2', format='int') opObj11.addParameter(name='show', value='1', format='int') opObj11.addParameter(name='save', value='1', format='int') opObj11.addParameter(name='figpath', value=figpath)