Skip to content

Annotation class attrs #123

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
scottstanie wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Annotation class attrs #123

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
25ee8ab
refactor `_parse_scalar` and `_parse_vectorlist`
scottstanie Jun 28, 2023
3cac50a
convert `CalibrationAnnotation` classmethod to return an instance
scottstanie Jun 28, 2023
a847806
convert `NoiseAnnotation.from_et` to return an instance
scottstanie Jun 28, 2023
ee1644c
convert `ProductAnnotation.from_et` to return an instance
scottstanie Jun 28, 2023
a720486
convert `AuxCal` classmethod to return an instance
scottstanie Jun 28, 2023
b997da3
convert `SwathRfiInfo` to return an instance, remove the ipf check fr…
scottstanie Jun 28, 2023
5561be3
remove ipf argument, typo
scottstanie Jun 28, 2023
9e18580
convert the `SwathRfiInfo.extract_by_aztime` to be an instance method
scottstanie Jun 28, 2023
37f0b8c
convert the `parse_vectorlist` to a staticmethod
scottstanie Jun 28, 2023
76f87f9
fix `closest_block_to_azimuth_time` to coerce to numpy array
scottstanie Jun 28, 2023
0ade8d0
two typos
scottstanie Jun 28, 2023
f309b69
Apply suggestions from code review
scottstanie Jun 29, 2023
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
Prev Previous commit
Next Next commit
convert CalibrationAnnotation classmethod to return an instance
  • Loading branch information
@scottstanie
scottstanie committed Jun 28, 2023
commit 3cac50a06a417ed703920cbdbe178d28b072f84b
72 changes: 35 additions & 37 deletions src/s1reader/s1_annotation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ class AnnotationBase:
A virtual base class of the inheriting annotation class i.e. Product, Calibration, and Noise.
Not intended for standalone use.
'''
xml_et: ET

@staticmethod
def _parse_scalar(xml_et: ET.ElementTree, path_field: str, str_type: str):
'''A class method that parse the scalar value in AnnotationBase.xml_et
Expand Down Expand Up @@ -223,40 +221,39 @@ def from_et(cls, et_in: ET, path_annotation: str):
Instance of CalibrationAnnotation initialized by the input parameter
'''

cls.xml_et = et_in
cls.basename_annotation = \
os.path.basename(path_annotation)

cls.list_azimuth_time = \
cls._parse_vectorlist('calibrationVectorList',
'azimuthTime',
'datetime')
cls.list_line = \
cls._parse_vectorlist('calibrationVectorList',
'line',
'scalar_int')
cls.list_pixel = \
cls._parse_vectorlist('calibrationVectorList',
'pixel',
'vector_int')
cls.list_sigma_nought = \
cls._parse_vectorlist('calibrationVectorList',
'sigmaNought',
'vector_float')
cls.list_beta_nought = \
cls._parse_vectorlist('calibrationVectorList',
'betaNought',
'vector_float')
cls.list_gamma = \
cls._parse_vectorlist('calibrationVectorList',
'gamma',
'vector_float')
cls.list_dn = \
cls._parse_vectorlist('calibrationVectorList',
'dn',
'vector_float')

return cls
basename_annotation = os.path.basename(path_annotation)

list_azimuth_time = cls._parse_vectorlist(et_in,
'calibrationVectorList',
'azimuthTime',
'datetime')
list_line = cls._parse_vectorlist(et_in,
'calibrationVectorList',
'line',
'scalar_int')
list_pixel = cls._parse_vectorlist(et_in,
'calibrationVectorList',
'pixel',
'vector_int')
list_sigma_nought = cls._parse_vectorlist(et_in,
'calibrationVectorList',
'sigmaNought',
'vector_float')
list_beta_nought = cls._parse_vectorlist(et_in,
'calibrationVectorList',
'betaNought',
'vector_float')
list_gamma = cls._parse_vectorlist(et_in,
'calibrationVectorList',
'gamma',
'vector_float')
list_dn = cls._parse_vectorlist(et_in,
'calibrationVectorList',
'dn',
'vector_float')

return cls(basename_annotation, list_azimuth_time, list_line, list_pixel,
list_sigma_nought, list_beta_nought, list_gamma, list_dn)


@dataclass
Expand Down Expand Up @@ -1088,7 +1085,8 @@ def _anx2height(cls, delta_anx):
Implementation from S1A documention.

Code copied from ISCE2.

See https://eop-cfi.esa.int/Repo/PUBLIC/DOCUMENTATION/SYSTEM_SUPPORT_DOCS/Mission%20Convention%20Documents/MCD_custom_v4_23.pdf
table 10.

Parameters:
-----------
Expand Down