schain-jc Commit - r86:6f8fdeafc657 · Jicamarca Repository

73

74

nPairs = 0

74

nPairs = 0

75

76

pairList = None

76

#pairList = None

77

78

channelList = None

78

79

def __init__(self, m_Spectra=None):

80

def __init__(self, m_Spectra=None):

80

"""

81

"""

107

108

self.pts2read_SelfSpectra = 0

109

self.pts2read_SelfSpectra = 0

109

self.pts2read_CrossSpectra = 0

110

self.pts2read_CrossSpectra = 0

110

self.pts2read_DC~~channel~~s = 0

111

self.pts2read_DCs = 0

111

112

self.nChannels = 0

113

self.nChannels = 0

113

114

173

174

self.blocksize = 0

175

self.blocksize = 0

175

176

pairList = None

177

#pairList = None

178

179

channelList = None

177

180

178

181

179

def __hasNotDataInBuffer(self):

182

def __hasNotDataInBuffer(self):

199

"""

202

"""

200

self.nChannels = 0

203

self.nChannels = 0

201

self.nPairs = 0

204

self.nPairs = 0

205

#self.pairList = []

202

206

203

for i in range( 0, self.m_ProcessingHeader.totalSpectra*2, 2 ):

207

for i in range( 0, self.m_ProcessingHeader.totalSpectra*2, 2 ):

204

if self.m_ProcessingHeader.spectraComb[i] == self.m_ProcessingHeader.spectraComb[i+1]:

208

if self.m_ProcessingHeader.spectraComb[i] == self.m_ProcessingHeader.spectraComb[i+1]:

205

self.nChannels = self.nChannels + 1 #par de canales iguales

209

self.nChannels = self.nChannels + 1 #par de canales iguales

206

else:

210

else:

207

self.nPairs = self.nPairs + 1 #par de canales diferentes

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

pts2read = self.m_ProcessingHeader.numHeights * self.m_ProcessingHeader.profilesPerBlock

214

pts2read = self.m_ProcessingHeader.numHeights * self.m_ProcessingHeader.profilesPerBlock

210

215

211

self.pts2read_SelfSpectra = int( self.nChannels * pts2read )

216

self.pts2read_SelfSpectra = int( self.nChannels * pts2read )

218

self.m_DataObj.nChannels = self.nChannels

223

self.m_DataObj.nChannels = self.nChannels

219

self.m_DataObj.nPairs = self.nPairs

224

self.m_DataObj.nPairs = self.nPairs

220

225

221

self.pairList = ~~numpy~~.~~arange~~(~~self~~.~~nPairs~~)

226

#self.pairList = tuple( self.pairList )

227

self.channelList = numpy.arange( self.nChannels )

222

228

223

229

224

def readBlock(self):

230

def readBlock(self):

510

data.tofile(self.fp)

516

data.tofile(self.fp)

511

517

512

self.data_spc.fill(0)

518

self.data_spc.fill(0)

513

self.data_cspc.fill(0)

514

self.data_dc.fill(0)

519

self.data_dc.fill(0)

520

if self.data_cspc != None:

521

self.data_cspc.fill(0)

515

522

516

self.flagIsNewFile = 0

523

self.flagIsNewFile = 0

517

self.flagIsNewBlock = 1

524

self.flagIsNewBlock = 1

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                 nPairs = 0
-                pairList = None
+                #pairList = None
+                channelList = None
                 def __init__(self, m_Spectra=None):
                     """
                     self.pts2read_SelfSpectra = 0
                     self.pts2read_CrossSpectra = 0
-                    self.pts2read_DCchannels = 0
+                    self.pts2read_DCs = 0
                     self.nChannels = 0
                     self.blocksize = 0
-                    pairList = None
+                    #pairList = None
+                    channelList = None
                 def __hasNotDataInBuffer(self):
                     """
                     self.nChannels = 0
                     self.nPairs = 0
+                    #self.pairList = []
                     for i in range( 0, self.m_ProcessingHeader.totalSpectra*2, 2 ):
                         if self.m_ProcessingHeader.spectraComb[i] == self.m_ProcessingHeader.spectraComb[i+1]:
                             self.nChannels = self.nChannels + 1   #par de canales iguales
                         else:
                             self.nPairs = self.nPairs + 1 #par de canales diferentes
+                            #self.pairList.append( (self.m_ProcessingHeader.spectraComb[i], self.m_ProcessingHeader.spectraComb[i+1]) )
                     pts2read = self.m_ProcessingHeader.numHeights * self.m_ProcessingHeader.profilesPerBlock
                     self.pts2read_SelfSpectra = int( self.nChannels * pts2read )
                     self.m_DataObj.nChannels = self.nChannels
                     self.m_DataObj.nPairs = self.nPairs
-                    self.pairList = numpy.arange(self.nPairs)
+                    #self.pairList = tuple( self.pairList )
+                    self.channelList = numpy.arange( self.nChannels )
                 def readBlock(self):
                     data.tofile(self.fp)
                     self.data_spc.fill(0)
-                    self.data_cspc.fill(0)
                     self.data_dc.fill(0)
+                    if self.data_cspc != None:
+                        self.data_cspc.fill(0)
                     self.flagIsNewFile = 0
                     self.flagIsNewBlock = 1