Skip to content

Commit

Permalink
FM rate mismatch - follow-up bug fix (#92)
Browse files Browse the repository at this point in the history
* Replacing the loaders in Burst* class into class methods, with further implementation for thermal and EAP correction

* fix on determining beta_naught; addressing PEP8 issues

* Bug fix and feature addition to BurstEAP; restructuring LUT exportation

* Readibility improvement; removing unnecessary imports

* Format change on `burst_id`; keeping the absolute orbit number inside `Sentinel1BurstSlc`

* updates on test_bursts.py

* keeping the basename of the CADS and NADS for populating RTC metadata

* Update src/s1reader/s1_annotation.py

Readability improvement on equation

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Removing commented out code

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Reverting the docstring to be split into two lines for PEP8 compliance

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Improving docstring of the code copied from isce2

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Removing the commented out codes

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

improvement on code brevity

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

renaming variable for better clarity

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

renaming variable name for clarity

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

variable name revised for clarity

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

variable renamed for clarity

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

improvement on docstring

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Readability improvement of equation

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* addressing comments bt @LiangJYu

* docstring fix; variables renamed for clarity

* implemented s1_annotation.AucCal.load_from_zip_file()

* readability improvement

* s1_annotation.py - code cleanup; excention handling for AUX_CAL; PEP8 compliance

* docstring for `s1_burst_slc.eap_compensation_lut()`

* class import scheme changed

* PEP8 compliance

* initial structure of modification

* less mod compared to the branch fork

* extended coeffs for FM rate and Doppler centroid to be used for azimuth FM mismatch rate mitigation

* Working version of azimuth FM rate mismatch mitigation

* Update src/s1reader/s1_orbit.py

Co-authored-by: Gustavo H. X. Shiroma <52007211+gshiroma@users.noreply.github.com>

* Update src/s1reader/s1_orbit.py

Co-authored-by: Gustavo H. X. Shiroma <52007211+gshiroma@users.noreply.github.com>

* Update src/s1reader/s1_orbit.py

Co-authored-by: Gustavo H. X. Shiroma <52007211+gshiroma@users.noreply.github.com>

* Update src/s1reader/s1_orbit.py

Co-authored-by: Gustavo H. X. Shiroma <52007211+gshiroma@users.noreply.github.com>

* Update src/s1reader/s1_orbit.py

Co-authored-by: Gustavo H. X. Shiroma <52007211+gshiroma@users.noreply.github.com>

* Update src/s1reader/s1_orbit.py

Co-authored-by: Gustavo H. X. Shiroma <52007211+gshiroma@users.noreply.github.com>

* addressing comments from @gshiroma

* trailing white spaces are removed

* docstring updated

* Code cleanup and docstrings

* code cleanup

* trailing white space removed

* docsrting added; variable renaming for less verbosity;

* code cleanup and simplification

* variable name simplification

* clde cleanup

* Output as isce3.core.LUT2d

* threshold and num_iter for rdr2geo

* Addressing codacy issue

* Trailing whitespace removed

* codacy issue

* docstring clarification on `BurstExtendedCoeffs`

* whitespace removed

* Update src/s1reader/s1_orbit.py

Co-authored-by: vbrancat <virginia.brancato@jpl.nasa.gov>

* Update src/s1reader/s1_orbit.py

Co-authored-by: vbrancat <virginia.brancato@jpl.nasa.gov>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* comment added for clarity

* Update src/s1reader/s1_annotation.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* mod on the suggested commit to reuse the topo output filenames

* fix on variable

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: vbrancat <virginia.brancato@jpl.nasa.gov>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: vbrancat <virginia.brancato@jpl.nasa.gov>

* typo fix

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: vbrancat <virginia.brancato@jpl.nasa.gov>

* Re-using the parsed polynomials; mitigation results as ISCE3 LUT2d

* revision on import format

* TODO removed

* Option to turn on / off the functionalities for az fm rate mismatch mitigation

* removing alias for `Rdr2Geo`

* whitespace removed after resolving conflict

* addressing codacy issue

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Update src/s1reader/s1_reader.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* variable name changed

* bug fixed; variable name updated

* addressing codacy issues

* codacy issue

* variable name changed

* pulling out functions that does not need to be methods

* whitespace removed

* updates after linting

* Docstring for `_burst_from_safe_dir` revised

* Docstring for `_burst_from_zip` revised

* Docstring for `load_bursts` revised

* Docstring for `burst_from_xml` revised

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Liang Yu <liangjyu@gmail.com>

* Docstring for `az_fm_rate_mismatch_mitigation` revised

* Use temporary directory when `path_scratch` was not provided; take in az/rg steps as options to define radargrid

* codacy issue

* docstring updated; variable name changed

* unnecessary members removed; docstring revised

* temporary filename format changed

* Update src/s1reader/s1_annotation.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_annotation.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* unit_degree -> in_degree

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Update src/s1reader/s1_burst_slc.py

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* Apply suggestions from code review

Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>

* variable name format revised

* `mitigate_az_fmrate_mismatch` removed

* PEP8 issues

* Handle the case that the burst's sensing period exceeds the range of `polynomial_list`

Co-authored-by: Seongsu Jeong <seongsu.jeong@jpl.nasa.gov>
Co-authored-by: Liang Yu <liangjyu@gmail.com>
Co-authored-by: Gustavo H. X. Shiroma <52007211+gshiroma@users.noreply.github.com>
Co-authored-by: vbrancat <virginia.brancato@jpl.nasa.gov>
Co-authored-by: Scott Staniewicz <scott.stanie@gmail.com>
  • Loading branch information
6 people authored Dec 15, 2022
1 parent e1cbc57 commit eb5e53e
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/s1reader/s1_annotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,10 @@ def extract_polynomial_sequence(cls, polynomial_list: list,
dt_wrt_end = np.ma.masked_array(dt_wrt_end, mask=dt_wrt_end < 0)
index_end = np.argmin(dt_wrt_end)

# Handle the case that the burst's sensing period exceeds `polynomial_list`
if index_end == 0 and index_start > 0:
index_end = len(polynomial_list)-1

# Done extracting the IDs. Extract the polynomial sequence
vec_aztime_sequence = []
arr_coeff_sequence = []
Expand Down

0 comments on commit eb5e53e

Please sign in to comment.