diff --git a/schainpy/model/io/jroIO_param.py b/schainpy/model/io/jroIO_param.py index e8ad20e..4785bd1 100644 --- a/schainpy/model/io/jroIO_param.py +++ b/schainpy/model/io/jroIO_param.py @@ -386,7 +386,7 @@ class HDFWriter(Operation): self.description = description self.set_kwargs(**kwargs) #print("self.uniqueChannel: ", self.uniqueChannel) - #self.uniqueChannel = uniqueChannel + self.uniqueChannel = uniqueChannel if self.metadataList is None: self.metadataList = self.dataOut.metadata_list @@ -405,7 +405,7 @@ class HDFWriter(Operation): if dataAux is None: continue - elif isinstance(dataAux, (int, float, numpy.integer, numpy.float)): + elif isinstance(dataAux, (int, float, numpy.integer, numpy.float_)): dsDict['nDim'] = 0 else: if self.uniqueChannel: #Creates extra dimension to avoid the creation of multiple channels diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 09ea4b9..65fc81d 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -183,9 +183,8 @@ class selectHeights(Operation): """ self.dataOut = dataOut - - if minHei and maxHei: - #if 1: + #if minHei and maxHei: + if 1: if minHei == None: minHei = self.dataOut.heightList[0] @@ -201,10 +200,8 @@ class selectHeights(Operation): minIndex = 0 maxIndex = 0 heights = self.dataOut.heightList - inda = numpy.where(heights >= minHei) indb = numpy.where(heights <= maxHei) - try: minIndex = inda[0][0] except: @@ -218,7 +215,6 @@ class selectHeights(Operation): self.selectHeightsByIndex(minIndex, maxIndex) #print(self.dataOut.nHeights) - return self.dataOut def selectHeightsByIndex(self, minIndex, maxIndex): @@ -239,6 +235,7 @@ class selectHeights(Operation): """ if self.dataOut.type == 'Voltage': + #print("SOS",minIndex, maxIndex) if (minIndex < 0) or (minIndex > maxIndex): raise ValueError("Height index range (%d,%d) is not valid" % (minIndex, maxIndex)) @@ -11531,7 +11528,7 @@ class Decoder(Operation): self.ndatadec = self.__nHeis #- self.nBaud + 1 - self.datadecTime = numpy.zeros((self.__nChannels, self.__nProfiles, self.ndatadec), dtype=numpy.complex) + self.datadecTime = numpy.zeros((self.__nChannels, self.__nProfiles, self.ndatadec), dtype=numpy.complex_) else: