diff --git a/schainpy2/Data/JROData.py b/schainpy2/Data/JROData.py index 10120c0..5d0a31a 100644 --- a/schainpy2/Data/JROData.py +++ b/schainpy2/Data/JROData.py @@ -11,7 +11,7 @@ import numpy path = os.path.split(os.getcwd())[0] sys.path.append(path) -from IO.JROHeader import SystemHeader, RadarControllerHeader +from IO.JROHeaderIO import SystemHeader, RadarControllerHeader class JROData: @@ -73,4 +73,99 @@ class JROData: def deepcopy(self): - return copy.deepcopy(self) \ No newline at end of file + return copy.deepcopy(self) + +class Voltage(JROData): + + nCohInt = None + + data = None + + def __init__(self): + ''' + Constructor + ''' + + self.m_RadarControllerHeader = RadarControllerHeader() + + self.m_SystemHeader = SystemHeader() + + self.type = "Voltage" + + #data es un numpy array de 2 dmensiones ( canales, alturas) + self.data = None + + self.dtype = None + + self.nChannels = 0 + + self.nHeights = 0 + + self.nProfiles = None + + self.heightList = None + + self.channelList = None + + self.channelIndexList = None + + self.flagNoData = True + + self.flagTimeBlock = False + + self.dataUtcTime = None + + self.nCohInt = None + +class Spectra(JROData): + + data_spc = None + + data_cspc = None + + data_dc = None + + nFFTPoints = None + + nPairs = None + + pairsList = None + + nIncohInt = None + + def __init__(self): + ''' + Constructor + ''' + + self.m_RadarControllerHeader = RadarControllerHeader() + + self.m_SystemHeader = SystemHeader() + + self.type = "Spectra" + + #data es un numpy array de 2 dmensiones ( canales, alturas) +# self.data = None + + self.dtype = None + + self.nChannels = 0 + + self.nHeights = 0 + + self.nProfiles = None + + self.heightList = None + + self.channelList = None + + self.channelIndexList = None + + self.flagNoData = True + + self.flagTimeBlock = False + + self.dataUtcTime = None + + self.nIncohInt = None + \ No newline at end of file diff --git a/schainpy2/Data/Spectra.py b/schainpy2/Data/Spectra.py deleted file mode 100644 index 19d350d..0000000 --- a/schainpy2/Data/Spectra.py +++ /dev/null @@ -1,66 +0,0 @@ -''' - -$Author$ -$Id$ -''' - -import os, sys -import numpy - -path = os.path.split(os.getcwd())[0] -sys.path.append(path) - -from JROData import JROData -from IO.JROHeader import SystemHeader, RadarControllerHeader - -class Spectra(JROData): - data_spc = None - - data_cspc = None - - data_dc = None - - nFFTPoints = None - - nPairs = None - - pairsList = None - - nIncohInt = None - - def __init__(self): - ''' - Constructor - ''' - - self.m_RadarControllerHeader = RadarControllerHeader() - - self.m_SystemHeader = SystemHeader() - - self.type = "Spectra" - - #data es un numpy array de 2 dmensiones ( canales, alturas) -# self.data = None - - self.dtype = None - - self.nChannels = 0 - - self.nHeights = 0 - - self.nProfiles = None - - self.heightList = None - - self.channelList = None - - self.channelIndexList = None - - self.flagNoData = True - - self.flagTimeBlock = False - - self.dataUtcTime = None - - self.nIncohInt = None - \ No newline at end of file diff --git a/schainpy2/Data/Voltage.py b/schainpy2/Data/Voltage.py deleted file mode 100644 index b3e4a8e..0000000 --- a/schainpy2/Data/Voltage.py +++ /dev/null @@ -1,56 +0,0 @@ -''' - -$Author$ -$Id$ -''' - -import os, sys -import numpy - -path = os.path.split(os.getcwd())[0] -sys.path.append(path) - -from JROData import JROData -from IO.JROHeader import SystemHeader, RadarControllerHeader - -class Voltage(JROData): - - nCohInt = None - - data = None - - def __init__(self): - ''' - Constructor - ''' - - self.m_RadarControllerHeader = RadarControllerHeader() - - self.m_SystemHeader = SystemHeader() - - self.type = "Voltage" - - #data es un numpy array de 2 dmensiones ( canales, alturas) - self.data = None - - self.dtype = None - - self.nChannels = 0 - - self.nHeights = 0 - - self.nProfiles = None - - self.heightList = None - - self.channelList = None - - self.channelIndexList = None - - self.flagNoData = True - - self.flagTimeBlock = False - - self.dataUtcTime = None - - self.nCohInt = None diff --git a/schainpy2/IO/JRODataIO.py b/schainpy2/IO/JRODataIO.py index 5b9a27d..acde4e9 100644 --- a/schainpy2/IO/JRODataIO.py +++ b/schainpy2/IO/JRODataIO.py @@ -14,7 +14,7 @@ import time, datetime path = os.path.split(os.getcwd())[0] sys.path.append(path) -from JROHeader import * +from JROHeaderIO import * from Data.JROData import JROData def isNumber(str): diff --git a/schainpy2/IO/JROHeader.py b/schainpy2/IO/JROHeaderIO.py similarity index 100% rename from schainpy2/IO/JROHeader.py rename to schainpy2/IO/JROHeaderIO.py diff --git a/schainpy2/IO/SpectraIO.py b/schainpy2/IO/SpectraIO.py index 00e8d51..9c57381 100644 --- a/schainpy2/IO/SpectraIO.py +++ b/schainpy2/IO/SpectraIO.py @@ -13,13 +13,11 @@ import time, datetime path = os.path.split(os.getcwd())[0] sys.path.append(path) -from IO.JROHeader import * -from Data.Spectra import Spectra - +from JROHeaderIO import * from JRODataIO import JRODataReader from JRODataIO import JRODataWriter -from JRODataIO import isNumber +from Data.JROData import Spectra class SpectraReader(JRODataReader): """ @@ -51,7 +49,11 @@ class SpectraReader(JRODataReader): readerObj.getData() - print readerObj.dataOutObj.data + print readerObj.data_spc + + print readerObj.data_cspc + + print readerObj.data_dc if readerObj.flagNoMoreFiles: break @@ -375,7 +377,7 @@ class SpectraReader(JRODataReader): self.dataOutObj.radarControllerHeaderObj = self.radarControllerHeaderObj.copy() - return 1 + return self.data_spc class SpectraWriter(JRODataWriter): diff --git a/schainpy2/IO/VoltageIO.py b/schainpy2/IO/VoltageIO.py index 78b526c..16c3f3c 100644 --- a/schainpy2/IO/VoltageIO.py +++ b/schainpy2/IO/VoltageIO.py @@ -13,11 +13,11 @@ import time, datetime path = os.path.split(os.getcwd())[0] sys.path.append(path) -from JROHeader import * +from JROHeaderIO import * from JRODataIO import JRODataReader from JRODataIO import JRODataWriter -from Data.Voltage import Voltage +from Data.JROData import Voltage class VoltageReader(JRODataReader): """ @@ -314,7 +314,7 @@ class VoltageReader(JRODataReader): self.dataOutObj.flagNoData = False - return 1 + return self.dataOutObj.data class VoltageWriter(JRODataWriter): diff --git a/schainpy2/Processing/SpectraProcessor.py b/schainpy2/Processing/SpectraProcessor.py index 8faf03e..dd48641 100644 --- a/schainpy2/Processing/SpectraProcessor.py +++ b/schainpy2/Processing/SpectraProcessor.py @@ -11,7 +11,7 @@ import time path = os.path.split(os.getcwd())[0] sys.path.append(path) -from Data.Spectra import Spectra +from Data.JROData import Spectra from IO.SpectraIO import SpectraWriter #from Graphics.SpectraPlot import Spectrum #from JRONoise import Noise diff --git a/schainpy2/Processing/VoltageProcessor.py b/schainpy2/Processing/VoltageProcessor.py index ddcc99f..8b07725 100644 --- a/schainpy2/Processing/VoltageProcessor.py +++ b/schainpy2/Processing/VoltageProcessor.py @@ -12,11 +12,12 @@ import datetime path = os.path.split(os.getcwd())[0] sys.path.append(path) -from Data.Voltage import Voltage +from Data.JROData import Voltage from IO.VoltageIO import VoltageWriter from Graphics2.schainPlotTypes import ScopeFigure class VoltageProcessor: + dataInObj = None dataOutObj = None integratorObjIndex = None