diff --git a/schainpy/model/io/jroIO_kamisr.py b/schainpy/model/io/jroIO_kamisr.py index 75834c3..7e83c4a 100644 --- a/schainpy/model/io/jroIO_kamisr.py +++ b/schainpy/model/io/jroIO_kamisr.py @@ -533,7 +533,6 @@ class AMISRReader(ProcessingUnit): nblocks = self.nblocks nsamples = self.nsa #print("Channels: ",self.nChannels) - print("dataset: ", self.dataset.shape) #Dimensions : nChannels, nProfiles, nSamples new_block = numpy.empty((nblocks, nchan, numpy.int_(self.newProfiles), nsamples), dtype="complex64") ############################################ diff --git a/schainpy/model/proc/jroproc_spectra.py b/schainpy/model/proc/jroproc_spectra.py index 3ff9115..a08bd5a 100644 --- a/schainpy/model/proc/jroproc_spectra.py +++ b/schainpy/model/proc/jroproc_spectra.py @@ -2203,7 +2203,6 @@ class IncohInt(Operation): self._nProfilesByRange += dataOut.nProfilesByRange if self.__dataReady: - print("IncohInt Done ", self.incohInt) #print("prof: ",dataOut.max_nIncohInt,self.__profIndex) dataOut.data_spc = avgdata_spc dataOut.data_cspc = avgdata_cspc @@ -2218,7 +2217,7 @@ class IncohInt(Operation): dataOut.nProfilesByRange = self._nProfilesByRange self._nProfilesByRange = numpy.zeros((1,len(dataOut.heightList))) self._flagProfilesByRange = False - + #print("IncohInt Done") return dataOut class dopplerFlip(Operation): diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 5e5e237..393daab 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -3116,7 +3116,7 @@ class remFaradayProfiles(Operation): self.flagRemove = False self.k = 0 - def setup(self, channel,nChannels=5, nProfiles=300,nBlocks=100, nIpp2=200, nTx2=132, nTaus=22, offTaus=14, iTaus=8, + def setup(self, channel,nChannels=5, nProfiles=300,nBlocks=100, nIpp2=300, nTx2=132, nTaus=22, offTaus=14, iTaus=8, nfft=1): ''' nProfiles = amisr profiles per block -> raw data @@ -3151,7 +3151,6 @@ class remFaradayProfiles(Operation): if k%nIpp2==0: #each sync PPs or 2, 3, or 5 f_ntx = True kt = 0 - #print(k, fi, j, f_iTaus) if f_ntx: if kt%nTaus==0: #each sequence of Taus @@ -3168,11 +3167,8 @@ class remFaradayProfiles(Operation): fi_reps += 1 if fi_reps == (nTx2/nTaus): fi = 0 - #print("AQUI, ", fi_reps, k, fi) fi_reps = 0 f_ntx=False - # if i < 1: - # print(fi, kt) kt += 1 k += 1 @@ -3182,8 +3178,7 @@ class remFaradayProfiles(Operation): # cbar = fig.colorbar(cax) # plt.show() - - #print ("AQUI") + #reshape the Flag as AMISR reader profPerCH = int( (nProfiles) / (nfft*nChannels)) @@ -3206,8 +3201,8 @@ class remFaradayProfiles(Operation): new_block[:,ich,:] = booldataset[:,idx_ch] new_block = numpy.transpose(new_block, (1,0,2)) - new_block = numpy.reshape(new_block, (nChannels,-1)) - #new_block = numpy.reshape(new_block, (nChannels,profPerCH*nBlocks)) + #new_block = numpy.reshape(new_block, (nChannels,-1)) + new_block = numpy.reshape(new_block, (nChannels,profPerCH*nBlocks)) self.profilesFlag = new_block.copy() # fig = plt.figure() @@ -3218,7 +3213,6 @@ class remFaradayProfiles(Operation): self.isConfig = True - #print(self.profilesFlag.shape) def run(self,dataOut, channel=0, nChannels=5, nProfiles=300,nBlocks=100,nIpp1=100, nIpp2=300, nTx2=132, nTaus=22, offTaus=8, iTaus=14, nfft=1 ,offIpp=0): @@ -3237,17 +3231,13 @@ class remFaradayProfiles(Operation): else: self.flagRun = True self.profile = 0 - #check profile ## Faraday interference if self.profilesFlag[channel, self.profile]==0: dataOut.flagNoData = True # do not pass this profile - # print(self.nprofile, dataOut.flagNoData) - #print(self.nprofile2, self.profile, dataOut.flagNoData) + self.profile +=1 - # if self.profile == int((nProfiles*nBlocks)/self.nChannels): - # self.flagRun=False - # self.profile = 0 + self.nprofile2 +=1