schain-jc Commit - r200:ac28b7810bcd

-Se modificó el atributo nChannels de la clase JROData y derivadas por la propiedad nChannels (llamada a la funcion self.getNChannels)...

Miguel Valdez -

r200:ac28b7810bcd

parent child

Context file:

r200:ac28b7810bcd

Collapse all files

schainpy/controller.py +2 -2

                         #If every process unit finished so end process
                         if not(finalSts):
-                            print "Every process unit finished"
+                            print "Every process units have finished"
                             break
             if __name__ == '__main__':
                 procUnitConfObj1 = controllerObj.addProcUnit(datatype='Spectra', inputId=readUnitConfObj.getId())
                 opObj10 = procUnitConfObj1.addOperation(name='selectChannels')
-                opObj10.addParameter(name='channelList', value='0,1', format='intlist')
+                opObj10.addParameter(name='channelList', value='0,1,3', format='intlist')
                 opObj11 = procUnitConfObj1.addOperation(name='SpectraPlot', optype='other')
                 opObj11.addParameter(name='idfigure', value='1', format='int')

schainpy/model/jrodata.py +18 -9

                 dtype = None
-                nChannels = None
+            #    nChannels = None
                 nHeights = None
                 channelList = None
-                channelIndexList = None
                 flagNoData = True
                 flagTimeBlock = False
                     return self.flagNoData
+                def getNChannels(self):
+                    return len(self.channelList)
+                def getChannelIndexList(self):
+                    return range(self.nChannels)
+                nChannels = property(getNChannels, "I'm the 'nChannel' property.")
+                channelIndexList = property(getChannelIndexList, "I'm the 'channelIndexList' property.")
             class Voltage(JROData):
                 #data es un numpy array de 2 dmensiones (canales, alturas)
                     self.dtype = None
-                    self.nChannels = 0
+            #        self.nChannels = 0
                     self.nHeights = 0
                     self.channelList = None
-                    self.channelIndexList = None
+            #        self.channelIndexList = None
                     self.flagNoData = True
                     self.dtype = None
-                    self.nChannels = 0
+            #        self.nChannels = 0
                     self.nHeights = 0
                     self.channelList = None
-                    self.channelIndexList = None
+            #        self.channelIndexList = None
                     self.flagNoData = True
                     self.dtype = None
-                    self.nChannels = 0
+            #        self.nChannels = 0
                     self.nHeights = 0
                     self.channelList = None
-                    self.channelIndexList = None
+            #        self.channelIndexList = None
                     self.flagNoData = True

schainpy/model/jrodataIO.py +4 -4

                     self.dataOut.dtype = self.dtype
-                    self.dataOut.nChannels = self.systemHeaderObj.nChannels
+            #        self.dataOut.nChannels = self.systemHeaderObj.nChannels
                     self.dataOut.nHeights = self.processingHeaderObj.nHeights
                     self.dataOut.channelList = range(self.systemHeaderObj.nChannels)
-                    self.dataOut.channelIndexList = range(self.systemHeaderObj.nChannels)
+            #        self.dataOut.channelIndexList = range(self.systemHeaderObj.nChannels)
                     self.dataOut.flagTimeBlock = self.flagTimeBlock
                     self.dataOut.dtype = self.dtype
-                    self.dataOut.nChannels = self.nRdChannels
+            #        self.dataOut.nChannels = self.nRdChannels
                     self.dataOut.nPairs = self.nRdPairs
                     self.dataOut.channelList = range(self.systemHeaderObj.nChannels)
-                    self.dataOut.channelIndexList = range(self.systemHeaderObj.nChannels)
+            #        self.dataOut.channelIndexList = range(self.systemHeaderObj.nChannels)
                     self.dataOut.utctime = self.basicHeaderObj.utc + self.basicHeaderObj.miliSecond/1000.#+ self.profileIndex * self.ippSeconds

