From 092ea8e2ae46add4fd83e320a732a3b63a25e21d 2019-07-31 19:45:22 From: Juan C. Espinoza Date: 2019-07-31 19:45:22 Subject: [PATCH] Update from master --- diff --git a/schainpy/model/io/jroIO_param.py b/schainpy/model/io/jroIO_param.py index 5c59449..505403e 100644 --- a/schainpy/model/io/jroIO_param.py +++ b/schainpy/model/io/jroIO_param.py @@ -565,6 +565,7 @@ class ParamWriter(Operation): dtype = [('arrayName', 'S20'),('nDimensions', 'i'), ('dim2', 'i'), ('dim1', 'i'),('dim0', 'i'),('mode', 'b')] currentDay = None lastTime = None + setType = None def __init__(self): @@ -787,7 +788,7 @@ class ParamWriter(Operation): if os.path.exists(fullpath): filesList = os.listdir( fullpath ) - filesList = [k for k in filesList if k.startswith(self.optchar)] + filesList = [k for k in filesList if 'M' in k] if len( filesList ) > 0: filesList = sorted( filesList, key=str.lower ) filen = filesList[-1] @@ -1022,6 +1023,7 @@ class ParamWriter(Operation): def run(self, dataOut, path, blocksPerFile=10, metadataList=None, dataList=None, mode=None, setType=None): + self.dataOut = dataOut if not(self.isConfig): self.setup(dataOut, path=path, blocksPerFile=blocksPerFile, metadataList=metadataList, dataList=dataList, mode=mode, diff --git a/schainpy/model/proc/jroproc_spectra.py b/schainpy/model/proc/jroproc_spectra.py index 340ad93..1851995 100644 --- a/schainpy/model/proc/jroproc_spectra.py +++ b/schainpy/model/proc/jroproc_spectra.py @@ -282,20 +282,16 @@ class SpectraProc(ProcessingUnit): raise ValueError("Error selecting channels: The value %d in channelIndexList is not valid.\nAvailable channel indexes = " % ( channelIndex, self.dataOut.channelIndexList)) -# nChannels = len(channelIndexList) - data_spc = self.dataOut.data_spc[channelIndexList, :] data_dc = self.dataOut.data_dc[channelIndexList, :] self.dataOut.data_spc = data_spc self.dataOut.data_dc = data_dc - self.dataOut.channelList = [ - self.dataOut.channelList[i] for i in channelIndexList] -# self.dataOut.nChannels = nChannels - - self.__selectPairsByChannel(self.dataOut.channelList) - + # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] + self.dataOut.channelList = range(len(channelIndexList)) + self.__selectPairsByChannel(channelIndexList) + return 1 diff --git a/schainpy/model/proc/jroproc_voltage.py b/schainpy/model/proc/jroproc_voltage.py index 3fea9a5..f72580c 100644 --- a/schainpy/model/proc/jroproc_voltage.py +++ b/schainpy/model/proc/jroproc_voltage.py @@ -113,9 +113,9 @@ class VoltageProc(ProcessingUnit): data = self.dataOut.data[channelIndexList,:] self.dataOut.data = data - self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] - # self.dataOut.nChannels = nChannels - + # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] + self.dataOut.channelList = range(len(channelIndexList)) + return 1 def selectHeights(self, minHei=None, maxHei=None):