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.

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

new alosStack, PRF change of ALOS-1, update of TOPS ionospheric correction, new ionospheric filter #175

Merged
merged 26 commits into from
Mar 4, 2021

Conversation

CunrenLiang
Copy link
Contributor

@CunrenLiang CunrenLiang commented Aug 4, 2020

  1. new alosStack application
  2. handling PRF change for ALOS-1 raw data
  3. adding options for discarding burst properties in TOPS ionospheric phase estimation
  4. updated ionospheric phase filtering for ALOS-2
  5. a few other minor changes including fixed a bug in ionospheric computation in topsApp.py, fixed problems in getting range sampling frequency, range bandwidth, chirp slope and pulse duration for TerraSAR-X, fixed bug in computing cost flow in snaphu, and others.

Copy link
Collaborator

@hfattahi hfattahi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @CunrenLiang and sorry for very late review. It Looks good to me. There is one function that I don't see any where used. It will be great to remove it if it's not needed.

return f2d/np.sum(f2d)


def adaptive_gaussian_v0(ionos, wgt, size_max, size_min):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this function used anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries about the late review.
This is an older version of the filter. I am not sure if I will be using it in the future, so I didn't remove it from the file.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok no worries

@hfattahi hfattahi requested a review from vbrancat October 4, 2020 14:02
@CunrenLiang CunrenLiang changed the title updated ionospheric phase filtering for ALOS-2 new alosStack, PRF change of ALOS-1, update of TOPS ionospheric correction, new ionospheric filter Oct 20, 2020
@hfattahi
Copy link
Collaborator

@yunjunz and @piyushrpt would you please take a look at this PR. A lot of great contributions from @CunrenLiang are all squeezed in this PR. Of course it would have been nice to see smaller PRs. Maybe for future PRs.
@CunrenLiang you may need to rebase with main to fix the build fails.

@CunrenLiang
Copy link
Contributor Author

@yunjunz and @piyushrpt would you please take a look at this PR. A lot of great contributions from @CunrenLiang are all squeezed in this PR. Of course it would have been nice to see smaller PRs. Maybe for future PRs.
@CunrenLiang you may need to rebase with main to fix the build fails.

It would be great if this pull request can get merged early.

I did the rebase. Still one check failed. I think it might be related to docker? I am new to docker. Here is the output

#!/bin/sh -eo pipefail
cd images
source env.sh
docker load -i isce2.tar
docker tag isce/isce2:$TAG isce/isce2:latest
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push isce/isce2:$TAG
docker push isce/isce2:latest


e09ab3c0: Loading layer  211.1MB/211.1MB
de09d0c7: Loading layer  2.048kB/2.048kB
65112c6b: Loading layer  2.773GB/2.773GB
e56654fd: Loading layer  2.048kB/2.048kB
e1d62512: Loading layer   2.56kB/2.56kB
a0927620: Loading layer  68.24MB/68.24MB
fd0f5a83: Loading layer  316.3MB/316.3MB
324abdc2: Loading layer  9.728kB/9.728kB
efa43047: Loading layer  25.55MB/25.55MB
Loaded image: isce/isce2:b341c66/1.23GB
Password: EOF

Exited with code exit status 1

CircleCI received exit code 1

Copy link
Member

@rtburns-jpl rtburns-jpl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new features and fixes look great, but I want to echo @hfattahi's comment about smaller PRs - it's essentially unfeasible for us to review +13k line diffs. We're able to review and merge more granular PRs with limited scope much more quickly.

components/isceobj/Alos2Proc/runIonCorrect.py Outdated Show resolved Hide resolved
components/isceobj/Alos2Proc/runIonFilt.py Outdated Show resolved Hide resolved
components/isceobj/Alos2Proc/runIonSubband.py Outdated Show resolved Hide resolved
components/isceobj/Sensor/ALOS.py Outdated Show resolved Hide resolved
CunrenLiang and others added 4 commits November 15, 2020 01:00
minor update
remove author info
delete functions not used
@CunrenLiang
Copy link
Contributor Author

CunrenLiang commented Nov 23, 2020

@yunjunz and @piyushrpt would you please take a look at this PR. A lot of great contributions from @CunrenLiang are all squeezed in this PR. Of course it would have been nice to see smaller PRs. Maybe for future PRs.
@CunrenLiang you may need to rebase with main to fix the build fails.

It would be great if this pull request can get merged early.

I did the rebase. Still one check failed. I think it might be related to docker? I am new to docker. Here is the output

#!/bin/sh -eo pipefail
cd images
source env.sh
docker load -i isce2.tar
docker tag isce/isce2:$TAG isce/isce2:latest
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push isce/isce2:$TAG
docker push isce/isce2:latest


