schain Commit - r1641:a4bbbc3748b7 · Jicamarca Repository

zeroPoints include for zero padding

joabAM -

r1641:a4bbbc3748b7

parent child

Context file:

r1641:a4bbbc3748b7

Collapse all files

schainpy/model/graphics/jroplot_spectra.py +2 -2

                         self.azimuthList = dataOut.azimuthList
                 def update(self, dataOut):
                     self.update_list(dataOut)
                     data = {}
                     meta = {}
                 def plot(self):
                     if self.xaxis == "frequency":
-                        x = self.data.xrange[0][1:]
+                        x = self.data.xrange[0][0:]
                         self.xlabel = "Frequency (kHz)"
                     elif self.xaxis == "time":
                         x = self.data.xrange[1]

schainpy/model/io/jroIO_kamisr.py +33 -14

                     self.dataOut = Voltage()
                     self.dataOut.error=False
                     self.margin_days = 1
+                    self.flag_ignoreFiles = False
+                    self.ignStartDateTime=None
+                    self.ignEndDateTime=None
                 def setup(self,path=None,
                                 startDate=None,
                                 endDate=None,
                                 margin_days=1,
                                 nFFT = None,
                                 nChannels = None,
+                                ignStartDate=None,
+                                ignEndDate=None,
+                                ignStartTime=None,
+                                ignEndTime=None,
                                 ):
                     self.nFFT = nFFT
                     self.nChannels = nChannels
+                    if ignStartTime!=None and ignEndTime!=None:
+                        if ignStartDate!=None and ignEndDate!=None:
+                            self.ignStartDateTime=datetime.datetime.combine(ignStartDate,ignStartTime)
+                            self.ignEndDateTime=datetime.datetime.combine(ignEndDate,ignEndTime)
+                        else:
+                            self.ignStartDateTime=datetime.datetime.combine(startDate,ignStartTime)
+                            self.ignEndDateTime=datetime.datetime.combine(endDate,ignEndTime)
+                        self.flag_ignoreFiles = True
                     #self.findFiles()
                     if not(online):
                         #Busqueda de archivos offline
-                        self.searchFilesOffLine(path, startDate, endDate, startTime, endTime, walk)
+                        self.searchFilesOffLine(path, startDate, endDate, startTime, endTime, walk,)
                     else:
                         self.searchFilesOnLine(path, startDate, endDate, startTime,endTime,walk)
                     self.startTime = startTime
                     self.endTime = endTime
                     self.walk = walk
                 def __checkPath(self):
                     if os.path.exists(self.path):
                 def __selectDataForTimes(self, online=False):
-                    #aun no esta implementado el filtro for tiempo
+                    #aun no esta implementado el filtro for tiempo-> implementado en readNextFile
                     if not(self.status):
                         return None
                     #self.__firstFile = False
                     self.dataset,self.timeset = self.readData()
                     if self.endDate!=None:
-                     endDateTime_Reader = datetime.datetime.combine(self.endDate,self.endTime)
+                        endDateTime_Reader = datetime.datetime.combine(self.endDate,self.endTime)
-                     time_str = self.amisrFilePointer.get('Time/RadacTimeString')
+                        time_str = self.amisrFilePointer.get('Time/RadacTimeString')
-                     startDateTimeStr_File = time_str[0][0].decode('UTF-8').split('.')[0]
+                        startDateTimeStr_File = time_str[0][0].decode('UTF-8').split('.')[0]
-                     junk = time.strptime(startDateTimeStr_File, '%Y-%m-%d %H:%M:%S')
+                        junk = time.strptime(startDateTimeStr_File, '%Y-%m-%d %H:%M:%S')
-                     startDateTime_File = datetime.datetime(junk.tm_year,junk.tm_mon,junk.tm_mday,junk.tm_hour, junk.tm_min, junk.tm_sec)
+                        startDateTime_File = datetime.datetime(junk.tm_year,junk.tm_mon,junk.tm_mday,junk.tm_hour, junk.tm_min, junk.tm_sec)
-                     if self.timezone == 'lt':
+                        if self.timezone == 'lt':
-                      startDateTime_File = startDateTime_File - datetime.timedelta(minutes = 300)
+                            startDateTime_File = startDateTime_File - datetime.timedelta(minutes = 300)
-                     if (startDateTime_File>endDateTime_Reader):
+                        if (startDateTime_File>endDateTime_Reader):
-                         return 0
+                            return 0
+                        if self.flag_ignoreFiles and (startDateTime_File >= self.ignStartDateTime and startDateTime_File <= self.ignEndDateTime):
+                            print("Ignoring...")
+                            return 0
                     self.jrodataset = self.reshapeData()
                     #----self.updateIndexes()
                     if self.profileIndex >= (self.newProfiles*self.nblocks): #
                     #if self.__hasNotDataInBuffer():
                         if not (self.readNextFile(self.online)):
+                            print("Profile Index break...")
                             return 0
                     if self.dataset is None: # setear esta condicion cuando no hayan datos por leer
                         self.dataOut.flagNoData = True
+                        print("No more data break...")
                         return 0
                     #self.dataOut.data = numpy.reshape(self.jrodataset[self.profileIndex,:],(1,-1))

schainpy/model/proc/jroproc_spectra.py +8 -5

                     self.dataOut.blockSize = blocksize
                     self.dataOut.flagShiftFFT = False
-                def run(self, nProfiles=None, nFFTPoints=None, pairsList=None, ippFactor=None, shift_fft=False, zeroPad=False):
+                def run(self, nProfiles=None, nFFTPoints=None, pairsList=None, ippFactor=None, shift_fft=False, zeroPad=False, zeroPoints=0):
                     try:
                         if ippFactor == None:
                             self.dataOut.ippFactor = 1
-                        self.dataOut.nFFTPoints = nFFTPoints
                         #print(" volts ch,prof, h: ", self.dataIn.data.shape)
                         if self.buffer is None:
                             if not zeroPad:
                                                        nProfiles,
                                                        self.dataIn.nHeights),
                                                       dtype='complex')
+                                zeroPoints = 0
                             else:
                                 self.buffer = numpy.zeros((self.dataIn.nChannels,
-                                                       nFFTPoints,
+                                                       nFFTPoints+int(zeroPoints),
                                                        self.dataIn.nHeights),
                                                       dtype='complex')
+                        self.dataOut.nFFTPoints = nFFTPoints + int(zeroPoints)
                         if self.dataIn.flagDataAsBlock:
                             nVoltProfiles = self.dataIn.data.shape[1]
+                            zeroPoints = 0
                             if nVoltProfiles == nProfiles or zeroPad:
                                 self.buffer = self.dataIn.data.copy()
                                 self.profIndex = nVoltProfiles
                         if self.firstdatatime == None:
                             self.firstdatatime = self.dataIn.utctime
-                        if self.profIndex == nProfiles or zeroPad:
+                        if self.profIndex == nProfiles or (zeroPad and zeroPoints==0):
                             self.__updateSpecFromVoltage()

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

                         for hk in self.heights_indx.flatten():
                             if dataOut.data.ndim < 3:
-                                dataOut.data[ch,hk] = 0 + 0j
+                                dataOut.data[ch,hk] = 0.0 + 0.0j
                             else:
-                                dataOut.data[ch,:,hk] =  0 + 0j
+                                dataOut.data[ch,:,hk] =  0.0 + 0.0j
                     dataOut.flagProfilesByRange = True

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