Skip to content
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

Jump to bottom

updated updates #57

Open
wants to merge 9 commits into
base: development
Choose a base branch
from
Open

updated updates #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
881df6a
Parallelization bug removed
tkiyan Mar 22, 2019
94f36c0
fixed unnecessary cutting
tkiyan Mar 22, 2019
5c0e23e
Merge pull request #2 from tkiyan/tkiyan-patch-2
tkiyan Mar 22, 2019
f7bc447
Merge pull request #1 from tkiyan/tkiyan-patch-1
tkiyan Mar 22, 2019
756cf62
link files in case you do not want do cut
tkiyan Mar 22, 2019
46d4dbf
Update displacement.sh
tkiyan Mar 22, 2019
61d6171
Update align_cut_tops.csh
tkiyan Mar 22, 2019
346579e
Update p2p_OSARIS_no_unwrap.csh
tkiyan Mar 22, 2019
02b313f
Update displacement.sh
tkiyan Mar 22, 2019
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
8 changes: 4 additions & 4 deletions lib/GMTSAR-mods/align_cut_tops.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ echo $spre

# Copy LED and PRM file created at preprocessing stage
pwd
cp ../../preprocessing/$mpre".PRM" .
cp ../../preprocessing/$mpre".LED" .
cp ../../preprocessing/$spre".PRM" .
cp ../../preprocessing/$spre".LED" .
cp ../../../preprocessing/$mpre".PRM" .
cp ../../../preprocessing/$mpre".LED" .
cp ../../../preprocessing/$spre".PRM" .
cp ../../../preprocessing/$spre".LED" .

# cp $mpre".LED" $1".LED"
# cp $spre".LED" $3".LED"
Expand Down
9 changes: 6 additions & 3 deletions lib/GMTSAR-mods/p2p_OSARIS_no_unwrap.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,15 +278,18 @@ set OSARIS_PATH = $4
if ($shift_topo == 1) then
ln -s ../../topo/topo_shift.grd .
intf.csh $ref.PRM $rep.PRM -topo topo_shift.grd
filter.csh $ref.PRM $rep.PRM $filter $dec
filter.csh $ref.PRM $rep.PRM $filter $dec
cp -u *gauss* ../../../
else
ln -s ../../topo/topo_ra.grd .
intf.csh $ref.PRM $rep.PRM -topo topo_ra.grd
filter.csh $ref.PRM $rep.PRM $filter $dec
filter.csh $ref.PRM $rep.PRM $filter $dec
cp -u *gauss* ../../../
endif
else
intf.csh $ref.PRM $rep.PRM
filter.csh $ref.PRM $rep.PRM $filter $dec
filter.csh $ref.PRM $rep.PRM $filter $dec
cp -u *gauss* ../../../
endif
cd ../..
echo "INTF.CSH, FILTER.CSH - END"
Expand Down
20 changes: 14 additions & 6 deletions lib/PP-pairs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,18 @@ job_ID=${previous_scene:15:8}--${current_scene:15:8}

mkdir -pv $work_PATH/$job_ID/F$swath/raw
mkdir -pv $work_PATH/$job_ID/F$swath/topo
mkdir -pv $work_PATH/raw/$job_ID-aligned/F$swath/
cd $work_PATH/$job_ID/F$swath/topo; ln -sf $topo_PATH/dem.grd .;

cd $work_PATH/raw/$job_ID-aligned/

cd $work_PATH/raw/$job_ID-aligned/F$swath/
ln -sf $topo_PATH/dem.grd .
ln -sf $work_PATH/raw/${previous_scene:15:8}_manifest.safe .
ln -sf $work_PATH/raw/${current_scene:15:8}_manifest.safe .
ln -sf $work_PATH/raw/$previous_scene.tiff .
ln -sf $work_PATH/raw/$current_scene.tiff .
cp -P $work_PATH/raw/$previous_scene.xml .
cp -P $work_PATH/raw/$current_scene.xml .
cp -P $work_PATH/raw/$previous_orbit .
cp -P $work_PATH/raw/$current_orbit .

# ALIGN SCENE PAIRS

Expand Down Expand Up @@ -74,12 +82,12 @@ $OSARIS_PATH/lib/GMTSAR-mods/align_cut_tops.csh $previous_scene $previous_orbit

# INTERFEROMETRIC PROCESSING

if [ ! -f $work_PATH/raw/$job_ID-aligned/a.grd ] || [ ! -f $work_PATH/raw/$job_ID-aligned/r.grd ]; then
if [ ! -f $work_PATH/raw/$job_ID-aligned/F$swath/a.grd ] || [ ! -f $work_PATH/raw/$job_ID-aligned/F$swath/r.grd ]; then
echo; echo "ERROR: Scene alignment failed. Aborting interferometric processing ..."; echo
else

cd $work_PATH/$job_ID/F$swath/raw/
ln -sf $work_PATH/raw/$job_ID-aligned/*F$swath* .
ln -sf $work_PATH/raw/$job_ID-aligned/F$swath/*F$swath* .

cd $work_PATH/$job_ID/F$swath/

Expand Down
18 changes: 11 additions & 7 deletions lib/prepare-data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ else

ln -sf $work_PATH/orig/${files_chrono[$i]}/measurement/${stem}.tiff .
ln -sf $work_PATH/orig/${files_chrono[$i]}/annotation/${stem}.xml .
cd $work_PATH/preprocessing/
ln -sf $work_PATH/orig/${files_chrono[$i]}/measurement/${stem}.tiff .
ln -sf $work_PATH/orig/${files_chrono[$i]}/annotation/${stem}.xml .
cd $work_PATH/preprocessing/raw
make_s1a_tops ${stem}.xml ${stem}.tiff ${stem} 0
scene_prefix="${stem:15:8}_${stem:24:6}_F${swath}"
prefixes+=($scene_prefix)
Expand Down Expand Up @@ -242,13 +246,13 @@ else
for((i=0;i<$stem_count;++i)); do
stem_string="$stem_string ${stems_chrono[$i]}"
done

if [ $debug -ge 1 ]; then
echo; echo "Executing assemble_tops with parameters:"
echo "$azimuth_min $azimuth_max $stem_string $work_PATH/preprocessing/$stem"
fi
assemble_tops $azimuth_min $azimuth_max $stem_string $work_PATH/preprocessing/$stem

if [ $cut_to_aoi -eq 1 ]; then
if [ $debug -ge 1 ]; then
echo; echo "Executing assemble_tops with parameters:"
echo "$azimuth_min $azimuth_max $stem_string $work_PATH/preprocessing/$stem"
fi
assemble_tops $azimuth_min $azimuth_max $stem_string $work_PATH/preprocessing/$stem
fi
cd $work_PATH/preprocessing/

# Generate new PRM files for assembled tops
Expand Down