schain Commit - r1552:634b09aabe58 · Jicamarca Repository

Fix HDFReader, update metadata list for spectra

Juan C. Espinoza -

r1552:634b09aabe58

parent child

Context file:

r1552:634b09aabe58

Collapse all files

schainpy/model/data/jrodata.py +8 -9

                 def __str__(self):
-                    return '{} - {}'.format(self.type, self.datatime())
+                    return '{} - {}'.format(self.type, self.datatime)
                 def getNoise(self):
                     self.ippFactor = 1
                     self.beacon_heiIndexList = []
                     self.noise_estimation = None
+                    self.spc_noise = None
                     self.metadata_list = ['type', 'heightList', 'timeZone', 'pairsList', 'channelList', 'nCohInt',
-                        'code', 'nCode', 'nBaud', 'ippSeconds', 'ipp', 'nIncohInt', 'nFFTPoints', 'nProfiles']
+                        'code', 'nCode', 'nBaud', 'ippSeconds', 'ipp', 'nIncohInt', 'nFFTPoints', 'nProfiles', 'flagDecodeData']
                 def getNoisebyHildebrand(self, xmin_index=None, xmax_index=None, ymin_index=None, ymax_index=None):
                     """
                 def getNoise(self, xmin_index=None, xmax_index=None, ymin_index=None, ymax_index=None):
-                    if self.noise_estimation is not None:
+                    if self.spc_noise is not None:
+                        # this was estimated by getNoise Operation defined in jroproc_parameters.py
+                        return self.spc_noise
+                    elif self.noise_estimation is not None:
                         # this was estimated by getNoise Operation defined in jroproc_spectra.py
                         return self.noise_estimation
                     else:
                 nAvg = None
                 noise_estimation = None
                 GauSPC = None  # Fit gaussian SPC
+                spc_noise = None
                 def __init__(self):
                     '''
                     return
-                def getNoise(self):
-                    return self.spc_noise
-                noise = property(getNoise, setValue, "I'm the 'Noise' property.")
             class PlotterData(object):
                 '''

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

                     self.__readMetadata()
                     self.__readData()
                     self.__setBlockList()
-                    if 'type' in self.meta:
-                        self.dataOut = eval(self.meta['type'])()
                     for attr in self.meta:
                         setattr(self.dataOut, attr, self.meta[attr])
                     self.getData()
+                    if 'type' in self.meta:
+                        self.dataOut.type = self.meta['type'].decode('utf-8')
                     return
             @MPDecorator

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