schain Commit - r1751:2d2f96339643 · Jicamarca Repository

test 2

joabAM -

r1751:2d2f96339643

parent child

Context file:

r1751:2d2f96339643

Collapse all files

schainpy/model/data/jrodata.py +6 -2

                 @property
                 def ltctime(self):
+                    try:
+                        self.timeZone = self.timeZone.decode("utf-8")
+                    except Exception as e:
+                        pass
                     if self.useLocalTime:
                         if self.timeZone =='lt':
                             return self.utctime - 300 * 60
                         elif self.timeZone =='ut':
                             return self.utctime
                         else:
-                            log.error("No valid timeZone detected")
+                            log.error("No valid timeZone detected:{}".format(self.timeZone))
                     return self.utctime
                 @property

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

                 def update(self, dataOut):
                     self.update_list(dataOut)
                     data = {
-                        'pow': 10*numpy.log10(dataOut.data_pow/dataOut.normFactor)
+                        'pow': 10*numpy.log10(dataOut.data_pow)
                     }
                     try:
                         data['noise'] = 10*numpy.log10(dataOut.getNoise()/dataOut.normFactor)

schainpy/model/graphics/jroplot_spectra.py +8 -9

                                                    cmap=plt.get_cmap(self.colormap)
                                                    )
                             if self.showprofile:
-                                ax.plot_profile = self.pf_axes[n].plot(
+                                ax.plot_profile = self.pf_axes[n].plot(data[self.CODE][n], self.y)[0]
-                                    data[self.CODE][n], self.y)[0]
                                 if "noise" in self.data:
                                     ax.plot_noise = self.pf_axes[n].plot(numpy.repeat(data['noise'][n], len(self.y)), self.y,
                                                                      color="k", linestyle="dashed", lw=1)[0]
                         else:
