schain Commit - r1653:f661d02a9309 · Jicamarca Repository

jroplot_parameters.py jroplot_spectra.py jroIO_digitalRF.py jroproc_parameters.py sophy_proc.py

eynilupu -

r1653:f661d02a9309

parent child

Context file:

r1653:f661d02a9309

schainpy/model/graphics/jroplot_parameters.py +12 -1

                     if hasattr(dataOut, 'dparam'):
                         tmp = getattr(dataOut, 'data_param')
                     else:
+                        #print("-------------------self.attr_data[0]",self.attr_data[0])
                         if 'S' in self.attr_data[0]:
+                            if self.attr_data[0]=='S':
                                 tmp = 10*numpy.log10(10.0*getattr(dataOut, 'data_param')[:,0,:]/(factor))
+                            if self.attr_data[0]=='SNR':
+                                tmp = 10*numpy.log10(getattr(dataOut, 'data_param')[:,3,:])
                         else:
                             tmp = getattr(dataOut, 'data_param')[:,vars[self.attr_data[0]],:]
                     data['azi'] = dataOut.data_azi
                     data['ele'] = dataOut.data_ele
+                    if isinstance(dataOut.mode_op, bytes):
+                        try:
+                            dataOut.mode_op = dataOut.mode_op.decode()
+                        except:
+                            dataOut.mode_op = str(dataOut.mode_op, 'utf-8')
                     data['mode_op'] = dataOut.mode_op
                     self.mode = dataOut.mode_op
                             gl.ylabel_style = {'size': 8}
                             gl.xlabels_top = False
                             gl.ylabels_right = False
+                            #self.shapes="/home/soporte/workspace/sirm/volumes/schain/shapes/"
+                            #print("self.shapes",self.shapes)
                             shape_p = os.path.join(self.shapes,'PER_ADM2/PER_ADM2.shp')
                             shape_d = os.path.join(self.shapes,'PER_ADM1/PER_ADM1.shp')
                             capitales = os.path.join(self.shapes,'CAPITALES/cap_provincia.shp')

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

                     data['spc'] = spc
                     data['rti'] = dataOut.getPower()
                     data['noise'] = 10*numpy.log10(dataOut.getNoise()/dataOut.normFactor)
-                    meta['xrange'] = (dataOut.getFreqRange(1)/1000., dataOut.getAcfRange(1), dataOut.getVelRange(1))
+                    meta['xrange'] = (dataOut.getFreqRange(0)/1000., dataOut.getAcfRange(1), dataOut.getVelRange(0))
                     if self.CODE == 'spc_moments':
                         data['moments'] = dataOut.moments

schainpy/model/io/jroIO_digitalRF.py +32 -13

             import pickle
             try:
+                os.environ["HDF5_USE_FILE_LOCKING"] = "FALSE"
                 import digital_rf
             except:
                 pass
                     self.getByBlock     = getByBlock
                     self.nProfileBlocks = nProfileBlocks
+                    if online:
+                        print('Waiting for RF data..')
+                        sleep(40)
                     if not os.path.isdir(path):
                         raise ValueError("[Reading] Directory %s does not exist" % path)
+                    #print("path",path)
                     try:
                         self.digitalReadObj = digital_rf.DigitalRFReader(
                             path, load_all_metadata=True)
                     if startDate:
                         startDatetime  = datetime.datetime.combine(startDate, startTime)
                         startUTCSecond = (
-                            startDatetime - datetime.datetime(1970, 1, 1)).total_seconds() + self.__timezone
+                            startDatetime - datetime.datetime(1970, 1, 1)).total_seconds()# + self.__timezone
                     if endDate:
                         endDatetime   = datetime.datetime.combine(endDate, endTime)
                         endUTCSecond  = (endDatetime - datetime.datetime(1970,
-, 1)).total_seconds() + self.__timezone
+, 1)).total_seconds()# + self.__timezone
+                    start_index, end_index = self.digitalReadObj.get_bounds(channelNameList[channelList[0]])
+                    if start_index==None or end_index==None:
-                    #print(startUTCSecond,endUTCSecond)
+                         print("Check error No data,  start_index: ",start_index,",end_index: ",end_index)
-                    start_index, end_index = self.digitalReadObj.get_bounds(
+                         #return 0
-                        channelNameList[channelList[0]])
-                    #print("*****",start_index,end_index)
                     if not startUTCSecond:
                         startUTCSecond = start_index / self.__sample_rate
                     if start_index     > startUTCSecond * self.__sample_rate:
                         startUTCSecond = start_index / self.__sample_rate
                     if not endUTCSecond:
                         endUTCSecond   = end_index / self.__sample_rate
                     if end_index       < endUTCSecond * self.__sample_rate:
                         endUTCSecond   = end_index / self.__sample_rate #Check UTC and LT time
                     if not nSamples:
                         if not ippKm:
                             raise ValueError("[Reading] nSamples or ippKm should be defined")
                     #self.__data_buffer    = numpy.zeros(
                     #    (self.__num_subchannels, self.__samples_to_read), dtype=numpy.complex)
+                    print("samplestoread",self.__samples_to_read)
                     self.__data_buffer    = numpy.zeros((int(len(channelList)), self.__samples_to_read), dtype=numpy.complex)
                     ))
                     print("[Reading] Starting process from %s to %s" % (datetime.datetime.utcfromtimestamp(startUTCSecond - self.__timezone),
-                                                                        datetime.datetime.utcfromtimestamp(
+                                                                        datetime.datetime.utcfromtimestamp(endUTCSecond - self.__timezone)))
-                        endUTCSecond - self.__timezone)
-                    ))
                     self.oldAverage    = None
                     self.count         = 0
                     self.executionTime = 0
                         for indexSubchannel in range(self.__num_subchannels):
                             try:
                                 t0     = time()
+                                #print("thisUNixSample",self.__thisUnixSample)
                                 result = self.digitalReadObj.read_vector_c81d(self.__thisUnixSample,
                                                                               self.__samples_to_read,
                                                                               thisChannelName, sub_channel=indexSubchannel)
+                                #print("result--------------",result)
                                 self.executionTime  = time() - t0
                                 if self.oldAverage is None:
                                     self.oldAverage = self.executionTime
                                 # read next profile
                                 self.__flagDiscontinuousBlock = True
                                 print("[Reading] %s" % datetime.datetime.utcfromtimestamp(self.thisSecond - self.__timezone), e)
+                                bot = 0
+                                while(self.__flagDiscontinuousBlock):
+                                    bot +=1
+                                    self.__thisUnixSample += self.__sample_rate
+                                    try:
+                                        result = result = self.digitalReadObj.read_vector_c81d(self.__thisUnixSample,self.__samples_to_read,thisChannelName, sub_channel=indexSubchannel)
+                                        self.__flagDiscontinuousBlock=False
+                                        print("Searching.. N°: ",bot,"Success",self.__thisUnixSample)
+                                    except:
+                                        print("Searching...N°: ",bot,"Fail", self.__thisUnixSample)
+                                if self.__flagDiscontinuousBlock==True:
                                     break
+                                else:
+                                    print("New data index found...",self.__thisUnixSample)
+                                #break
                             if result.shape[0] != self.__samples_to_read:
                                 self.__flagDiscontinuousBlock = True

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

                     self.nHeis    = dataOut.nHeights
                     self.min_index= min_index
                     deltaHeight   = dataOut.heightList[1] - dataOut.heightList[0]
-                    self.Range    = numpy.arange(dataOut.nHeights)*deltaHeight + dataOut.heightList[0]+min_index*deltaHeight
+                    #self.Range    = numpy.arange(dataOut.nHeights)*deltaHeight + dataOut.heightList[0]+min_index*deltaHeight
+                    self.Range    = dataOut.heightList
+                    print(self.Range, flush=True)
                     self.Range    = self.Range.reshape(1,self.nHeis)
                     self.Range    = numpy.tile(self.Range,[self.nCh,1])
                     '''-----------1 Constante del Radar----------'''

schainpy/scripts/sophy_proc.py +2 -2

                     opObj10 = proc1.addOperation(name="WeatherRadar")
                     opObj10.addParameter(name='tauW',value=(1e-6/sample_rate)*len(code[0]))
-                    opObj10.addParameter(name='Pt',value=((1e-6/sample_rate)*len(code[0])/ipp)*200)
+                    opObj10.addParameter(name='Pt',value=200)
                     op = proc1.addOperation(name='PedestalInformation')
                     op.addParameter(name='path', value=path_ped, format='str')
                     opObj10 = proc2.addOperation(name="WeatherRadar")
                     opObj10.addParameter(name='tauW',value=(1e-6/sample_rate)*len(code[0]))
-                    opObj10.addParameter(name='Pt',value=((1e-6/sample_rate)*len(code[0])/ipp)*200)
+                    opObj10.addParameter(name='Pt',value=200)
                     op = proc2.addOperation(name='PedestalInformation')
                     op.addParameter(name='path', value=path_ped, format='str')

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