Skip to content

Removing the master-slave vocabulary #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bopopescu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing the master-slave vocabulary #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/csk_dump_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def usage():
print
print 'Usage : csk_dump_data.py <inputfile> <outputfile> [l0 lN p0 pN] [-res RESFILE]'
print
print ' inputfile is the input Cosmo-skymed HDF5 filename : master.hd5'
print ' outputfile is the output filename : master.slc'
print ' inputfile is the input Cosmo-skymed HDF5 filename : main.hd5'
print ' outputfile is the output filename : main.slc'
print ' l0 is the first azimuth line (starting at 1)'
print ' lN is the last azimuth line'
print ' p0 is the first range pixel (starting at 1)'
Expand Down
4 changes: 2 additions & 2 deletions bin/rs2_dump_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def usage():
print
print 'Usage : rs2_dump_data.py <inputfile> <outputfile> [l0 lN p0 pN] [-res RESFILE]'
print
print ' inputfile is the input Radarsat-2 geotiff filename : master.tif'
print ' outputfile is the output filename : master.slc'
print ' inputfile is the input Radarsat-2 geotiff filename : main.tif'
print ' outputfile is the output filename : main.slc'
print ' l0 is the first azimuth line (starting at 1)'
print ' lN is the last azimuth line'
print ' p0 is the first range pixel (starting at 1)'
Expand Down
2 changes: 1 addition & 1 deletion bin/tsx_dump_header2doris.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def hms2sec(hmsString,convertFlag='int'):
# outStream.write('precise_orbits: 0\n')
# outStream.write('crop: 0\n')
# outStream.write('sim_amplitude: 0\n')
# outStream.write('master_timing: 0\n')
# outStream.write('main_timing: 0\n')
# outStream.write('oversample: 0\n')
# outStream.write('resample: 0\n')
# outStream.write('filt_azi: 0\n')
Expand Down
2 changes: 1 addition & 1 deletion bin/tsx_dump_header2doris_noxpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def hms2sec(hmsString,convertFlag='int'):
# print('precise_orbits: 0')
# print('crop: 0')
# print('sim_amplitude: 0')
# print('master_timing: 0')
# print('main_timing: 0')
# print('oversample: 0')
# print('resample: 0')
# print('filt_azi: 0')
Expand Down
8 changes: 4 additions & 4 deletions doris_stack/functions/ESD_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ def get_f_DC_difference(nBurst):
burst1 = 'burst_' + str(nBurst) + '/'
burst2 = 'burst_' + str(nBurst + 1) + '/'

this_m_resData = burst1 + 'master.res'
next_m_resData = burst2 + 'master.res'
this_m_resData = burst1 + 'main.res'
next_m_resData = burst2 + 'main.res'

os.chdir(os.getcwd() + '/' + burst1)
f_DC_1 = get_ramp(os.path.basename(this_m_resData), resampled=0, type='DC')
Expand All @@ -118,8 +118,8 @@ def get_coordinates(nBurst):

burst1 = 'burst_' + str(nBurst) + '/'
burst2 = 'burst_' + str(nBurst+1) + '/'
this_m_resData = burst1 + 'master.res'
next_m_resData = burst2 + 'master.res'
this_m_resData = burst1 + 'main.res'
next_m_resData = burst2 + 'main.res'

# Get variables from first burst
this_line_first = int(get_parameter('First_line (w.r.t. output_image)',this_m_resData,1))
Expand Down
102 changes: 51 additions & 51 deletions doris_stack/functions/ESD_ps_ds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from doris.doris_stack.functions.ESD_functions import get_f_DC_difference, get_coordinates, freadbk


def save_overlapping(stack_folder, master_date, dates, overlap):
def save_overlapping(stack_folder, main_date, dates, overlap):

nBurst, burst, next_burst = get_burst(overlap)

Expand All @@ -27,33 +27,33 @@ def save_overlapping(stack_folder, master_date, dates, overlap):
burst1 = 'burst_' + str(nBurst) + '/'
burst2 = 'burst_' + str(nBurst + 1) + '/'

# First get the data for the master and df_dc
master_path = os.path.join(overlap_path, master_date)
# First get the data for the main and df_dc
main_path = os.path.join(overlap_path, main_date)
df_dc_path = os.path.join(overlap_path, 'df_dc')

master_1 = master_file(burst)
master_2 = master_file(next_burst)
main_1 = main_file(burst)
main_2 = main_file(next_burst)

if not os.path.exists(master_path + '_1') or not os.path.exists(master_path + '_2'):
master_1 = freadbk(burst1 + master_1, line_start, first_pixel_this, line_length,
if not os.path.exists(main_path + '_1') or not os.path.exists(main_path + '_2'):
main_1 = freadbk(burst1 + main_1, line_start, first_pixel_this, line_length,
pixel_length, 'cpxint16', this_nr_oflines, this_nr_ofpixels)
master_2 = freadbk(burst2 + master_2, 1, first_pixel_next, line_length, pixel_length,
main_2 = freadbk(burst2 + main_2, 1, first_pixel_next, line_length, pixel_length,
'cpxint16', next_nr_oflines, next_nr_ofpixels)
master_1_file = np.memmap(master_path + '_1', 'complex64', shape=master_1.shape, mode='w+')
master_2_file = np.memmap(master_path + '_2', 'complex64', shape=master_2.shape, mode='w+')
master_1_file[:] = master_1
master_2_file[:] = master_2
master_1_file.flush()
master_2_file.flush()
main_1_file = np.memmap(main_path + '_1', 'complex64', shape=main_1.shape, mode='w+')
main_2_file = np.memmap(main_path + '_2', 'complex64', shape=main_2.shape, mode='w+')
main_1_file[:] = main_1
main_2_file[:] = main_2
main_1_file.flush()
main_2_file.flush()

if not os.path.exists(df_dc_path):
df_dc = get_f_DC_difference(nBurst)
df_dc_file = np.memmap(df_dc_path, 'float32', shape=df_dc.shape, mode='w+')
df_dc_file[:,:] = df_dc[:,:]

# Then loop over the slaves
# Then loop over the subordinates
for date in dates:
if date == master_date:
if date == main_date:
continue

path = swath_path(stack_folder, date, burst)
Expand All @@ -66,14 +66,14 @@ def save_overlapping(stack_folder, master_date, dates, overlap):
burst2 = 'burst_' + str(nBurst + 1) + '/'

if not os.path.exists(data_path + '_1') or not os.path.exists(data_path + '_2'):
slave_1 = freadbk(burst1 + 'slave_rsmp_reramped.raw', line_start, first_pixel_this, line_length, pixel_length , 'complex64', this_nr_oflines, this_nr_ofpixels)
slave_2 = freadbk(burst2 + 'slave_rsmp_reramped.raw', 1, first_pixel_next, line_length, pixel_length, 'complex64', next_nr_oflines, next_nr_ofpixels)
slave_1_file = np.memmap(data_path + '_1', 'complex64', shape=slave_1.shape, mode='w+')
slave_2_file = np.memmap(data_path + '_2', 'complex64', shape=slave_2.shape, mode='w+')
slave_1_file[:] = slave_1
slave_2_file[:] = slave_2
slave_1_file.flush()
slave_2_file.flush()
subordinate_1 = freadbk(burst1 + 'subordinate_rsmp_reramped.raw', line_start, first_pixel_this, line_length, pixel_length , 'complex64', this_nr_oflines, this_nr_ofpixels)
subordinate_2 = freadbk(burst2 + 'subordinate_rsmp_reramped.raw', 1, first_pixel_next, line_length, pixel_length, 'complex64', next_nr_oflines, next_nr_ofpixels)
subordinate_1_file = np.memmap(data_path + '_1', 'complex64', shape=subordinate_1.shape, mode='w+')
subordinate_2_file = np.memmap(data_path + '_2', 'complex64', shape=subordinate_2.shape, mode='w+')
subordinate_1_file[:] = subordinate_1
subordinate_2_file[:] = subordinate_2
subordinate_1_file.flush()
subordinate_2_file.flush()


def find_ps_overlapping(stack_folder, overlap):
Expand Down Expand Up @@ -149,19 +149,19 @@ def select_ps_data(stack_folder, overlap):

# Save only the ps points to file.
for date in dates:
slave_ps_name = os.path.join(overlap_path, date + '_1_ps')
master_ps_name = os.path.join(overlap_path, date + '_2_ps')
subordinate_ps_name = os.path.join(overlap_path, date + '_1_ps')
main_ps_name = os.path.join(overlap_path, date + '_2_ps')

if not os.path.exists(slave_ps_name) or not os.path.exists(master_ps_name):
slave_ps = np.memmap(slave_ps_name, 'complex64', mode='w+', shape=(ps_num))
master_ps = np.memmap(master_ps_name, 'complex64', mode='w+', shape=(ps_num))
slave = np.memmap(os.path.join(overlap_path, date + '_1'), 'complex64', mode='r',
if not os.path.exists(subordinate_ps_name) or not os.path.exists(main_ps_name):
subordinate_ps = np.memmap(subordinate_ps_name, 'complex64', mode='w+', shape=(ps_num))
main_ps = np.memmap(main_ps_name, 'complex64', mode='w+', shape=(ps_num))
subordinate = np.memmap(os.path.join(overlap_path, date + '_1'), 'complex64', mode='r',
shape=(line_length, pixel_length))
master = np.memmap(os.path.join(overlap_path, date + '_2'), 'complex64', mode='r',
main = np.memmap(os.path.join(overlap_path, date + '_2'), 'complex64', mode='r',
shape=(line_length, pixel_length))
if ps_num > 0:
slave_ps[:] = slave[ps_dat]
master_ps[:] = master[ps_dat]
subordinate_ps[:] = subordinate[ps_dat]
main_ps[:] = main[ps_dat]
# Do the same for the df_dc file
if not os.path.exists(os.path.join(overlap_path, 'df_dc_ps')):
df_dc_ps = np.memmap(os.path.join(overlap_path, 'df_dc_ps'), 'float32', mode='w+', shape=(ps_num))
Expand All @@ -171,7 +171,7 @@ def select_ps_data(stack_folder, overlap):
df_dc_ps[:] = df_dc[ps_dat]


def network_esd_ps(stack_folder, overlap, master_date, max_baseline, max_offset=0.02):
def network_esd_ps(stack_folder, overlap, main_date, max_baseline, max_offset=0.02):
# Based on ps point esd is calculated using a network approach

dates, overlap_path, diff_matrix, var_matrix, to_angle_matrix, weight_matrix, processing = prepare_esd(stack_folder, overlap)
Expand Down Expand Up @@ -202,16 +202,16 @@ def network_esd_ps(stack_folder, overlap, master_date, max_baseline, max_offset=
timediff = datetime.strptime(date_2, '%Y-%m-%d') - datetime.strptime(date, '%Y-%m-%d')
if timediff > timedelta(minutes=1) and timediff < timedelta(days=max_baseline):

first_master = np.memmap(os.path.join(overlap_path, date + '_1_ps'), 'complex64', mode='r',
first_main = np.memmap(os.path.join(overlap_path, date + '_1_ps'), 'complex64', mode='r',
shape=ps_num)
first_slave = np.memmap(os.path.join(overlap_path, date_2 + '_1_ps'), 'complex64', mode='r',
first_subordinate = np.memmap(os.path.join(overlap_path, date_2 + '_1_ps'), 'complex64', mode='r',
shape=ps_num)
second_master = np.memmap(os.path.join(overlap_path, date + '_2_ps'), 'complex64', mode='r',
second_main = np.memmap(os.path.join(overlap_path, date + '_2_ps'), 'complex64', mode='r',
shape=ps_num)
second_slave = np.memmap(os.path.join(overlap_path, date_2 + '_2_ps'), 'complex64', mode='r',
second_subordinate = np.memmap(os.path.join(overlap_path, date_2 + '_2_ps'), 'complex64', mode='r',
shape=ps_num)

double_diff = (first_master * first_slave.conj()) * (second_master * second_slave.conj()).conj()
double_diff = (first_main * first_subordinate.conj()) * (second_main * second_subordinate.conj()).conj()

# Now select all pixels with an offset of less than x milipixel
double_diff[np.isnan(double_diff)] = 0.050
Expand All @@ -231,10 +231,10 @@ def network_esd_ps(stack_folder, overlap, master_date, max_baseline, max_offset=
return diff_matrix, var_matrix, to_angle_matrix, weight_matrix, dates


def network_esd_coh(stack_folder, overlap, master_date, max_baseline, ra=10, az=2):
def network_esd_coh(stack_folder, overlap, main_date, max_baseline, ra=10, az=2):

dates, overlap_path, diff_matrix, var_matrix, to_angle_matrix, weight_matrix, processed = prepare_esd(stack_folder, overlap)
folder = master_date[0:4] + master_date[5:7] + master_date[8:10] + "_" + dates[0][0:4] + dates[0][5:7] + dates[0][8:10]
folder = main_date[0:4] + main_date[5:7] + main_date[8:10] + "_" + dates[0][0:4] + dates[0][5:7] + dates[0][8:10]
os.chdir(os.path.join(stack_folder, folder, overlap[0:7]))

nBurst = int(overlap.split('_')[3])
Expand Down Expand Up @@ -426,10 +426,10 @@ def swath_path(stack_folder, date, key):
return file_path


def master_file(key):
def main_file(key):
# This function converts combinations of dates and keys to a datafile name
string = '_iw_' + key[6] + '_burst_' + key[14:]
string = 'master' + string + '.raw'
string = 'main' + string + '.raw'

return string

Expand All @@ -442,32 +442,32 @@ def master_file(key):
overlap = sys.argv[2]
esd_type = sys.argv[3]
max_baseline = sys.argv[4]
master_date = sys.argv[5]
main_date = sys.argv[5]
ps_select = sys.argv[6] # Use 1 if needed, use 0 if not
elif len(sys.argv) == 6:
stack_folder = sys.argv[1]
overlap = sys.argv[2]
esd_type = sys.argv[3]
max_baseline = sys.argv[4]
master_date = sys.argv[5]
main_date = sys.argv[5]
else:
sys.exit('usage: stack_folder type burst')

print('stack folder is ' + stack_folder)
print('burst is ' + overlap)
print('ps select is ' + ps_select)
print('max baseline is ' + max_baseline)
print('master date is ' + master_date)
print('main date is ' + main_date)
print('type ESD is ' + esd_type)

# first get all the dates from the stack:
master_key = master_date[:4] + master_date[5:7] + master_date[8:]
main_key = main_date[:4] + main_date[5:7] + main_date[8:]

ifgs = [f for f in os.listdir(stack_folder) if len(f) == 8]
dates = [f[:4] + '-' + f[4:6] + '-' + f[6:8] for f in ifgs if f != master_key]
dates = [f[:4] + '-' + f[4:6] + '-' + f[6:8] for f in ifgs if f != main_key]

# Then run the overlap cutout / ps selection and
save_overlapping(stack_folder, master_date, dates, overlap)
save_overlapping(stack_folder, main_date, dates, overlap)

# If we want to select ps points
if ps_select == '1':
Expand All @@ -477,9 +477,9 @@ def master_file(key):
max_baseline = int(max_baseline)
if esd_type == 'ps':
select_ps_data(stack_folder, overlap)
diff_matrix, var_matrix, to_angle_matrix, weight, dates = network_esd_ps(stack_folder, overlap, master_date, max_baseline)
diff_matrix, var_matrix, to_angle_matrix, weight, dates = network_esd_ps(stack_folder, overlap, main_date, max_baseline)
elif esd_type == 'coh':
diff_matrix, var_matrix, to_angle_matrix, weight, dates = network_esd_coh(stack_folder, overlap, master_date, max_baseline)
diff_matrix, var_matrix, to_angle_matrix, weight, dates = network_esd_coh(stack_folder, overlap, main_date, max_baseline)
else:
sys.exit('Type should either be coh or ps')

Expand Down
6 changes: 3 additions & 3 deletions doris_stack/functions/baselines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ def baselines(dir_in,inputfile,start_date='2014-01-01',end_date='2018-01-01',dor
resfiles = dict()

# First create the ifgs.res files and store the data in a res data class.
master = res[0]
copyfile(master,os.path.join(process_folder,'master.res'))
main = res[0]
copyfile(main,os.path.join(process_folder,'main.res'))

for resultfile, dat in zip(res, date):
copyfile(resultfile,os.path.join(process_folder,'slave.res'))
copyfile(resultfile,os.path.join(process_folder,'subordinate.res'))
subprocess.call([doris + ' ' + inputfile], shell=True)

dat = dat.astype(datetime.datetime).strftime('%Y-%m-%d')
Expand Down
2 changes: 1 addition & 1 deletion doris_stack/functions/burst_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def burst_crop(meta,burst_num,swath_data,new_burst_num):
first_sample = [int(x) for x in meta['aux']['firstValidSample'][burst_num-1].split()]

swath_data = os.path.basename(swath_data)
crop['Data_output_file'] = 'slave_iw_' + swath_data[6] + '_burst_' + str(new_burst_num) + '.raw'
crop['Data_output_file'] = 'subordinate_iw_' + swath_data[6] + '_burst_' + str(new_burst_num) + '.raw'
crop['Data_output_format'] = 'complex_short'

# Start line of this burst in total swath product
Expand Down
Loading