Skip to content

Commit c79bbb2

Browse files
alexamicialexamici
committed
Revert changes in camelCase and make new names uniform
1 parent 77e9a38 commit c79bbb2

File tree

2 files changed

+98
-52
lines changed

2 files changed

+98
-52
lines changed

‎tests/test_20_sentinel1.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -257,18 +257,23 @@ def test_find_avalable_groups() -> None:
257257
"S3",
258258
"S3/VV",
259259
"S3/VV/attitude",
260+
"S3/VV/antenna_pattern",
260261
"S3/VV/gcp",
261262
"S3/VV/orbit",
262263
"S3/VV/dc_estimate",
263264
"S3/VV/azimuth_fm_rate",
264265
"S3/VV/calibration",
265266
"S3/VV/noise_range",
266267
"S3/VV/noise_azimuth",
267-
"S3",
268+
"S3/VV/reference_replica",
269+
"S3/VV/replica",
268270
"S3/VH",
271+
"S3/VH/antenna_pattern",
269272
"S3/VH/attitude",
270273
"S3/VH/gcp",
271274
"S3/VH/orbit",
275+
"S3/VH/reference_replica",
276+
"S3/VH/replica",
272277
"S3/VH/dc_estimate",
273278
"S3/VH/azimuth_fm_rate",
274279
"S3/VH/calibration",

‎xarray_sentinel/sentinel1.py

+92-51
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def open_calibration_dataset(
8080
cal_attrs = esa_safe.parse_tag(
8181
calibration, ".//calibrationInformation", "calibration"
8282
)
83-
attrs["absolute_calibration_constant"] = cal_attrs["absoluteCalibrationConstant"]
83+
attrs["absoluteCalibrationConstant"] = cal_attrs["absoluteCalibrationConstant"]
8484
azimuth_time_list = []
8585
pixel_list = []
8686
line_list = []
@@ -111,8 +111,8 @@ def open_calibration_dataset(
111111
)
112112
data_vars = {
113113
"azimuth_time": ("line", [np.datetime64(dt, "ns") for dt in azimuth_time_list]),
114-
"sigma_nought": (("line", "pixel"), sigmaNought_list),
115-
"beta_nought": (("line", "pixel"), betaNought_list),
114+
"sigmaNought": (("line", "pixel"), sigmaNought_list),
115+
"betaNought": (("line", "pixel"), betaNought_list),
116116
"gamma": (("line", "pixel"), gamma_list),
117117
"dn": (("line", "pixel"), dn_list),
118118
}
@@ -122,39 +122,42 @@ def open_calibration_dataset(
122122

123123

124124
def open_reference_replica_dataset(
125-
annotation_path: esa_safe.PathType, attrs: Dict[str, Any] = {}
125+
annotation_path: esa_safe.PathType, attrs: Dict[str, Any] = {}
126126
) -> xr.Dataset:
127127
reference_replica = esa_safe.parse_tag_as_list(
128128
annotation_path, ".//replicaInformationList/replicaInformation/referenceReplica"
129129
)[0]
130-
attrs.update({
131-
"azimuth_time": reference_replica["azimuthTime"],
132-
"chirp_source": reference_replica["chirpSource"],
133-
"pg_source": reference_replica["pgSource"],
134-
"time_delay": reference_replica["timeDelay"],
135-
"gain": reference_replica["gain"],
136-
})
130+
attrs.update(
131+
{
132+
"azimuth_time": reference_replica["azimuthTime"],
133+
"chirpSource": reference_replica["chirpSource"],
134+
"pgSource": reference_replica["pgSource"],
135+
"timeDelay": reference_replica["timeDelay"],
136+
"gain": reference_replica["gain"],
137+
}
138+
)
137139

138-
reference_replica_amplitude_coefficients = [float(v) for v in
139-
reference_replica["amplitudeCoefficients"]["$"].split()]
140+
reference_replica_amplitude_coefficients = [
141+
float(v) for v in reference_replica["amplitudeCoefficients"]["$"].split()
142+
]
140143

141-
reference_replica_phase_coefficients = [float(v) for v in reference_replica["phaseCoefficients"]["$"].split()]
144+
reference_replica_phase_coefficients = [
145+
float(v) for v in reference_replica["phaseCoefficients"]["$"].split()
146+
]
142147

143148
coords: Dict[str, Any] = {
144149
"degree": range(len(reference_replica_amplitude_coefficients))
145150
}
146151
data_vars = {
147-
"reference_replica_amplitude_coefficients": (
148-
("degree"), reference_replica_amplitude_coefficients),
149-
"reference_replica_phase_coefficients": (
150-
("degree"), reference_replica_phase_coefficients)
152+
"amplitudeCoefficients": (("degree"), reference_replica_amplitude_coefficients),
153+
"phaseCoefficients": (("degree"), reference_replica_phase_coefficients),
151154
}
152155
da = xr.Dataset(data_vars=data_vars, coords=coords, attrs=attrs)
153156
return da
154157

155158

156159
def open_antenna_pattern(
157-
annotation_path: esa_safe.PathType, attrs: Dict[str, Any] = {}
160+
annotation_path: esa_safe.PathType, attrs: Dict[str, Any] = {}
158161
) -> xr.Dataset:
159162
antenna_pattern_list = esa_safe.parse_tag_as_list(
160163
annotation_path, ".//antennaPattern/antennaPatternList/antennaPattern"
@@ -170,18 +173,26 @@ def open_antenna_pattern(
170173

171174
for vector in antenna_pattern_list:
172175
azimuth_time_list.append(vector["azimuthTime"])
173-
slant_range_time = np.fromstring(vector["slantRangeTime"]["$"], dtype=np.float32, sep=" ")
176+
slant_range_time = np.fromstring(
177+
vector["slantRangeTime"]["$"], dtype=np.float32, sep=" "
178+
)
174179
slant_range_time_list.append(slant_range_time)
175180

176-
elevation_angle = np.fromstring(vector["elevationAngle"]["$"], dtype=np.float32, sep=" ")
181+
elevation_angle = np.fromstring(
182+
vector["elevationAngle"]["$"], dtype=np.float32, sep=" "
183+
)
177184
elevation_angle_list.append(elevation_angle)
178185

179-
elevation_pattern = np.fromstring(vector["elevationPattern"]["$"], dtype=np.float32, sep=" ")
186+
elevation_pattern = np.fromstring(
187+
vector["elevationPattern"]["$"], dtype=np.float32, sep=" "
188+
)
180189
elevation_pattern_list.append(
181190
elevation_pattern[::2] * 1j + elevation_pattern[1::2]
182191
)
183192

184-
incidence_angle = np.fromstring(vector["slantRangeTime"]["$"], dtype=np.float32, sep=" ")
193+
incidence_angle = np.fromstring(
194+
vector["incidenceAngle"]["$"], dtype=np.float32, sep=" "
195+
)
185196
incidence_angle_list.append(incidence_angle)
186197

187198
terrain_height_list.append(vector["terrainHeight"])
@@ -193,25 +204,33 @@ def open_antenna_pattern(
193204
"Unable to organise noise vectors in a regular line-pixel grid"
194205
)
195206
data_vars = {
196-
"elevation_angle": (
197-
("azimuth_time", "slant_range_time"), np.array(elevation_angle_list)),
198-
# "elevation_pattern": (
207+
"elevationAngle": (
208+
("azimuth_time", "slant_range_time"),
209+
np.array(elevation_angle_list),
210+
),
211+
# "elevationPattern": (
199212
# ( "azimuth_time", "slant_range_time"), np.array(elevation_pattern_list)),
200-
"incidence_angle": (
201-
( "azimuth_time", "slant_range_time"), np.array(incidence_angle_list)),
202-
"terrain_height": ("azimuth_time", terrain_height_list),
213+
"incidenceAngle": (
214+
("azimuth_time", "slant_range_time"),
215+
np.array(incidence_angle_list),
216+
),
217+
"terrainHeight": ("azimuth_time", terrain_height_list),
203218
"roll": ("azimuth_time", roll_list),
204219
}
205-
coords = {"slant_range_time": slant_range_time_list[0], "azimuth_time": [np.datetime64(dt, "ns") for dt in azimuth_time_list]}
220+
coords = {
221+
"slant_range_time": slant_range_time_list[0],
222+
"azimuth_time": [np.datetime64(dt, "ns") for dt in azimuth_time_list],
223+
}
206224
da = xr.Dataset(data_vars=data_vars, coords=coords, attrs=attrs)
207225
return da
208226

209227

210228
def open_replica_dataset(
211-
annotation_path: esa_safe.PathType, attrs: Dict[str, Any] = {}
229+
annotation_path: esa_safe.PathType, attrs: Dict[str, Any] = {}
212230
) -> xr.Dataset:
213231
replicaList = esa_safe.parse_tag_as_list(
214-
annotation_path, ".//replicaInformationList/replicaInformation/replicaList/replica"
232+
annotation_path,
233+
".//replicaInformationList/replicaInformation/replicaList/replica",
215234
)
216235
azimuth_time_list = []
217236
cross_correlation_bandwidth_list = []
@@ -230,32 +249,54 @@ def open_replica_dataset(
230249
azimuth_time_list.append(replica["azimuthTime"])
231250
cross_correlation_bandwidth_list.append(replica["crossCorrelationBandwidth"])
232251
cross_correlation_pslr_list.append(replica["crossCorrelationPslr"])
233-
cross_correlation_peak_location_list.append(replica["crossCorrelationPeakLocation"])
234-
reconstructed_replica_valid_flag_list.append(replica["reconstructedReplicaValidFlag"])
252+
cross_correlation_peak_location_list.append(
253+
replica["crossCorrelationPeakLocation"]
254+
)
255+
reconstructed_replica_valid_flag_list.append(
256+
replica["reconstructedReplicaValidFlag"]
257+
)
235258
pg_product_amplitude_list.append(replica["pgProductAmplitude"])
236259
pg_product_phase_list.append(replica["pgProductPhase"])
237260
model_pg_product_amplitude_list.append(replica["modelPgProductAmplitude"])
238261
model_pg_product_phase_list.append(replica["modelPgProductPhase"])
239-
relative_pg_product_valid_flag_list.append(replica["relativePgProductValidFlag"])
240-
absolute_pg_product_valid_flag_list.append(replica["absolutePgProductValidFlag"])
262+
relative_pg_product_valid_flag_list.append(
263+
replica["relativePgProductValidFlag"]
264+
)
265+
absolute_pg_product_valid_flag_list.append(
266+
replica["absolutePgProductValidFlag"]
267+
)
241268
internal_time_delay_list.append(replica["internalTimeDelay"])
242269

243270
coords: Dict[str, Any] = {
244271
"azimuth_time": [np.datetime64(dt, "ns") for dt in azimuth_time_list],
245272
}
246273
data_vars = {
247-
"cross_correlation_bandwidth": (("azimuth_time"), cross_correlation_bandwidth_list),
248-
"cross_correlation_pslr": (("azimuth_time"), cross_correlation_pslr_list),
249-
"cross_correlation_peak_location": (("azimuth_time"), cross_correlation_peak_location_list),
250-
"reconstructed_replica_valid_flag": (("azimuth_time"), reconstructed_replica_valid_flag_list),
251-
"pg_product_amplitude": (("azimuth_time"), pg_product_amplitude_list),
252-
"pg_product_phase": (("azimuth_time"), pg_product_phase_list),
253-
"model_pg_product_amplitude": (("azimuth_time"), model_pg_product_amplitude_list),
254-
"model_pg_product_phase": (("azimuth_time"), model_pg_product_phase_list),
255-
"relative_pg_product_valid_flag": (("azimuth_time"), relative_pg_product_valid_flag_list),
256-
"absolute_pg_product_valid_flag": (("azimuth_time"), absolute_pg_product_valid_flag_list),
257-
"internal_time_delay": (("azimuth_time"), internal_time_delay_list),
258-
274+
"crossCorrelationBandwidth": (
275+
("azimuth_time"),
276+
cross_correlation_bandwidth_list,
277+
),
278+
"crossCorrelationPslr": (("azimuth_time"), cross_correlation_pslr_list),
279+
"crossCorrelationPeakLocation": (
280+
("azimuth_time"),
281+
cross_correlation_peak_location_list,
282+
),
283+
"reconstructedReplicaValidFlag": (
284+
("azimuth_time"),
285+
reconstructed_replica_valid_flag_list,
286+
),
287+
"pgProductAmplitude": (("azimuth_time"), pg_product_amplitude_list),
288+
"pgProductPhase": (("azimuth_time"), pg_product_phase_list),
289+
"modelPgProductAmplitude": (("azimuth_time"), model_pg_product_amplitude_list),
290+
"modelPgProductPhase": (("azimuth_time"), model_pg_product_phase_list),
291+
"relativePgProductValidFlag": (
292+
("azimuth_time"),
293+
relative_pg_product_valid_flag_list,
294+
),
295+
"absolutePgProductValidFlag": (
296+
("azimuth_time"),
297+
absolute_pg_product_valid_flag_list,
298+
),
299+
"internalTimeDelay": (("azimuth_time"), internal_time_delay_list),
259300
}
260301

261302
da = xr.Dataset(data_vars=data_vars, coords=coords, attrs=attrs)
@@ -316,7 +357,7 @@ def open_noise_azimuth_dataset(
316357
data_vars = {}
317358
coords = {}
318359
if first_range_sample:
319-
data_vars["noise_azimuth_lut"] = ("line", noise_azimuth_lut_list[0])
360+
data_vars["noiseAzimuthLut"] = ("line", noise_azimuth_lut_list[0])
320361
coords["line"] = line_list[0]
321362

322363
return xr.Dataset(data_vars=data_vars, coords=coords, attrs=attrs)
@@ -675,9 +716,9 @@ def find_available_groups(
675716
"gcp",
676717
"replica",
677718
"reference_replica",
678-
"antenna_pattern"
719+
"antenna_pattern",
679720
]:
680-
if product_type == "GRD" and metadata_group == "antenna_pattern":
721+
if product_type == "GRD" and metadata_group == "antenna_pattern":
681722
continue
682723
groups[f"{swath_pol_group}/{metadata_group}"] = [abspath]
683724
if product_type == "GRD":

0 commit comments

Comments
 (0)