##// END OF EJS Templates
schain-jc
RSS
Hot fix
Hot fix
José Chávez - - Load All Authors

File last commit:

r1040:0bd48c063731
r1166:ce0987c48654
Show More
jroproc_heispectra.py
344 lines | 10.1 KiB | text/x-python | PythonLexer
/ schainpy / model / proc / jroproc_heispectra.py
History | Source | Raw |Copy content |Copy permalink
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 import numpy
from jroproc_base import ProcessingUnit, Operation
Miguel Valdez
Merge with branch schain_julia_drifts from rev. 803 to 995....
 r568 from schainpy.model.data.jrodata import SpectraHeis
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487
class SpectraHeisProc(ProcessingUnit):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
def __init__(self, **kwargs):
ProcessingUnit.__init__(self, **kwargs)
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 # self.buffer = None
# self.firstdatatime = None
# self.profIndex = 0
self.dataOut = SpectraHeis()
Miguel Valdez
Signal Chain GUI updated:...
 r587 def __updateObjFromVoltage(self):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.dataOut.timeZone = self.dataIn.timeZone
self.dataOut.dstFlag = self.dataIn.dstFlag
self.dataOut.errorCount = self.dataIn.errorCount
self.dataOut.useLocalTime = self.dataIn.useLocalTime
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.dataOut.radarControllerHeaderObj = self.dataIn.radarControllerHeaderObj.copy()#
self.dataOut.systemHeaderObj = self.dataIn.systemHeaderObj.copy()#
self.dataOut.channelList = self.dataIn.channelList
self.dataOut.heightList = self.dataIn.heightList
# self.dataOut.dtype = self.dataIn.dtype
self.dataOut.dtype = numpy.dtype([('real','<f4'),('imag','<f4')])
# self.dataOut.nHeights = self.dataIn.nHeights
# self.dataOut.nChannels = self.dataIn.nChannels
self.dataOut.nBaud = self.dataIn.nBaud
self.dataOut.nCode = self.dataIn.nCode
self.dataOut.code = self.dataIn.code
# self.dataOut.nProfiles = 1
Juan C. Valdez
Version 2.2.5 Fixed several bugs, add jro colormap for spectra/rti, add ParamWriter, TODO: Fix decimation currently disabled
 r860 self.dataOut.ippFactor = 1
self.dataOut.noise_estimation = None
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 # self.dataOut.nProfiles = self.dataOut.nFFTPoints
self.dataOut.nFFTPoints = self.dataIn.nHeights
# self.dataOut.channelIndexList = self.dataIn.channelIndexList
# self.dataOut.flagNoData = self.dataIn.flagNoData
Miguel Valdez
Merge with branch schain_julia_drifts from rev. 803 to 995....
 r568 self.dataOut.flagDiscontinuousBlock = self.dataIn.flagDiscontinuousBlock
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.dataOut.utctime = self.dataIn.utctime
# self.dataOut.utctime = self.firstdatatime
self.dataOut.flagDecodeData = self.dataIn.flagDecodeData #asumo q la data esta decodificada
self.dataOut.flagDeflipData = self.dataIn.flagDeflipData #asumo q la data esta sin flip
# self.dataOut.flagShiftFFT = self.dataIn.flagShiftFFT
self.dataOut.nCohInt = self.dataIn.nCohInt
self.dataOut.nIncohInt = 1
# self.dataOut.ippSeconds= self.dataIn.ippSeconds
self.dataOut.windowOfFilter = self.dataIn.windowOfFilter
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Miguel Valdez
Signal Chain GUI updated:...
 r587 # self.dataOut.timeInterval = self.dataIn.timeInterval*self.dataOut.nIncohInt
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 # self.dataOut.set=self.dataIn.set
# self.dataOut.deltaHeight=self.dataIn.deltaHeight
def __updateObjFromFits(self):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.dataOut.utctime = self.dataIn.utctime
Miguel Valdez
Version 2.1.3: ...
 r664 # self.dataOut.channelIndexList = self.dataIn.channelIndexList
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.dataOut.channelList = self.dataIn.channelList
self.dataOut.heightList = self.dataIn.heightList
self.dataOut.data_spc = self.dataIn.data
Miguel Valdez
Signal Chain GUI updated:...
 r587 self.dataOut.ippSeconds = self.dataIn.ippSeconds
