diff --git a/schainpy/model/data/jrodata.py b/schainpy/model/data/jrodata.py index 5245748..c78066c 100644 --- a/schainpy/model/data/jrodata.py +++ b/schainpy/model/data/jrodata.py @@ -445,7 +445,7 @@ class Voltage(JROData): if type == 1: noise = self.getNoisebyHildebrand(channel) - return 10*numpy.log10(noise) + return noise def getPower(self, channel = None): diff --git a/schainpy/model/proc/jroproc_spectra.py b/schainpy/model/proc/jroproc_spectra.py index d7077fc..f901976 100644 --- a/schainpy/model/proc/jroproc_spectra.py +++ b/schainpy/model/proc/jroproc_spectra.py @@ -135,21 +135,24 @@ class SpectraProc(ProcessingUnit): dtype='complex') if self.dataIn.flagDataAsBlock: + #data dimension: [nChannels, nProfiles, nSamples] + nVoltProfiles = self.dataIn.data.shape[1] + nVoltProfiles = self.dataIn.nProfiles - if self.dataIn.nProfiles == nProfiles: + if nVoltProfiles == nProfiles: self.buffer = self.dataIn.data.copy() - self.profIndex = nProfiles + self.profIndex = nVoltProfiles - elif self.dataIn.nProfiles < nProfiles: + elif nVoltProfiles < nProfiles: if self.profIndex == 0: self.id_min = 0 - self.id_max = self.dataIn.nProfiles + self.id_max = nVoltProfiles self.buffer[:,self.id_min:self.id_max,:] = self.dataIn.data - self.profIndex += self.dataIn.nProfiles - self.id_min += self.dataIn.data.shape[1] - self.id_max += self.dataIn.data.shape[1] + self.profIndex += nVoltProfiles + self.id_min += nVoltProfiles + self.id_max += nVoltProfiles else: raise ValueError, "The type object %s has %d profiles, it should be equal to %d profiles"%(self.dataIn.type,self.dataIn.data.shape[1],nProfiles) self.dataOut.flagNoData = True diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 476ff72..2567053 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -502,6 +502,7 @@ class CohInt(Operation): Si la data es leida por bloques, dimension = [nChannels, nProfiles, nHeis] """ avgdata, avgdatatime = self.integrateByBlock(dataOut) + dataOut.nProfiles /= self.n else: avgdata, avgdatatime = self.integrate(dataOut.data, dataOut.utctime) diff --git a/schainpy/scripts/readSchainFile.py b/schainpy/scripts/readSchainFile.py new file mode 100644 index 0000000..aaf825b --- /dev/null +++ b/schainpy/scripts/readSchainFile.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python +''' +Created on Jul 7, 2014 + +@author: roj-idl71 +''' +import os, sys + +schainpy_path = os.path.dirname(os.getcwd()) +source_path = os.path.dirname(schainpy_path) +sys.path.insert(0, source_path) + +from schainpy.controller_api import ControllerThread + +def main(): + desc = "Segundo Test" + filename = "/Users/miguel/Downloads/mst_blocks.xml" + + controllerObj = ControllerThread() + controllerObj.readXml(filename) + + #Configure use of external plotter before start + plotterObj = controllerObj.useExternalPlotter() + ######################################## + + controllerObj.start() + plotterObj.start() + + +if __name__ == '__main__': + import time + start_time = time.time() + main() + print("--- %s seconds ---" % (time.time() - start_time)) \ No newline at end of file