schainpy/model/jroplot.py +1 -1

                     xlabel = "m/s"
                     for i in range(len(self.axesList)):
-                        title = "Channel %d: %4.2fdB" %(i, noise[i])
+                        title = "Channel %d: %4.2fdB" %(channelList[i], noise[i])
                         axes = self.axesList[i]
                         z2 = z[i,:,:]
                         axes.pcolor(x, y, z2, self.xmin, self.xmax, self.ymin, self.ymax, self.zmin, self.zmax, xlabel, ylabel, title)

schainpy/model/jroprocessing.py +25 -15

                 def selectChannels(self, channelList):
-                    self.selectChannelsByIndex(channelList)
+                    channelIndexList = []
+                    for channel in channelList:
+                        index = self.dataOut.channelList.index(channel)
+                        channelIndexList.append(index)
+                    self.selectChannelsByIndex(channelIndexList)
                 def selectChannelsByIndex(self, channelIndexList):
                     """
                         None
                     """
-                    for channel in channelIndexList:
+                    for channelIndex in channelIndexList:
-                        if channel not in self.dataOut.channelIndexList:
+                        if channelIndex not in self.dataOut.channelIndexList:
                             print channelIndexList
-                            raise ValueError, "The value %d in channelIndexList is not valid" %channel
+                            raise ValueError, "The value %d in channelIndexList is not valid" %channelIndex
                     nChannels = len(channelIndexList)
                     data = self.dataOut.data[channelIndexList,:]
                     self.dataOut.data = data
-                    self.dataOut.channelIndexList = channelIndexList
                     self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList]
-                    self.dataOut.nChannels = nChannels
+            #        self.dataOut.nChannels = nChannels
                     return 1
                     self.dataOut.heightList = self.dataIn.heightList
                     self.dataOut.dtype = self.dataIn.dtype
                     self.dataOut.nHeights = self.dataIn.nHeights
-                    self.dataOut.nChannels = self.dataIn.nChannels
+            #        self.dataOut.nChannels = self.dataIn.nChannels
                     self.dataOut.nBaud = self.dataIn.nBaud
                     self.dataOut.nCode = self.dataIn.nCode
                     self.dataOut.code = self.dataIn.code
                     self.dataOut.nProfiles = self.dataOut.nFFTPoints
-                    self.dataOut.channelIndexList = self.dataIn.channelIndexList
+            #        self.dataOut.channelIndexList = self.dataIn.channelIndexList
                     self.dataOut.flagTimeBlock = self.dataIn.flagTimeBlock
                     self.dataOut.utctime = self.firstdatatime
                     self.dataOut.flagDecodeData = self.dataIn.flagDecodeData #asumo q la data esta decodificada
                 def selectChannels(self, channelList):
-                    self.selectChannelsByIndex(channelList)
+                    channelIndexList = []
+                    for channel in channelList:
+                        index = self.dataOut.channelList.index(channel)
+                        channelIndexList.append(index)
+                    self.selectChannelsByIndex(channelIndexList)
                 def selectChannelsByIndex(self, channelIndexList):
                     """
                         None
                     """
-                    for channel in channelIndexList:
+                    for channelIndex in channelIndexList:
-                        if channel not in self.dataOut.channelIndexList:
+                        if channelIndex not in self.dataOut.channelIndexList:
                             print channelIndexList
-                            raise ValueError, "The value %d in channelIndexList is not valid" %channel
+                            raise ValueError, "The value %d in channelIndexList is not valid" %channelIndex
                     nChannels = len(channelIndexList)
                     data = self.dataOut.data_spc[channelIndexList,:]
-                    self.dataOut.data_spc = data
+                    self.dataOut.data = data
-                    self.dataOut.channelIndexList = channelIndexList
                     self.dataOut.channelList = [self.dataOut.channelList[i] for i in channelIndexList]
-                    self.dataOut.nChannels = nChannels
+            #        self.dataOut.nChannels = nChannels
                     return 1

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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