self.dataOut.nCohInt = self.dataIn.nCohInt
self.dataOut.nIncohInt = self.dataIn.nIncohInt
# self.dataOut.timeInterval = self.dataIn.timeInterval
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.dataOut.timeZone = self.dataIn.timeZone
self.dataOut.useLocalTime = True
# self.dataOut.
# self.dataOut.
def __getFft(self):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 fft_volt = numpy.fft.fft(self.dataIn.data, axis=1)
fft_volt = numpy.fft.fftshift(fft_volt,axes=(1,))
spc = numpy.abs(fft_volt * numpy.conjugate(fft_volt))/(self.dataOut.nFFTPoints)
self.dataOut.data_spc = spc
def run(self):
self.dataOut.flagNoData = True
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if self.dataIn.type == "Fits":
self.__updateObjFromFits()
self.dataOut.flagNoData = False
return
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if self.dataIn.type == "SpectraHeis":
self.dataOut.copy(self.dataIn)
return
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if self.dataIn.type == "Voltage":
Miguel Valdez
Signal Chain GUI updated:...
 r587 self.__updateObjFromVoltage()
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__getFft()
self.dataOut.flagNoData = False
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 raise ValueError, "The type object %s is not valid"%(self.dataIn.type)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def selectChannels(self, channelList):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 channelIndexList = []
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 for channel in channelList:
index = self.dataOut.channelList.index(channel)
channelIndexList.append(index)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.selectChannelsByIndex(channelIndexList)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def selectChannelsByIndex(self, channelIndexList):
"""
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897 Selecciona un bloque de datos en base a canales segun el channelIndexList
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 Input:
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897 channelIndexList : lista sencilla de canales a seleccionar por ej. [2,3,7]
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 Affected:
self.dataOut.data
self.dataOut.channelIndexList
self.dataOut.nChannels
self.dataOut.m_ProcessingHeader.totalSpectra
self.dataOut.systemHeaderObj.numChannels
self.dataOut.m_ProcessingHeader.blockSize
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 Return:
None
"""
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 for channelIndex in channelIndexList:
if channelIndex not in self.dataOut.channelIndexList:
print channelIndexList
raise ValueError, "The value %d in channelIndexList is not valid" %channelIndex
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 # nChannels = len(channelIndexList)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 data_spc = self.dataOut.data_spc[channelIndexList,:]
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.dataOut.data_spc = data_spc
self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList]
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return 1
class IncohInt4SpectraHeis(Operation):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 isConfig = False
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 __profIndex = 0
__withOverapping = False
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 __byTime = False
__initime = None
__lastdatatime = None
__integrationtime = None
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 __buffer = None
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 __dataReady = False
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 n = None
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
def __init__(self, **kwargs):
Operation.__init__(self, **kwargs)
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 # self.isConfig = False
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def setup(self, n=None, timeInterval=None, overlapping=False):
"""
Set the parameters of the integration class.
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 Inputs:
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 n : Number of coherent integrations
timeInterval : Time of integration. If the parameter "n" is selected this one does not work
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897 overlapping :
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 """
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__initime = None
self.__lastdatatime = 0
self.__buffer = None
self.__dataReady = False
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if n == None and timeInterval == None:
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897 raise ValueError, "n or timeInterval should be specified ..."
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if n != None:
self.n = n
self.__byTime = False
else:
self.__integrationtime = timeInterval #* 60. #if (type(timeInterval)!=integer) -> change this line
self.n = 9999
self.__byTime = True
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if overlapping:
self.__withOverapping = True
self.__buffer = None
else:
self.__withOverapping = False
self.__buffer = 0
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__profIndex = 0
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def putData(self, data):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 """
Add a profile to the __buffer and increase in one the __profileIndex
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 """
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if not self.__withOverapping:
self.__buffer += data.copy()
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897 self.__profIndex += 1
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 #Overlapping data
nChannels, nHeis = data.shape
data = numpy.reshape(data, (1, nChannels, nHeis))
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 #If the buffer is empty then it takes the data value
Miguel Valdez
Bug fixed: Padding decode data with zeros at the first heights was eliminated.
 r611 if self.__buffer is None:
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__buffer = data
self.__profIndex += 1
return
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 #If the buffer length is lower than n then stakcing the data value
if self.__profIndex < self.n:
self.__buffer = numpy.vstack((self.__buffer, data))
self.__profIndex += 1
return
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
#If the buffer length is equal to n then replacing the last buffer value with the data value
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__buffer = numpy.roll(self.__buffer, -1, axis=0)
self.__buffer[self.n-1] = data
self.__profIndex = self.n
return
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def pushData(self):
"""
Return the sum of the last profiles and the profiles used in the sum.
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 Affected:
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__profileIndex
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 """
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if not self.__withOverapping:
data = self.__buffer
n = self.__profIndex
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__buffer = 0
self.__profIndex = 0
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return data, n
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 #Integration with Overlapping
data = numpy.sum(self.__buffer, axis=0)
n = self.__profIndex
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return data, n
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def byProfiles(self, data):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__dataReady = False
avgdata = None
# n = None
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.putData(data)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if self.__profIndex == self.n:
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 avgdata, n = self.pushData()
self.__dataReady = True
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return avgdata
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def byTime(self, data, datatime):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__dataReady = False
avgdata = None
n = None
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.putData(data)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if (datatime - self.__initime) >= self.__integrationtime:
avgdata, n = self.pushData()
self.n = n
self.__dataReady = True
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return avgdata
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 def integrate(self, data, datatime=None):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if self.__initime == None:
self.__initime = datatime
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if self.__byTime:
avgdata = self.byTime(data, datatime)
else:
avgdata = self.byProfiles(data)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.__lastdatatime = datatime
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Miguel Valdez
Bug fixed: Padding decode data with zeros at the first heights was eliminated.
 r611 if avgdata is None:
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return None, None
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 avgdatatime = self.__initime
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 deltatime = datatime -self.__lastdatatime
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if not self.__withOverapping:
self.__initime = datatime
else:
self.__initime += deltatime
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 return avgdata, avgdatatime
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
José Chávez
reworked
 r954 def run(self, dataOut, n=None, timeInterval=None, overlapping=False, **kwargs):
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if not self.isConfig:
José Chávez
reworked
 r954 self.setup(n=n, timeInterval=timeInterval, overlapping=overlapping)
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 self.isConfig = True
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 avgdata, avgdatatime = self.integrate(dataOut.data_spc, dataOut.utctime)
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 # dataOut.timeInterval *= n
dataOut.flagNoData = True
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 if self.__dataReady:
dataOut.data_spc = avgdata
dataOut.nIncohInt *= self.n
# dataOut.nCohInt *= self.n
dataOut.utctime = avgdatatime
Miguel Valdez
JRODATA: timeInterval is a property now
 r528 # dataOut.timeInterval = dataOut.ippSeconds * dataOut.nIncohInt
Daniel Valdez
This is the new organization by packages and scripts for Signal Chain, this version contains new features and bugs fixed until August 2014
 r487 # dataOut.timeInterval = self.__timeInterval*self.n
José Chávez
cambiados los kwargs para cada operacion/unidad de procesamiento
 r897 dataOut.flagNoData = False