Merge pull request #1 from fattahi/master

positive firstValidSample and removing OrbitExtender from Sentinel1 Reader
LT1AB
Heresh Fattahi 2019-01-29 17:42:19 -08:00 committed by GitHub Enterprise
commit 7e8adce493
3 changed files with 4 additions and 7 deletions

View File

@ -40,7 +40,6 @@ from .BurstSLC import BurstSLC
from isceobj.Util import Poly1D, Poly2D from isceobj.Util import Poly1D, Poly2D
from isceobj.Planet.Planet import Planet from isceobj.Planet.Planet import Planet
from isceobj.Orbit.Orbit import StateVector, Orbit from isceobj.Orbit.Orbit import StateVector, Orbit
from isceobj.Orbit.OrbitExtender import OrbitExtender
from isceobj.Planet.AstronomicalHandbook import Const from isceobj.Planet.AstronomicalHandbook import Const
from iscesys.Component.Component import Component from iscesys.Component.Component import Component
from iscesys.Component.ProductManager import ProductManager from iscesys.Component.ProductManager import ProductManager
@ -822,12 +821,8 @@ class Sentinel1(Component):
#####Orbits provided in annotation files are not InSAR-grade #####Orbits provided in annotation files are not InSAR-grade
#####These also need extensions for interpolation to work #####These also need extensions for interpolation to work
orbExt = OrbitExtender(planet=Planet(pname='Earth'))
orbExt.configure()
newOrb = orbExt.extendOrbit(frameOrbit)
return frameOrbit
return newOrb
def extractPreciseOrbit(self, margin=60.0): def extractPreciseOrbit(self, margin=60.0):
''' '''

View File

@ -127,7 +127,7 @@ def adjustValidSampleLine(master, slave, minAz=0, maxAz=0, minRng=0, maxRng=0):
else: else:
master.numValidSamples = master.numberOfSamples - master.firstValidSample master.numValidSamples = master.numberOfSamples - master.firstValidSample
master.firstValidSample = np.max([0, master.firstValidSample])
###Adjust valid lines and first valid line here ###Adjust valid lines and first valid line here
print ("Adjust valid lines") print ("Adjust valid lines")
print('Before: ', master.firstValidLine, master.numValidLines) print('Before: ', master.firstValidLine, master.numValidLines)

View File

@ -141,6 +141,8 @@ def adjustValidSampleLine_V2(master, slave, minAz=0, maxAz=0, minRng=0, maxRng=0
else: else:
master.numValidSamples = master.numberOfSamples - master.firstValidSample master.numValidSamples = master.numberOfSamples - master.firstValidSample
master.firstValidSample = np.max([0, master.firstValidSample])
print('After: ', master.firstValidSample, master.numValidSamples) print('After: ', master.firstValidSample, master.numValidSamples)
###Adjust valid lines and first valid line here ###Adjust valid lines and first valid line here