schain Commit - r1279:c53fe2a4a291 · Jicamarca Repository

Modificación a kmamisr para ejecutarse en la versión 3, creación de scripts con terminación v3 para difereciarlos, se comentó la linea #720 de JroIO_param.py debido a que reiniciaba la lista de archivos, ocasionando la reescritura del archivo hdf5. Alguna otra modificación aparente es producto de algunas variaciones en espacios al usar la función print()

joabAM -

r1279:c53fe2a4a291

parent child

Context file:

r1279:c53fe2a4a291

Collapse all files

schainpy/controller.py +5 0

                     '''
                     className = eval(self.name)
+                    #print(self.name)
                     kwargs = self.getKwargs()
+                    #print(kwargs)
+                    #print("mark_a")
                     procUnitObj = className(self.id, self.inputId, self.project_id, self.err_queue, self.lock, 'ProcUnit', **kwargs)
+                    #print("mark_b")
                     log.success('creating process...', self.name)
                     for opConfObj in self.opConfObjList:
                     self.datatype = datatype
                     if path != '':
                         self.path = os.path.abspath(path)
+                    print (self.path)
                     self.startDate = startDate
                     self.endDate = endDate
                     self.startTime = startTime

schainpy/model/data/jrodata.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file

NO CONTENT: modified file

schainpy/model/data/jroheaderIO.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file

NO CONTENT: modified file

schainpy/model/graphics/jroplot_base.py +2 -4

                         '{}{}_{}.png'.format(
                             self.CODE,
                             label,
-                            self.getDateTime(self.data.max_time).strftime(
+                            self.getDateTime(self.data.max_time).strftime('%Y%m%d_%H%M%S'),
-                                '%Y%m%d_%H%M%S'
-                                ),
                             )
                         )
                     log.log('Saving figure: {}'.format(figname), self.name)
                     if not os.path.isdir(os.path.dirname(figname)):
                         os.makedirs(os.path.dirname(figname))
                         self.__plot()
                     if self.data and self.pause:
                         figpause(10)

schainpy/model/io/jroIO_kamisr.py +37 -17

             from schainpy.model.data.jroheaderIO import RadarControllerHeader, SystemHeader
             from schainpy.model.data.jrodata import Voltage
-            from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation
+            from schainpy.model.proc.jroproc_base import ProcessingUnit, Operation, MPDecorator
             from numpy import imag
+            @MPDecorator
             class AMISRReader(ProcessingUnit):
                 '''
                 classdocs
                     self.amisrFilePointer = None
-                    self.dataset = None
+                    #self.dataset = None
                     self.__filename_online = None
                     #Is really necessary create the output object in the initializer
                     self.dataOut = Voltage()
+                    self.dataOut.error=False
                 def setup(self,path=None,
                                 startDate=None,
                                 nBaud = 0,
                                 online=False):
+                    #print ("T",path)
                     self.timezone = timezone
                     self.all = all
                     self.online = online
                     if not(self.filenameList):
                         print("There is no files into the folder: %s"%(path))
                         sys.exit(-1)
                     self.fileIndex = -1
                         fp = h5py.File(filename,'r')
                         time_str = fp.get('Time/RadacTimeString')
-                        startDateTimeStr_File = time_str[0][0].split('.')[0]
+                        startDateTimeStr_File = time_str[0][0].decode('UTF-8').split('.')[0]
+                        #startDateTimeStr_File = "2019-12-16 09:21:11"
                         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)
-                        endDateTimeStr_File = time_str[-1][-1].split('.')[0]
+                        #endDateTimeStr_File = "2019-12-16 11:10:11"
+                        endDateTimeStr_File = time_str[-1][-1].decode('UTF-8').split('.')[0]
                         junk = time.strptime(endDateTimeStr_File, '%Y-%m-%d %H:%M:%S')
                         endDateTime_File = datetime.datetime(junk.tm_year,junk.tm_mon,junk.tm_mday,junk.tm_hour, junk.tm_min, junk.tm_sec)
                         fp.close()
+                        #print("check time", startDateTime_File)
                         if self.timezone == 'lt':
                             startDateTime_File = startDateTime_File - datetime.timedelta(minutes = 300)
                             endDateTime_File = endDateTime_File - datetime.timedelta(minutes = 300)
                         if (endDateTime_File>=startDateTime_Reader and endDateTime_File<endDateTime_Reader):
                             #self.filenameList.remove(filename)
                             filter_filenameList.append(filename)
                         if not(idFile < len(self.filenameList)):
                             self.flagNoMoreFiles = 1
                             print("No more Files")
+                            self.dataOut.error = True
                             return 0
                         filename = self.filenameList[idFile]
                     re = buffer[:,:,:,0]
                     im = buffer[:,:,:,1]
                     dataset = re + im*1j
                     self.radacTime = self.amisrFilePointer.get('Raw11/Data/RadacHeader/RadacTime')
                     timeset = self.radacTime[:,0]
                     return dataset,timeset
                 def reshapeData(self):
                     nsamples = self.nsa
                     #Dimensions : nChannels, nProfiles, nSamples
-                    new_block = numpy.empty((nblocks, nchan, self.newProfiles, nsamples), dtype="complex64")
+                    new_block = numpy.empty((nblocks, nchan, numpy.int_(self.newProfiles), nsamples), dtype="complex64")
                     ############################################
                     for thisChannel in range(nchan):
                 def fillJROHeader(self):
                     #fill radar controller header
-                    self.dataOut.radarControllerHeaderObj = RadarControllerHeader(ippKm=self.__ippKm,
+                    self.dataOut.radarControllerHeaderObj = RadarControllerHeader(ipp=self.__ippKm,
                                                                                   txA=self.__txA,
                                                                                   txB=0,
                                                                                   nWindows=1,
                                                                                   code = self.__code,
                                                                                   fClock=1)
                     #fill system header
                     self.dataOut.systemHeaderObj = SystemHeader(nSamples=self.__nSamples,
                                                                 nProfiles=self.newProfiles,
                                                                 nChannels=len(self.__channelList),
                                                                 adcResolution=14,
-                                                                pciDioBusWith=32)
+                                                                pciDioBusWidth=32)
                     self.dataOut.type = "Voltage"
                     #self.dataOut.timeInterval = self.dataOut.ippSeconds * self.dataOut.nCohInt
                     self.dataOut.frequency = self.__frequency
                     self.dataOut.realtime = self.online
                     pass
                     if not(newFile):
                         return 0
                     #if self.__firstFile:
                     self.readAMISRHeader(self.amisrFilePointer)
                     self.createBuffers()
                     self.fillJROHeader()
                     #self.__firstFile = False
                     if self.endDate!=None:
                      endDateTime_Reader = datetime.datetime.combine(self.endDate,self.endTime)
                      time_str = self.amisrFilePointer.get('Time/RadacTimeString')
-                     startDateTimeStr_File = time_str[0][0].split('.')[0]
+                     startDateTimeStr_File = time_str[0][0].decode('UTF-8').split('.')[0]
                      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)
                      if self.timezone == 'lt':
                             return 0
-                    if self.dataset is None: # setear esta condicion cuando no hayan datos por leers
+                    if self.dataset is None: # setear esta condicion cuando no hayan datos por leer
                         self.dataOut.flagNoData = True
                         return 0
                     self.dataOut.data = self.jrodataset[:,self.profileIndex,:]
+                    #print("R_t",self.timeset)
                     #self.dataOut.utctime = self.jrotimeset[self.profileIndex]
                     #verificar basic header de jro data y ver si es compatible con este valor
                     #self.dataOut.utctime = self.timeset + (self.profileIndex * self.ippSeconds * self.nchannels)
                     indexprof = numpy.mod(self.profileIndex, self.newProfiles)
                     indexblock = self.profileIndex/self.newProfiles
-                    #print indexblock, indexprof
+                    #print (indexblock, indexprof)
-                    self.dataOut.utctime = self.timeset[indexblock] + (indexprof * self.ippSeconds * self.nchannels)
+                    diffUTC = 1.8e4 #UTC diference from peru in seconds --Joab
+                    diffUTC = 0
+                    t_comp = (indexprof * self.ippSeconds * self.nchannels) + diffUTC #
+                    #cambio posible 18/02/2020
+                    #print("utc :",indexblock," __ ",t_comp)
+                    #print(numpy.shape(self.timeset))
+                    self.dataOut.utctime = self.timeset[numpy.int_(indexblock)] + t_comp
+                    #self.dataOut.utctime = self.timeset[self.profileIndex] + t_comp
+                    #print(self.dataOut.utctime)
                     self.dataOut.profileIndex = self.profileIndex
                     self.dataOut.flagNoData = False
             #         if indexprof == 0:

schainpy/model/io/jroIO_param.py +1 -1

                     if os.path.exists(fullpath):
                         filesList = os.listdir( fullpath )
-                        filesList = [k for k in filesList if 'M' in k]
+                        ##filesList = [k for k in filesList if 'M' in k]
                         if len( filesList ) > 0:
                             filesList = sorted( filesList, key=str.lower )
                             filen = filesList[-1]

schainpy/model/proc/jroproc_base.py 0 -3

                         if self.inputId is None:
                             self.lock.wait()
                         self.sender.send_multipart([str(id).encode(), pickle.dumps(data)])
                     def runReader(self):
                         '''
                         Run fuction for read units
                                 continue
                             self.publish(self.dataOut, self.id)
                             if self.dataOut.error:
                                 break
                                 self.runProc()
                             else:
                                 self.runReader()
                         elif self.typeProc is "Operation":
                             self.subscribe()

schainpy/model/proc/jroproc_parameters.py +1 -1

                     self.dataOut.utctimeInit = self.dataIn.utctime
                     self.dataOut.paramInterval = self.dataIn.timeInterval
                     return
             #         error[indInvalid1] = 13
             #
             #         return heights, error
-  No newline at end of file

schainpy/model/proc/jroproc_spectra.py 0 0

NO CONTENT: modified file

schainpy/model/proc/jroproc_voltage.py 0 -1

                     self.nCode = len(code)
                     self.nBaud = len(code[0])
                     if (osamp != None) and (osamp >1):
                         self.osamp = osamp
                         self.code = numpy.repeat(code, repeats=self.osamp, axis=1)

schainpy/model/utils/jroutils_ftp.py 0 0

NO CONTENT: modified file

schainpy/model/utils/jroutils_publish.py 0 0

NO CONTENT: modified file

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