schain Commit - r477:9729744d0cb2 · Jicamarca Repository

new changes to indentify and select beams

Daniel Valdez -

r477:9729744d0cb2

parent child

Context file:

r477:9729744d0cb2

Collapse all files

schainpy/model/jrodata.py +13 -1

                     self.type = "AMISR"
                     #propiedades para compatibilidad con Voltages
-                    self.timeZone = 300#timezone like jroheader, difference in minutes between UTC and localtime
+                    self.timeZone = 0#timezone like jroheader, difference in minutes between UTC and localtime
                     self.dstFlag = 0#self.dataIn.dstFlag
                     self.errorCount = 0#self.dataIn.errorCount
                     self.useLocalTime = True#self.dataIn.useLocalTime
                     self.nCode = None#self.dataIn.nCode
                     self.code = None#self.dataIn.code
+                    #consideracion para los Beams
+                    self.beamCodeDict = None
+                    self.beamRangeDict = None
+                def copy(self, inputObj=None):
+                    if inputObj == None:
+                        return copy.deepcopy(self)
+                    for key in inputObj.__dict__.keys():
+                        self.__dict__[key] = inputObj.__dict__[key]
                 def isEmpty(self):

schainpy/model/jrodataIO.py +29 -2

             class RadacHeader():
                 def __init__(self, fp):
                     header = 'Raw11/Data/RadacHeader'
-                    self.beamCode = fp.get(header+'/BeamCode')
+                    self.beamCodeByPulse = fp.get(header+'/BeamCode')
+                    self.beamCode = fp.get('Raw11/Data/Beamcodes')
                     self.code = fp.get(header+'/Code')
                     self.frameCount = fp.get(header+'/FrameCount')
                     self.modeGroup = fp.get(header+'/ModeGroup')
                     self.nrecords = self.pulseCount.shape[0] #numero de bloques
                     self.npulses = self.pulseCount.shape[1] #numero de perfiles
                     self.nsamples = self.nsamplesPulse[0,0] #numero de alturas
+                    self.nbeams = self.beamCode.shape[1] #numero de beams
                 def getIndexRangeToPulse(self, idrecord=0):
                     self.dataByFrame = None
                     self.dataset = None
+                    self.beamCodeDict = {}
+                    self.beamRangeDict = {}
                 def __createObjByDefault(self):
                 def __readHeader(self):
                     self.radacHeaderObj = RadacHeader(self.amisrFilePointer)
                     self.flagIsNewFile = 1
+                def __getBeamCode(self):
+                    self.beamCodeDict = {}
+                    self.beamRangeDict = {}
+                    for i in range(len(self.radacHeaderObj.beamCode[0,:])):
+                        self.beamCodeDict.setdefault(i)
+                        self.beamRangeDict.setdefault(i)
+                        self.beamCodeDict[i] = self.radacHeaderObj.beamCode[0,i]
+                    just4record0 = self.radacHeaderObj.beamCodeByPulse[0,:]
+                    for i in range(len(self.beamCodeDict.values())):
+                        xx = numpy.where(just4record0==self.beamCodeDict.values()[i])
+                        self.beamRangeDict[i] = xx[0]
                 def __setNextFile(self):
                         return 0
                     self.__readHeader()
+                    self.__getBeamCode()
                     self.readDataBlock()
                         return 1
                     return 0
+                def printUTC(self):
+                    print self.dataOut.utctime
+                    print ''
                 def setObjProperties(self):
                     self.dataOut.heightList = self.rangeFromFile/1000.0 #km
                     self.dataOut.nProfiles = self.radacHeaderObj.npulses
                     self.dataOut.nBaud = None
                     self.dataOut.nCode = None
                     self.dataOut.code = None
+                    self.dataOut.beamCodeDict = self.beamCodeDict
+                    self.dataOut.beamRangeDict = self.beamRangeDict
                 def getData(self):

schainpy/model/jroprocessing.py +64 -2

@@ -1707,7 +1707,7 class ProfileSelector(Operation):
1707		1707
1708	return True	1708	return True
1709		1709
1710	def run(self, dataOut, profileList=None, profileRangeList=None):	1710	def run(self, dataOut, profileList=None, profileRangeList=None, beam=None):
1711		1711
1712	dataOut.flagNoData = True	1712	dataOut.flagNoData = True
1713	self.nProfiles = dataOut.nProfiles	1713	self.nProfiles = dataOut.nProfiles
@@ -1728,6 +1728,12 class ProfileSelector(Operation):
1728		1728
1729	self.incIndex()	1729	self.incIndex()
1730	return 1	1730	return 1
		1731	elif beam != None:
		1732	if self.isProfileInList(dataOut.beamRangeDict[beam]):
		1733	dataOut.flagNoData = False
		1734
		1735	self.incIndex()
		1736	return 1
1731		1737
1732	else:	1738	else:
1733	raise ValueError, "ProfileSelector needs profileList or profileRangeList"	1739	raise ValueError, "ProfileSelector needs profileList or profileRangeList"
@@ -2067,4 +2073,60 class IncohInt4SpectraHeis(Operation):
2067		2073
2068		2074
2069		2075
2070	No newline at end of file	2076	class AMISRProc(ProcessingUnit):
		2077	def __init__(self):
		2078	self.objectDict = {}
		2079	self.dataOut = AMISR()
		2080
		2081	def init(self):
		2082	if self.dataIn.type == 'AMISR':
		2083	self.dataOut.copy(self.dataIn)
		2084
		2085	class BeamSelector(Operation):
		2086	profileIndex = None
		2087	# Tamanho total de los perfiles
		2088	nProfiles = None
		2089
		2090	def __init__(self):
		2091
		2092	self.profileIndex = 0
		2093
		2094	def incIndex(self):
		2095	self.profileIndex += 1
		2096
		2097	if self.profileIndex >= self.nProfiles:
		2098	self.profileIndex = 0
		2099
		2100	def isProfileInRange(self, minIndex, maxIndex):
		2101
		2102	if self.profileIndex < minIndex:
		2103	return False
		2104
		2105	if self.profileIndex > maxIndex:
		2106	return False
		2107
		2108	return True
		2109
		2110	def isProfileInList(self, profileList):
		2111
		2112	if self.profileIndex not in profileList:
		2113	return False
		2114
		2115	return True
		2116
		2117	def run(self, dataOut, beam=None):
		2118
		2119	dataOut.flagNoData = True
		2120	self.nProfiles = dataOut.nProfiles
		2121
		2122	if beam != None:
		2123	if self.isProfileInList(dataOut.beamRangeDict[beam]):
		2124	dataOut.flagNoData = False
		2125
		2126	self.incIndex()
		2127	return 1
		2128
		2129	else:
		2130	raise ValueError, "BeamSelector needs beam value"
		2131
		2132	return 0 No newline at end of file

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