KJ135
/
ISCE_INSAR
mirror of http://172.16.0.12:5000/WBJY/ISCE_INSAR.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed made by @cheryltwj to fix orbit file download edge case

LT1AB
shitong01 2020-05-15 11:31:45 +08:00 committed by piyushrpt
parent a6e95fa2d3
commit bb03d8c652
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/stack/topsStack/Stack.py
View File

@ -925,7 +925,7 @@ class sentinelSLC(object):
orbit_start_date_time = datetime.datetime.strptime(fields[6].replace('V',''), datefmt) orbit_start_date_time = datetime.datetime.strptime(fields[6].replace('V',''), datefmt)
orbit_stop_date_time = datetime.datetime.strptime(fields[7].replace('.EOF',''), datefmt) orbit_stop_date_time = datetime.datetime.strptime(fields[7].replace('.EOF',''), datefmt)
if self.start_date_time > orbit_start_date_time and self.start_date_time < orbit_stop_date_time: if self.start_date_time > orbit_start_date_time and self.stop_date_time < orbit_stop_date_time:
self.orbit = os.path.join(orbitDir,orbit) self.orbit = os.path.join(orbitDir,orbit)
self.orbitType = 'precise' self.orbitType = 'precise'
match = True match = True
@ -944,7 +944,7 @@ class sentinelSLC(object):
fields = os.path.basename(orbitFile).split('_') fields = os.path.basename(orbitFile).split('_')
orbit_start_date_time = datetime.datetime.strptime(fields[6].replace('V',''), datefmt) orbit_start_date_time = datetime.datetime.strptime(fields[6].replace('V',''), datefmt)
orbit_stop_date_time = datetime.datetime.strptime(fields[7].replace('.EOF',''), datefmt) orbit_stop_date_time = datetime.datetime.strptime(fields[7].replace('.EOF',''), datefmt)
if self.start_date_time > orbit_start_date_time and self.start_date_time < orbit_stop_date_time: if self.start_date_time > orbit_start_date_time and self.stop_date_time < orbit_stop_date_time:
print ("restituted orbit already exists.") print ("restituted orbit already exists.")
self.orbit = orbitFile self.orbit = orbitFile
self.orbitType = 'restituted' self.orbitType = 'restituted'

8
contrib/stack/topsStack/fetchOrbit.py
View File

@ -38,9 +38,11 @@ def FileToTimeStamp(safename):
''' '''
safename = os.path.basename(safename) safename = os.path.basename(safename)
fields = safename.split('_') fields = safename.split('_')
sstamp = [] # sstamp for getting SAFE file start time, not needed for orbit file timestamps
try: try:
tstamp = datetime.datetime.strptime(fields[-4], datefmt) tstamp = datetime.datetime.strptime(fields[-4], datefmt)
sstamp = datetime.datetime.strptime(fields[-5], datefmt)
except: except:
p = re.compile(r'(?<=_)\d{8}') p = re.compile(r'(?<=_)\d{8}')
dt2 = p.search(safename).group() dt2 = p.search(safename).group()
@ -48,7 +50,7 @@ def FileToTimeStamp(safename):
satName = fields[0] satName = fields[0]
return tstamp, satName return tstamp, satName, sstamp
class MyHTMLParser(HTMLParser): class MyHTMLParser(HTMLParser):
@ -144,7 +146,7 @@ if __name__ == '__main__':
inps = cmdLineParse() inps = cmdLineParse()
fileTS, satName = FileToTimeStamp(inps.input) fileTS, satName, , fileTSStart = FileToTimeStamp(inps.input)
print('Reference time: ', fileTS) print('Reference time: ', fileTS)
print('Satellite name: ', satName) print('Satellite name: ', satName)
@ -198,7 +200,7 @@ if __name__ == '__main__':
for result in results: for result in results:
tbef, taft, mission = fileToRange(os.path.basename(result)) tbef, taft, mission = fileToRange(os.path.basename(result))
if (tbef <= fileTS) and (taft >= fileTS): if (tbef <= fileTSStart) and (taft >= fileTS):
datestr2 = FileToTimeStamp(result)[0].strftime(queryfmt2) datestr2 = FileToTimeStamp(result)[0].strftime(queryfmt2)
match = (server2 + spec[1].replace('aux_', '').upper() + match = (server2 + spec[1].replace('aux_', '').upper() +
'/' +datestr2+ result + '.EOF') '/' +datestr2+ result + '.EOF')