diff --git a/schainpy/model/proc/jroproc_base.py b/schainpy/model/proc/jroproc_base.py index 3b87703..0a58e50 100644 --- a/schainpy/model/proc/jroproc_base.py +++ b/schainpy/model/proc/jroproc_base.py @@ -64,6 +64,10 @@ class ProcessingUnit(object): self.args = args self.kwargs = kwargs + + if not hasattr(self, 'name'): + self.name = self.__class__.__name__ + checkKwargs(self.run, kwargs) def getAllowedArgs(self): @@ -309,6 +313,8 @@ class Operation(object): self.__buffer = None self.isConfig = False self.kwargs = kwargs + if not hasattr(self, 'name'): + self.name = self.__class__.__name__ checkKwargs(self.run, kwargs) def getAllowedArgs(self): diff --git a/schainpy/model/proc/jroproc_parameters.py b/schainpy/model/proc/jroproc_parameters.py index 5e52bfa..113190d 100644 --- a/schainpy/model/proc/jroproc_parameters.py +++ b/schainpy/model/proc/jroproc_parameters.py @@ -1408,18 +1408,18 @@ class SpectralMoments(Operation): def __calculateMoments(self, oldspec, oldfreq, n0, nicoh = None, graph = None, smooth = None, type1 = None, fwindow = None, snrth = None, dc = None, aliasing = None, oldfd = None, wwauto = None): - if (nicoh == None): nicoh = 1 - if (graph == None): graph = 0 - if (smooth == None): smooth = 0 + if (nicoh is None): nicoh = 1 + if (graph is None): graph = 0 + if (smooth is None): smooth = 0 elif (self.smooth < 3): smooth = 0 - if (type1 == None): type1 = 0 - if (fwindow == None): fwindow = numpy.zeros(oldfreq.size) + 1 - if (snrth == None): snrth = -3 - if (dc == None): dc = 0 - if (aliasing == None): aliasing = 0 - if (oldfd == None): oldfd = 0 - if (wwauto == None): wwauto = 0 + if (type1 is None): type1 = 0 + if (fwindow is None): fwindow = numpy.zeros(oldfreq.size) + 1 + if (snrth is None): snrth = -3 + if (dc is None): dc = 0 + if (aliasing is None): aliasing = 0 + if (oldfd is None): oldfd = 0 + if (wwauto is None): wwauto = 0 if (n0 < 1.e-20): n0 = 1.e-20 @@ -1719,7 +1719,7 @@ class SpectralFitting(Operation): error1 = p0*numpy.nan #Save - if self.dataOut.data_param == None: + if self.dataOut.data_param is None: self.dataOut.data_param = numpy.zeros((nGroups, p0.size, nHeights))*numpy.nan self.dataOut.data_error = numpy.zeros((nGroups, p0.size + 1, nHeights))*numpy.nan @@ -2382,7 +2382,7 @@ class WindProfiler(Operation): self.__isConfig = True - if self.__buffer == None: + if self.__buffer is None: self.__buffer = dataOut.data_param self.__firstdata = copy.copy(dataOut) @@ -2424,7 +2424,7 @@ class WindProfiler(Operation): else: mode = 'SA' #Borrar luego esto - if dataOut.groupList == None: + if dataOut.groupList is None: dataOut.groupList = [(0,1),(0,2),(1,2)] groupList = dataOut.groupList C = 3e8 @@ -2446,7 +2446,7 @@ class WindProfiler(Operation): self.__isConfig = True - if self.__buffer == None: + if self.__buffer is None: self.__buffer = dataOut.data_param self.__firstdata = copy.copy(dataOut) @@ -2808,7 +2808,7 @@ class SMDetection(Operation): #Getting Pairslist - if channelPositions == None: + if channelPositions is None: # channelPositions = [(2.5,0), (0,2.5), (0,0), (0,4.5), (-2,0)] #T channelPositions = [(4.5,2), (2,4.5), (2,2), (2,0), (0,2)] #Estrella meteorOps = SMOperations() @@ -2939,7 +2939,7 @@ class SMDetection(Operation): # arrayFinal = arrayParameters.reshape((1,arrayParameters.shape[0],arrayParameters.shape[1])) dataOut.data_param = arrayParameters - if arrayParameters == None: + if arrayParameters is None: dataOut.flagNoData = True else: dataOut.flagNoData = True @@ -3475,7 +3475,7 @@ class CorrectSMPhases(Operation): arrayParameters[:,8:12] = numpy.angle(numpy.exp(1j*(arrayParameters[:,8:12] + phaseOffsets))) meteorOps = SMOperations() - if channelPositions == None: + if channelPositions is None: # channelPositions = [(2.5,0), (0,2.5), (0,0), (0,4.5), (-2,0)] #T channelPositions = [(4.5,2), (2,4.5), (2,2), (2,0), (0,2)] #Estrella @@ -3652,7 +3652,7 @@ class SMPhaseCalibration(Operation): self.__isConfig = True - if self.__buffer == None: + if self.__buffer is None: self.__buffer = dataOut.data_param.copy() else: