Changes to L1 code

components/isceobj/Sensor/Lutan1.py

@@ -191,7 +191,6 @@ def extractOrbit(self):
             if (timestamp >= tstart) and (timestamp <= tend):
                 pos = []
                 vel = []
-
                 for tag in ['VX', 'VY', 'VZ']:
                     vel.append(float(child.find(tag).text))
 
@@ -288,12 +287,19 @@ def extractDoppler(self):
         '''
         Extract doppler information from image metadata file
         '''
-        dop = self._xml_root.find('processing/doppler/dopplerCentroid/dopplerEstimate/combinedDoppler/coefficient').text
-        dop = float(dop)
+        #midwidth = self.frame.getNumberOfSamples() / 2.0
+        dop = [0, 0, 0]
+        for x in range(1,4):
+            dopName = 'processing/doppler/dopplerCentroid/dopplerEstimate/combinedDoppler/coefficient[{0}]'.format(x)
+            dopIndex = x-1
+            dopTemp = self._xml_root.find(dopName).text
+            dop[dopIndex] = float(dopTemp)
+        #dop = self._xml_root.find("processing/doppler/dopplerCentroid/dopplerEstimate/combinedDoppler/coefficient").text
+        #dop = float(dop)
 
         ####For insarApp
         quadratic = {}
-        quadratic['a'] = dop / self.frame.getInstrument().getPulseRepetitionFrequency()
+        quadratic['a'] = dop[0] / self.frame.getInstrument().getPulseRepetitionFrequency()
         quadratic['b'] = 0.
         quadratic['c'] = 0.
 

components/isceobj/Sensor/Sentinel1.py

@@ -517,7 +517,7 @@ def extractDoppler(self):
 
 
         ###Actual Doppler Polynomial for accurate processing
-        ###Will be used in roiApp
+        ###Will be used in stripmapApp
         pix = np.linspace(0, self.frame.getNumberOfSamples(), num=dpoly._order+2)
         rngs = self.frame.startingRange + pix * self.frame.getInstrument().getRangePixelSize()
         evals = dpoly(rngs)

components/isceobj/StripmapProc/runTopo.py

@@ -87,10 +87,9 @@ def runTopo(self):
 #    topo.incFilename = os.path.join(info.outdir, 'inc.rdr')
 #    topo.maskFilename = os.path.join(info.outdir, 'mask.rdr')
 
-
+    print(info._dopplerVsPixel)
     ####Doppler adjustment
     dop = [x/1.0 for x in info._dopplerVsPixel]
-
     doppler = Poly2D()
     doppler.setWidth(topo.width // topo.numberRangeLooks)
     doppler.setLength(topo.length // topo.numberAzimuthLooks)