| @@ -565,6 +565,7 class ParamWriter(Operation): | |||
|
|
565 | 565 | dtype = [('arrayName', 'S20'),('nDimensions', 'i'), ('dim2', 'i'), ('dim1', 'i'),('dim0', 'i'),('mode', 'b')] |
|
|
566 | 566 | currentDay = None |
|
|
567 | 567 | lastTime = None |
|
|
568 | setType = None | |
|
|
568 | 569 | |
|
|
569 | 570 | def __init__(self): |
|
|
570 | 571 | |
| @@ -787,7 +788,7 class ParamWriter(Operation): | |||
|
|
787 | 788 | |
|
|
788 | 789 | if os.path.exists(fullpath): |
|
|
789 | 790 | filesList = os.listdir( fullpath ) |
|
|
790 |
filesList = [k for k in filesList if k |
|
|
|
791 | filesList = [k for k in filesList if 'M' in k] | |
|
|
791 | 792 | if len( filesList ) > 0: |
|
|
792 | 793 | filesList = sorted( filesList, key=str.lower ) |
|
|
793 | 794 | filen = filesList[-1] |
| @@ -1022,6 +1023,7 class ParamWriter(Operation): | |||
|
|
1022 | 1023 | |
|
|
1023 | 1024 | def run(self, dataOut, path, blocksPerFile=10, metadataList=None, dataList=None, mode=None, setType=None): |
|
|
1024 | 1025 | |
|
|
1026 | self.dataOut = dataOut | |
|
|
1025 | 1027 | if not(self.isConfig): |
|
|
1026 | 1028 | self.setup(dataOut, path=path, blocksPerFile=blocksPerFile, |
|
|
1027 | 1029 | metadataList=metadataList, dataList=dataList, mode=mode, |
| @@ -517,7 +517,7 class SpectraWriter(JRODataWriter, Operation): | |||
|
|
517 | 517 | if self.data_cspc is not None: |
|
|
518 | 518 | |
|
|
519 | 519 | cspc = numpy.transpose( self.data_cspc, (0,2,1) ) |
|
|
520 |
|
|
|
|
520 | data = numpy.zeros( numpy.shape(cspc), self.dtype ) | |
|
|
521 | 521 | #print 'data.shape', self.shape_cspc_Buffer |
|
|
522 | 522 | if not self.processingHeaderObj.shif_fft: |
|
|
523 | 523 | cspc = numpy.roll( cspc, self.processingHeaderObj.profilesPerBlock/2, axis=2 ) #desplaza a la derecha en el eje 2 determinadas posiciones |
| @@ -282,20 +282,16 class SpectraProc(ProcessingUnit): | |||
|
|
282 | 282 | raise ValueError("Error selecting channels: The value %d in channelIndexList is not valid.\nAvailable channel indexes = " % ( |
|
|
283 | 283 | channelIndex, self.dataOut.channelIndexList)) |
|
|
284 | 284 | |
|
|
285 | # nChannels = len(channelIndexList) | |
|
|
286 | ||
|
|
287 | 285 | data_spc = self.dataOut.data_spc[channelIndexList, :] |
|
|
288 | 286 | data_dc = self.dataOut.data_dc[channelIndexList, :] |
|
|
289 | 287 | |
|
|
290 | 288 | self.dataOut.data_spc = data_spc |
|
|
291 | 289 | self.dataOut.data_dc = data_dc |
|
|
292 | 290 | |
|
|
293 | self.dataOut.channelList = [ | |
|
|
294 |
|
|
|
|
295 | # self.dataOut.nChannels = nChannels | |
|
|
296 | ||
|
|
297 | self.__selectPairsByChannel(self.dataOut.channelList) | |
|
|
298 | ||
|
|
291 | # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] | |
|
|
292 | self.dataOut.channelList = range(len(channelIndexList)) | |
|
|
293 | self.__selectPairsByChannel(channelIndexList) | |
|
|
294 | ||
|
|
299 | 295 | return 1 |
|
|
300 | 296 | |
|
|
301 | 297 | |
| @@ -113,9 +113,9 class VoltageProc(ProcessingUnit): | |||
|
|
113 | 113 | data = self.dataOut.data[channelIndexList,:] |
|
|
114 | 114 | |
|
|
115 | 115 | self.dataOut.data = data |
|
|
116 | self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] | |
|
|
117 |
|
|
|
|
118 | ||
|
|
116 | # self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList] | |
|
|
117 | self.dataOut.channelList = range(len(channelIndexList)) | |
|
|
118 | ||
|
|
119 | 119 | return 1 |
|
|
120 | 120 | |
|
|
121 | 121 | def selectHeights(self, minHei=None, maxHei=None): |
General Comments 0
You need to be logged in to leave comments.
Login now