-                            ax.collections.remove(ax.collections[0]) #  error while running in 3.12
+                            ax.collections.remove(ax.collections[0])
                             ax.plt = ax.pcolormesh(x, y, z[n].T,
                                                    vmin=self.zmin,
                                                    vmax=self.zmax,
                             if self.showprofile:
                                 ax.plot_profile.set_data(data[self.CODE][n], self.y)
                                 if "noise" in self.data:
-                                    ax.plot_noise = self.pf_axes[n].plot(numpy.repeat(data['noise'][n], len(self.y)), self.y,
+                                    ax.plot_noise.set_data(numpy.repeat(data['noise'][n], len(self.y)), self.y)
-                                                                     color="k", linestyle="dashed", lw=1)[0]
             class SpectrogramPlot(Plot):
                 '''
                                                    cmap=plt.get_cmap(self.colormap)
                                                    )
                         else:
-                            # ax.collections.remove(ax.collections[0]) #  error while running
+                            ax.collections.remove(ax.collections[0]) #  error while running
                             ax.plt = ax.pcolormesh(x, y, z[n].T,
                                                    vmin=self.zmin,
                                                    vmax=self.zmax,
                                 ax.plot_profile = self.pf_axes[n].plot(data['noiseless_rti'][n], self.y)[0]
                         else:
-                            # ax.collections.remove(ax.collections[0]) #  error while running
+                            ax.collections.remove(ax.collections[0]) #  error while running
                             ax.plt = ax.pcolormesh(x, y, z[n].T,
                                                    vmin=self.zmin,
                                                    vmax=self.zmax,
                         else:
                             if self.zlimits is not None:
                                 self.zmin, self.zmax = self.zlimits[n]
-                            # ax.collections.remove(ax.collections[0]) #  error while running
+                            ax.collections.remove(ax.collections[0]) #  error while running
                             ax.plt = ax.pcolormesh(x, y, z[n].T ,
                                                    vmin=self.zmin,
                                                    vmax=self.zmax,
                         else:
                             if self.zlimits is not None:
                                 self.zmin, self.zmax = self.zlimits[n]
-                            # ax.collections.remove(ax.collections[0]) #  error while running
+                            ax.collections.remove(ax.collections[0]) #  error while running
                             ax.plt = ax.pcolormesh(x, y, z[n].T ,
                                                    vmin=self.zmin,
                                                    vmax=self.zmax,

schainpy/model/io/jroIO_param.py +3 -2

                     self.__readMetadata2()
                     self.__readData()
                     self.__setBlockList()
-                    if 'type' in self.meta:
+                    # if 'type' in self.meta:
-                        self.dataOut = eval(self.meta['type'])()
+                    #     self.dataOut = eval(self.meta['type'])()
                     for attr in self.meta:
                         if "processingHeaderObj" in attr:
                     Reads Metadata
                     '''
                     meta = {}
                     if self.description:
                         for key, value in self.description['Metadata'].items():
                             meta[key] = self.fp[value][()]

schainpy/model/io/utilsIO.py +24 -13

                 def readFile(self,fp,ch):
                     '''Read metadata and data'''
                     self.readMetadata(fp,ch)
-                    #print(self.metadataList)
+                    # print(self.metadataList)
                     data = self.readData(fp)
                     for attr in self.meta:
                         if "processingHeaderObj" in attr:
                         if "radarControllerHeaderObj" in attr:
                             self.flagControllerHeader=True
                         at = attr.split('.')
-                        #print("AT ", at)
+                        # print("AT ", at)
                         if len(at) > 1:
                             setattr(eval("self.ch_dataIn[ch]."+at[0]),at[1], self.meta[attr])
                         else:
                             setattr(dataIn, attr, data[attr][:])
                         else:
                             setattr(dataIn, attr, numpy.squeeze(data[attr][:,:]))
-                    #print("shape in", dataIn.data_spc.shape, len(dataIn.data_spc))
+                    # print("shape in", dataIn.data_spc.shape, len(dataIn.data_spc))
                     if self.flag_spc:
                         if dataIn.data_spc.ndim > 3:
                             dataIn.data_spc = dataIn.data_spc[0]
                                     setattr(self.ch_dataIn[ich], self.dataList[i], dataAux[0:self.blocksPerFile])
                                     # print(getattr(self.ch_dataIn[ich], self.dataList[i]).shape)
                     else:
+                        # log.error("Channels number error,iresh_ch=", iresh_ch)
                         return
                 def getLabel(self, name, x=None):
                     if x is None:
                             return 'pair{:02d}'.format(x)
                         else:
                             return 'channel{:02d}'.format(x)
                 def readData(self, fp):
-                    #print("read fp: ", fp)
+                    # print("read fp: ", fp)
                     data = {}
                     grp = fp['Data']
                     for name in grp:
                             self.flag_snr = True
                         if "nIncohInt" in name:
                             self.flag_nIcoh = True
+                        # print("spc:",self.flag_spc," pow:",self.flag_pow," snr:", self.flag_snr)
                         if isinstance(grp[name], h5py.Dataset):
                             array = grp[name][()]
                         elif isinstance(grp[name], h5py.Group):
                             print('Unknown type: {}'.format(name))
                         data[name] = array
                     return data
                 def getDataOut(self):
+                    # print("Getting DataOut")
                     self.dataOut = self.ch_dataIn[0].copy()  #dataIn    #blocks, fft, hei for metadata
                     if self.flagProcessingHeader:
                         self.dataOut.processingHeaderObj = self.ch_dataIn[0].processingHeaderObj.copy()
                     else:
                          self.dataOut.nIncohInt = self.ch_dataIn[0].nIncohInt
                     #--------------------------------------------------------------------
-                    #print("utcTime: ", time.shape)
+                    # print("utcTime: ", time.shape)
-                    #print("data_spc ",self.dataOut.data_spc.shape)
+                    # print("data_spc ",self.dataOut.data_spc.shape)
                     if "data_cspc" in self.dataList:
                         pairsList = [pair for pair in itertools.combinations(self.channelList, 2)]
                         #print("PairsList: ", pairsList)
                             grp.create_dataset(self.getLabel(attribute), data=value)
                     return
                 def getDsList(self):
+                    # print("Getting DS List", self.dataList)
                     dsList =[]
+                    dataAux = None
                     for i in range(len(self.dataList)):
                         dsDict = {}
                         if hasattr(self.dataOut, self.dataList[i]):
                             continue
                         if dataAux is None:
                             continue
-                        elif isinstance(dataAux, (int, float, numpy.integer, numpy.float)):
+                        elif isinstance(dataAux, (int, float, numpy.int_, numpy.float_)):
                             dsDict['nDim'] = 0
                         else:
                             dsDict['nDim'] = len(dataAux.shape) -1
                             #     dsDict['dsNumber'] = dataAux.shape[0]
                             #     dsDict['dtype'] = dataAux.dtype
                         dsList.append(dsDict)
-                    #print(dsList)
+                    # print("dsList: ", dsList)
                     self.dsList = dsList
                 def clean_dataIn(self):
                     for ch in range(self.nChannels):
                         self.ch_dataIn[ch].data_spc = None
                         self.ch_dataIn[ch].nIncohInt = None
                     self.meta ={}
                     self.blocksPerFile = None
                 def writeData(self, outFilename):
                     self.getDsList()
                     fp = h5py.File(outFilename, 'w')
+                    # print("--> Merged file: ",fp)
                     self.writeMetadata(fp)
                     grp = fp.create_group('Data')
                     dtsets = []
                             else:
                                 sgrp = grp
                             k = -1*(dsInfo['nDim'] - 1)
-                            #print(k, dsInfo['shape'], dsInfo['shape'][k:])
+                            # print(k, dsInfo['shape'], dsInfo['shape'][k:])
                             for i in range(dsInfo['dsNumber']):
                                 ds = sgrp.create_dataset(
                                     self.getLabel(dsInfo['variable'], i),(self.blocksPerFile, ) + dsInfo['shape'][k:],
                     fp.close()
                     self.clean_dataIn()
                     return
                 def run(self):
                     if not(self.isConfig):
                         self.setup()
                             name = self.filenameList[ch][nf]
                             filename = os.path.join(self.inPaths[ch], name)
                             fp = h5py.File(filename, 'r')
-                            #print("Opening file: ",filename)
+                            print("Opening file: ",filename)
                             self.readFile(fp,ch)
                             fp.close()
                         if self.blocksPerFile == None:
                             print("Error getting DataOut invalid number of blocks")
                             return
                         name = name[-16:]
-                        #print("Final name out: ", name)
+                        # print("Final name out: ", name)
                         outFile = os.path.join(self.pathOut, name)
-                        #print("Outfile: ", outFile)
+                        # print("Outfile: ", outFile)
                         self.writeData(outFile)

schainpy/model/proc/jroproc_spectra.py +4 -3

                 def run(self, nProfiles=None, nFFTPoints=None, pairsList=None, ippFactor=None, shift_fft=False,
                         zeroPad=False, zeroPoints=0, runNextUnit=0):
                     self.dataIn.runNextUnit = runNextUnit
                     try:
-                        type = self.dataIn.type.decode("utf-8")
+                        _type = self.dataIn.type.decode("utf-8")
-                        self.dataIn.type = type
+                        self.dataIn.type = _type
                     except Exception as e:
-                        # print("spc -> ",e)
+                        #print("spc -> ",self.dataIn.type, e)
                         pass
                     if self.dataIn.type == "Spectra":

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