| @@ -73,8 +73,9 class SpectraReader( JRODataReader ): | |||
|
|
73 | 73 | |
|
|
74 | 74 | nPairs = 0 |
|
|
75 | 75 | |
|
|
76 | pairList = None | |
|
|
76 | #pairList = None | |
|
|
77 | 77 | |
|
|
78 | channelList = None | |
|
|
78 | 79 | |
|
|
79 | 80 | def __init__(self, m_Spectra=None): |
|
|
80 | 81 | """ |
| @@ -107,7 +108,7 class SpectraReader( JRODataReader ): | |||
|
|
107 | 108 | |
|
|
108 | 109 | self.pts2read_SelfSpectra = 0 |
|
|
109 | 110 | self.pts2read_CrossSpectra = 0 |
|
|
110 |
self.pts2read_DC |
|
|
|
111 | self.pts2read_DCs = 0 | |
|
|
111 | 112 | |
|
|
112 | 113 | self.nChannels = 0 |
|
|
113 | 114 | |
| @@ -173,7 +174,9 class SpectraReader( JRODataReader ): | |||
|
|
173 | 174 | |
|
|
174 | 175 | self.blocksize = 0 |
|
|
175 | 176 | |
|
|
176 | pairList = None | |
|
|
177 | #pairList = None | |
|
|
178 | ||
|
|
179 | channelList = None | |
|
|
177 | 180 | |
|
|
178 | 181 | |
|
|
179 | 182 | def __hasNotDataInBuffer(self): |
| @@ -199,13 +202,15 class SpectraReader( JRODataReader ): | |||
|
|
199 | 202 | """ |
|
|
200 | 203 | self.nChannels = 0 |
|
|
201 | 204 | self.nPairs = 0 |
|
|
205 | #self.pairList = [] | |
|
|
202 | 206 | |
|
|
203 | 207 | for i in range( 0, self.m_ProcessingHeader.totalSpectra*2, 2 ): |
|
|
204 | 208 | if self.m_ProcessingHeader.spectraComb[i] == self.m_ProcessingHeader.spectraComb[i+1]: |
|
|
205 | 209 | self.nChannels = self.nChannels + 1 #par de canales iguales |
|
|
206 | 210 | else: |
|
|
207 | 211 | self.nPairs = self.nPairs + 1 #par de canales diferentes |
|
|
208 | ||
|
|
212 | #self.pairList.append( (self.m_ProcessingHeader.spectraComb[i], self.m_ProcessingHeader.spectraComb[i+1]) ) | |
|
|
213 | ||
|
|
209 | 214 | pts2read = self.m_ProcessingHeader.numHeights * self.m_ProcessingHeader.profilesPerBlock |
|
|
210 | 215 | |
|
|
211 | 216 | self.pts2read_SelfSpectra = int( self.nChannels * pts2read ) |
| @@ -218,7 +223,8 class SpectraReader( JRODataReader ): | |||
|
|
218 | 223 | self.m_DataObj.nChannels = self.nChannels |
|
|
219 | 224 | self.m_DataObj.nPairs = self.nPairs |
|
|
220 | 225 | |
|
|
221 |
self.pairList = |
|
|
|
226 | #self.pairList = tuple( self.pairList ) | |
|
|
227 | self.channelList = numpy.arange( self.nChannels ) | |
|
|
222 | 228 | |
|
|
223 | 229 | |
|
|
224 | 230 | def readBlock(self): |
| @@ -510,8 +516,9 class SpectraWriter(JRODataWriter): | |||
|
|
510 | 516 | data.tofile(self.fp) |
|
|
511 | 517 | |
|
|
512 | 518 | self.data_spc.fill(0) |
|
|
513 | self.data_cspc.fill(0) | |
|
|
514 | 519 | self.data_dc.fill(0) |
|
|
520 | if self.data_cspc != None: | |
|
|
521 | self.data_cspc.fill(0) | |
|
|
515 | 522 | |
|
|
516 | 523 | self.flagIsNewFile = 0 |
|
|
517 | 524 | self.flagIsNewBlock = 1 |
General Comments 0
You need to be logged in to leave comments.
Login now