| @@ -65,9 +65,9 class SpectraReader( JRODataReader ): | |||||
| 65 | data_cspc = None |
|
65 | data_cspc = None | |
| 66 | data_dc = None |
|
66 | data_dc = None | |
| 67 |
|
67 | |||
| 68 | nChannels = 0 |
|
68 | nPairsEqualChannels = 0 | |
| 69 |
|
69 | |||
| 70 | nPairs = 0 |
|
70 | nPairsUnequalChannels = 0 | |
| 71 |
|
71 | |||
| 72 | pts2read_SelfSpectra = 0 |
|
72 | pts2read_SelfSpectra = 0 | |
| 73 | pts2read_CrossSpectra = 0 |
|
73 | pts2read_CrossSpectra = 0 | |
| @@ -111,36 +111,37 class SpectraReader( JRODataReader ): | |||||
| 111 | Obtiene la cantidad de puntos a leer por cada bloque de datos |
|
111 | Obtiene la cantidad de puntos a leer por cada bloque de datos | |
| 112 |
|
112 | |||
| 113 | Affected: |
|
113 | Affected: | |
| 114 | self.nChannels |
|
114 | self.nPairsEqualChannels | |
| 115 | self.nPairs |
|
115 | self.nPairsUnequalChannels | |
| 116 | self.pts2read_SelfSpectra |
|
116 | self.pts2read_SelfSpectra | |
| 117 | self.pts2read_CrossSpectra |
|
117 | self.pts2read_CrossSpectra | |
| 118 | self.pts2read_DCchannels |
|
118 | self.pts2read_DCchannels | |
| 119 | self.blocksize |
|
119 | self.blocksize | |
| 120 | self.m_DataObj.nChannels |
|
120 | self.m_DataObj.nPairsEqualChannels | |
| 121 | self.m_DataObj.nPairs |
|
121 | self.m_DataObj.nPairsUnequalChannels | |
| 122 |
|
122 | |||
| 123 | Return: |
|
123 | Return: | |
| 124 | None |
|
124 | None | |
| 125 | """ |
|
125 | """ | |
| 126 | self.nChannels = 0 |
|
126 | self.nPairsEqualChannels = 0 | |
| 127 | self.nPairs = 0 |
|
127 | self.nPairsUnequalChannels = 0 | |
| 128 |
|
128 | |||
| 129 | for i in range( 0, self.m_ProcessingHeader.totalSpectra*2, 2 ): |
|
129 | for i in range( 0, self.m_ProcessingHeader.totalSpectra*2, 2 ): | |
| 130 | if self.m_ProcessingHeader.spectraComb[i] == self.m_ProcessingHeader.spectraComb[i+1]: |
|
130 | if self.m_ProcessingHeader.spectraComb[i] == self.m_ProcessingHeader.spectraComb[i+1]: | |
| 131 | self.nChannels = self.nChannels + 1 |
|
131 | self.nPairsEqualChannels = self.nPairsEqualChannels + 1 #par de canales iguales | |
| 132 | else: |
|
132 | else: | |
| 133 | self.nPairs = self.nPairs + 1 |
|
133 | self.nPairsUnequalChannels = self.nPairsUnequalChannels + 1 #par de canales diferentes | |
| 134 |
|
134 | |||
| 135 |
pts2read = self.m_ProcessingHeader. |
|
135 | pts2read = self.m_ProcessingHeader.numHeights * self.m_ProcessingHeader.profilesPerBlock | |
| 136 | self.pts2read_SelfSpectra = int( pts2read * self.nChannels ) |
|
136 | ||
| 137 |
self.pts2read_ |
|
137 | self.pts2read_SelfSpectra = int( self.nPairsEqualChannels * pts2read ) | |
| 138 | self.pts2read_DCchannels = int( self.m_ProcessingHeader.numHeights * self.m_SystemHeader.numChannels ) |
|
138 | self.pts2read_CrossSpectra = int( self.nPairsUnequalChannels * pts2read ) | |
|
|
139 | self.pts2read_DCchannels = int( self.m_SystemHeader.numChannels * self.m_ProcessingHeader.numHeights ) | |||
| 139 |
|
140 | |||
| 140 | self.blocksize = self.pts2read_SelfSpectra + self.pts2read_CrossSpectra + self.pts2read_DCchannels |
|
141 | self.blocksize = self.pts2read_SelfSpectra + self.pts2read_CrossSpectra + self.pts2read_DCchannels | |
| 141 |
|
142 | |||
| 142 | self.m_DataObj.nChannels = self.nChannels |
|
143 | self.m_DataObj.nPairsEqualChannels = self.nPairsEqualChannels | |
| 143 | self.m_DataObj.nPairs = self.nPairs |
|
144 | self.m_DataObj.nPairsUnequalChannels = self.nPairsUnequalChannels | |
| 144 |
|
145 | |||
| 145 |
|
146 | |||
| 146 | def readBlock(self): |
|
147 | def readBlock(self): | |
| @@ -189,8 +190,8 class SpectraReader( JRODataReader ): | |||||
| 189 | return 0 |
|
190 | return 0 | |
| 190 |
|
191 | |||
| 191 | try: |
|
192 | try: | |
| 192 | spc = spc.reshape( (self.nChannels, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D |
|
193 | spc = spc.reshape( (self.nPairsEqualChannels, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D | |
| 193 | cspc = cspc.reshape( (self.nPairs, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D |
|
194 | cspc = cspc.reshape( (self.nPairsUnequalChannels, self.m_ProcessingHeader.numHeights, self.m_ProcessingHeader.profilesPerBlock) ) #transforma a un arreglo 3D | |
| 194 | dc = dc.reshape( (self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D |
|
195 | dc = dc.reshape( (self.m_SystemHeader.numChannels, self.m_ProcessingHeader.numHeights) ) #transforma a un arreglo 2D | |
| 195 | except: |
|
196 | except: | |
| 196 | print "Data file %s is invalid" % self.filename |
|
197 | print "Data file %s is invalid" % self.filename | |
| @@ -332,11 +333,11 class SpectraWriter(JRODataWriter): | |||||
| 332 |
|
333 | |||
| 333 | Return: None |
|
334 | Return: None | |
| 334 | """ |
|
335 | """ | |
| 335 | self.shape_spc_Buffer = (self.m_DataObj.nChannels, |
|
336 | self.shape_spc_Buffer = (self.m_DataObj.nPairsEqualChannels, | |
| 336 | self.m_ProcessingHeader.numHeights, |
|
337 | self.m_ProcessingHeader.numHeights, | |
| 337 | self.m_ProcessingHeader.profilesPerBlock) |
|
338 | self.m_ProcessingHeader.profilesPerBlock) | |
| 338 |
|
339 | |||
| 339 | self.shape_cspc_Buffer = (self.m_DataObj.nPairs, |
|
340 | self.shape_cspc_Buffer = (self.m_DataObj.nPairsUnequalChannels, | |
| 340 | self.m_ProcessingHeader.numHeights, |
|
341 | self.m_ProcessingHeader.numHeights, | |
| 341 | self.m_ProcessingHeader.profilesPerBlock) |
|
342 | self.m_ProcessingHeader.profilesPerBlock) | |
| 342 |
|
343 | |||
General Comments 0
You need to be logged in to leave comments.
Login now