e09ab3c0: Loading layer  211.1MB/211.1MB
de09d0c7: Loading layer  2.048kB/2.048kB
65112c6b: Loading layer  2.773GB/2.773GB
e56654fd: Loading layer  2.048kB/2.048kB
e1d62512: Loading layer   2.56kB/2.56kB
a0927620: Loading layer  68.24MB/68.24MB
fd0f5a83: Loading layer  316.3MB/316.3MB
324abdc2: Loading layer  9.728kB/9.728kB
efa43047: Loading layer  25.55MB/25.55MB
Loaded image: isce/isce2:b341c66/1.23GB
Password: EOF

Exited with code exit status 1

CircleCI received exit code 1

@rtburns-jpl @piyushrpt , I think this docker deploy failure is related to docker credentials? If so, I am just leaving it here until the credentials are updated.

@CunrenLiang CunrenLiang reopened this Nov 23, 2020
@rtburns-jpl
Copy link
Member

Could you try merging main into your branch to see if that fixes the deploy issue?

@CunrenLiang
Copy link
Contributor Author

Could you try merging main into your branch to see if that fixes the deploy issue?

Still failed at password step @rtburns-jpl .

@rtburns-jpl
Copy link
Member

ping @piyushrpt - didn't we run into something similar a while ago? I don't recall what we did to solve it :/

efa43047: Loading layer  25.55MB/25.55MB
Loaded image: isce/isce2:b341c66/1.23GB
Password: EOF

Exited with code exit status 1

CircleCI received exit code 1

add comments about identifying bad pairs
correct variable name
@lijun99
Copy link
Contributor

lijun99 commented Jan 9, 2021

I think the problem might be with "docker login -u $DOCKER_USER -p $DOCKER_PASS". These two envs need to set somewhere. For failsafe, it's better to use -n check before calling it.

Anyway, I advised @CunrenLiang to rename his branch from main; that might be the reason to force a deploy check on his PR.

ping @piyushrpt - didn't we run into something similar a while ago? I don't recall what we did to solve it :/

efa43047: Loading layer  25.55MB/25.55MB
Loaded image: isce/isce2:b341c66/1.23GB
Password: EOF

Exited with code exit status 1

CircleCI received exit code 1

@rtburns-jpl
Copy link
Member

Hey, sorry about all the CI issues. I think they're all resolved now, so if you merge main, you should get all green checkmarks.

@CunrenLiang
Copy link
Contributor Author

CunrenLiang commented Feb 26, 2021

Hey, sorry about all the CI issues. I think they're all resolved now, so if you merge main, you should get all green checkmarks.

Thank you for the update @rtburns-jpl . Looks like the same problem in deploy is still there. The error message is the same.

@CunrenLiang CunrenLiang reopened this Feb 26, 2021
@rtburns-jpl
Copy link
Member

Ugh, yep. Well, at least the build job is working now. Anyway, I'll try to look this over to the best of my ability next week so we can merge this soon.

@CunrenLiang
Copy link
Contributor Author

CunrenLiang commented Feb 26, 2021

I think Lijun's suggestions might be promising. I tried to change my branch name from 'main' to something else, but it looks like it's not easy to do it without deleting my current branch and re-fork. So perhaps we can try to change the circleci configure file.

@rtburns-jpl
Copy link
Member

Ah yeah, maybe the deploy job is just checking if the branch name is 'main' without also checking that it's not running on a fork. Honestly, don't worry about it. The build/test jobs were what I was concerned about and those are all fine now.

@CunrenLiang
Copy link
Contributor Author

Ah yeah, maybe the deploy job is just checking if the branch name is 'main' without also checking that it's not running on a fork. Honestly, don't worry about it. The build/test jobs were what I was concerned about and those are all fine now.

Yes, Lijun just explained it with more details. It should be OK to just merge it. Then I can rename my fork to other names instead of 'main', so that it won't deploy again for my future PRs.

Copy link
Member

@rtburns-jpl rtburns-jpl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Between this and PyCuAmpcor, we have a good number of new features in isce2, so I'll plan to cut a v2.5 release after merging.

@CunrenLiang CunrenLiang closed this Mar 4, 2021
@CunrenLiang CunrenLiang reopened this Mar 4, 2021
@CunrenLiang
Copy link
Contributor Author

CunrenLiang commented Mar 4, 2021

It may be better to include this pull request in v2.5, as many people are waiting to use the new features in this pull request. Right now they have to use the code in my repository.

Between this and PyCuAmpcor, we have a good number of new features in isce2, so I'll plan to cut a v2.5 release after merging.

@rtburns-jpl rtburns-jpl merged commit d0ec8c1 into isce-framework:main Mar 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants