##// END OF EJS Templates
schain
RSS
Update from master
Juan C. Espinoza -
r1224:092ea8e2ae46 merge
parent child
Show More
Side by Side Unified
Context file:
r1224:092ea8e2ae46 Loading diff...:
Show file before | Show file after | Hide comments
@@ -565,6 +565,7 class ParamWriter(Operation):
565 dtype = [('arrayName', 'S20'),('nDimensions', 'i'), ('dim2', 'i'), ('dim1', 'i'),('dim0', 'i'),('mode', 'b')]
565 dtype = [('arrayName', 'S20'),('nDimensions', 'i'), ('dim2', 'i'), ('dim1', 'i'),('dim0', 'i'),('mode', 'b')]
566 currentDay = None
566 currentDay = None
567 lastTime = None
567 lastTime = None
568 setType = None
568
569
569 def __init__(self):
570 def __init__(self):
570
571
@@ -787,7 +788,7 class ParamWriter(Operation):
787
788
788 if os.path.exists(fullpath):
789 if os.path.exists(fullpath):
789 filesList = os.listdir( fullpath )
790 filesList = os.listdir( fullpath )
790 filesList = [k for k in filesList if k.startswith(self.optchar)]
791 filesList = [k for k in filesList if 'M' in k]
791 if len( filesList ) > 0:
792 if len( filesList ) > 0:
792 filesList = sorted( filesList, key=str.lower )
793 filesList = sorted( filesList, key=str.lower )
793 filen = filesList[-1]
794 filen = filesList[-1]
@@ -1022,6 +1023,7 class ParamWriter(Operation):
1022
1023
1023 def run(self, dataOut, path, blocksPerFile=10, metadataList=None, dataList=None, mode=None, setType=None):
1024 def run(self, dataOut, path, blocksPerFile=10, metadataList=None, dataList=None, mode=None, setType=None):
1024
1025
1026 self.dataOut = dataOut
1025 if not(self.isConfig):
1027 if not(self.isConfig):
1026 self.setup(dataOut, path=path, blocksPerFile=blocksPerFile,
1028 self.setup(dataOut, path=path, blocksPerFile=blocksPerFile,
1027 metadataList=metadataList, dataList=dataList, mode=mode,
1029 metadataList=metadataList, dataList=dataList, mode=mode,
Show file before | Show file after | Hide comments
@@ -282,20 +282,16 class SpectraProc(ProcessingUnit):
282 raise ValueError("Error selecting channels: The value %d in channelIndexList is not valid.\nAvailable channel indexes = " % (
282 raise ValueError("Error selecting channels: The value %d in channelIndexList is not valid.\nAvailable channel indexes = " % (
283 channelIndex, self.dataOut.channelIndexList))
283 channelIndex, self.dataOut.channelIndexList))
284
284
285 # nChannels = len(channelIndexList)
286
287 data_spc = self.dataOut.data_spc[channelIndexList, :]
285 data_spc = self.dataOut.data_spc[channelIndexList, :]
288 data_dc = self.dataOut.data_dc[channelIndexList, :]
286 data_dc = self.dataOut.data_dc[channelIndexList, :]
289
287
290 self.dataOut.data_spc = data_spc
288 self.dataOut.data_spc = data_spc
291 self.dataOut.data_dc = data_dc
289 self.dataOut.data_dc = data_dc
292
290
293 self.dataOut.channelList = [
291 # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList]
294 self.dataOut.channelList[i] for i in channelIndexList]
292 self.dataOut.channelList = range(len(channelIndexList))
295 # self.dataOut.nChannels = nChannels
293 self.__selectPairsByChannel(channelIndexList)
296
294
297 self.__selectPairsByChannel(self.dataOut.channelList)
298
299 return 1
295 return 1
300
296
301
297
Show file before | Show file after | Hide comments
@@ -113,9 +113,9 class VoltageProc(ProcessingUnit):
113 data = self.dataOut.data[channelIndexList,:]
113 data = self.dataOut.data[channelIndexList,:]
114
114
115 self.dataOut.data = data
115 self.dataOut.data = data
116 self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList]
116 # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList]
117 # self.dataOut.nChannels = nChannels
117 self.dataOut.channelList = range(len(channelIndexList))
118
118
119 return 1
119 return 1
120
120
121 def selectHeights(self, minHei=None, maxHei=None):
121 def selectHeights(self, minHei=None, maxHei=None):
General Comments 0
You need to be logged in to leave comments. Login now