diff --git a/schainpy/model/data/jrodata.py b/schainpy/model/data/jrodata.py index 961af38..5c44d60 100644 --- a/schainpy/model/data/jrodata.py +++ b/schainpy/model/data/jrodata.py @@ -86,8 +86,6 @@ def hildebrand_sekhon(data, navg): sumq += sortdata[j]**2 - j += 1 - if j > nums_min: rtest = float(j)/(j-1) + 1.0/navg if ((sumq*j) > (rtest*sump**2)): @@ -95,7 +93,9 @@ def hildebrand_sekhon(data, navg): sump = sump - sortdata[j] sumq = sumq - sortdata[j]**2 cont = 0 - + + j += 1 + lnoise = sump /j stdv = numpy.sqrt((sumq - lnoise**2)/(j - 1)) return lnoise diff --git a/schainpy/model/io/jroIO_voltage.py b/schainpy/model/io/jroIO_voltage.py index 5537f1f..296550c 100644 --- a/schainpy/model/io/jroIO_voltage.py +++ b/schainpy/model/io/jroIO_voltage.py @@ -344,16 +344,15 @@ class VoltageReader(JRODataReader, ProcessingUnit): If nTxs > 1 then one profile is divided by nTxs and number of total blocks is increased by nTxs (nProfiles *= nTxs) """ + self.dataOut.flagDataAsBlock = False + if self.nTxs == 1: - self.dataOut.flagDataAsBlock = False self.dataOut.data = self.datablock[:,self.profileIndex,:] self.dataOut.profileIndex = self.profileIndex self.profileIndex += 1 else: - self.dataOut.flagDataAsBlock = False - iniHei_ForThisTx = (self.txIndex)*int(self.processingHeaderObj.nHeights/self.nTxs) endHei_ForThisTx = (self.txIndex+1)*int(self.processingHeaderObj.nHeights/self.nTxs) @@ -374,9 +373,9 @@ class VoltageReader(JRODataReader, ProcessingUnit): """ self.dataOut.flagDataAsBlock = True self.dataOut.data = self.datablock - self.dataOut.profileIndex = self.processingHeaderObj.profilesPerBlock - 1 + self.dataOut.profileIndex = self.processingHeaderObj.profilesPerBlock - self.profileIndex = self.processingHeaderObj.profilesPerBlock - 1 + self.profileIndex = self.processingHeaderObj.profilesPerBlock self.dataOut.flagNoData = False diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index f8bbd49..2ad223c 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -626,7 +626,7 @@ class Decoder(Operation): return self.datadecTime - def run(self, dataOut, code=None, nCode=None, nBaud=None, mode = 0, osamp=None): + def run(self, dataOut, code=None, nCode=None, nBaud=None, mode = 0, osamp=None, times=None): if not self.isConfig: diff --git a/schainpy/scripts/test_mst_blocks.py b/schainpy/scripts/test_mst_blocks.py index dcdb7a6..4801eb6 100644 --- a/schainpy/scripts/test_mst_blocks.py +++ b/schainpy/scripts/test_mst_blocks.py @@ -5,7 +5,7 @@ import datetime path = os.path.split(os.getcwd())[0] path = os.path.split(path)[0] -sys.path.append(path) +sys.path.insert(0, path) from schainpy.controller import Project