Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ repos:
exclude: tests/data/

- repo: https://github.com/PyCQA/isort
rev: "10.0.0b1"
rev: "10.0.0b2"
hooks:
- id: isort
name: sort imports
Expand Down
2 changes: 1 addition & 1 deletion src/mintpy/legacy/tropo_pyaps.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def check_exist_grib_file(gfile_list, print_msg=True):
file_sizes = [os.path.getsize(i) for i in gfile_exist
if os.path.getsize(i) > 10e6]
if file_sizes:
comm_size = ut.most_common([i for i in file_sizes])
comm_size = ut.most_common([*file_sizes])
if print_msg:
print(f'common file size: {comm_size} bytes')
print(f'number of grib files existed : {len(gfile_exist)}')
Expand Down
20 changes: 10 additions & 10 deletions src/mintpy/objects/stackDict.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __init__(self, name='ifgramStack', pairsDict=None, dsName0=IFGRAM_DSET_NAMES
def get_size(self, box=None, xstep=1, ystep=1, geom_obj=None):
"""Get size in 3D"""
num_ifgram = len(self.pairsDict)
ifgramObj = [v for v in self.pairsDict.values()][0]
ifgramObj = [*self.pairsDict.values()][0]
length, width = ifgramObj.get_size(family=self.dsName0)

# use the reference geometry obj size
Expand All @@ -73,24 +73,24 @@ def get_size(self, box=None, xstep=1, ystep=1, geom_obj=None):
return num_ifgram, length, width

def get_date12_list(self):
pairs = [pair for pair in self.pairsDict.keys()]
pairs = [*self.pairsDict.keys()]
self.date12List = [f'{i[0]}_{i[1]}' for i in pairs]
return self.date12List

def get_dataset_list(self):
ifgramObj = [x for x in self.pairsDict.values()][0]
dsetList = [x for x in ifgramObj.datasetDict.keys()]
ifgramObj = [*self.pairsDict.values()][0]
dsetList = [*ifgramObj.datasetDict.keys()]
return dsetList

def get_metadata(self):
ifgramObj = [v for v in self.pairsDict.values()][0]
ifgramObj = [*self.pairsDict.values()][0]
self.metadata = ifgramObj.get_metadata(family=self.dsName0)
if 'UNIT' in self.metadata.keys():
self.metadata.pop('UNIT')
return self.metadata

def get_dataset_data_type(self, dsName):
ifgramObj = [v for v in self.pairsDict.values()][0]
ifgramObj = [*self.pairsDict.values()][0]
dsFile = ifgramObj.datasetDict[dsName]
metadata = readfile.read_attribute(dsFile)
dataType = DATA_TYPE_DICT[metadata.get('DATA_TYPE', 'float32').lower()]
Expand Down Expand Up @@ -899,19 +899,19 @@ def getDatasetNames(self):
# extract the name of the datasets which are actually the keys of
# observations, quality and geometry dictionaries.

pairs = [pair for pair in self.pairs.keys()]
pairs = [*self.pairs.keys()]
# Assuming all pairs of a given platform-track have the same observations
# let's extract the keys of the observations of the first pair.

if self.pairs[pairs[0]].observationsDict is not None:
self.dsetObservationNames = [k for k in self.pairs[pairs[0]].observationsDict.keys()]
self.dsetObservationNames = [*self.pairs[pairs[0]].observationsDict.keys()]
else:
self.dsetObservationNames = []

# Assuming all pairs of a given platform-track have the same quality files
# let's extract the keys of the quality dictionary of the first pair.
if self.pairs[pairs[0]].qualityDict is not None:
self.dsetQualityNames = [k for k in self.pairs[pairs[0]].qualityDict.keys()]
self.dsetQualityNames = [*self.pairs[pairs[0]].qualityDict.keys()]
else:
self.dsetQualityNames = []

Expand All @@ -922,5 +922,5 @@ def getDatasetNames(self):
self.dsetGeometryNames = []
for pair in pairs:
if self.pairs[pair].geometryDict is not None:
keys = [k for k in self.pairs[pair].geometryDict.keys()]
keys = [*self.pairs[pair].geometryDict.keys()]
self.dsetGeometryNames = list(set(self.dsetGeometryNames) | set(keys))
10 changes: 5 additions & 5 deletions src/mintpy/prep_fringe.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def prepare_timeseries(outfile, unw_file, metadata, processor, baseline_dir=None
print(f'preparing timeseries file: {outfile}')

# copy metadata to meta
meta = {key : value for key, value in metadata.items()}
meta = {**metadata}
phase2range = float(meta['WAVELENGTH']) / (4. * np.pi)

# grab date list from the filename
Expand Down Expand Up @@ -184,7 +184,7 @@ def prepare_temporal_coherence(outfile, infile, metadata, box=None):
print(f'preparing temporal coherence file: {outfile}')

# copy metadata to meta
meta = {key : value for key, value in metadata.items()}
meta = {**metadata}
meta["FILE_TYPE"] = "temporalCoherence"
meta["UNIT"] = "1"

Expand Down Expand Up @@ -214,7 +214,7 @@ def prepare_ps_mask(outfile, infile, metadata, box=None):
print(f'preparing PS mask file: {outfile}')

# copy metadata to meta
meta = {key : value for key, value in metadata.items()}
meta = {**metadata}
meta["FILE_TYPE"] = "mask"
meta["UNIT"] = "1"

Expand All @@ -241,7 +241,7 @@ def prepare_geometry(outfile, geom_dir, metadata, box, water_mask_file=None):
print(f'preparing geometry file: {outfile}')

# copy metadata to meta
meta = {key : value for key, value in metadata.items()}
meta = {**metadata}
meta["FILE_TYPE"] = "temporalCoherence"

fDict = {
Expand Down Expand Up @@ -272,7 +272,7 @@ def prepare_stack(outfile, unw_file, metadata, processor, baseline_dir=None, box
print('-'*50)
print(f'preparing ifgramStack file: {outfile}')
# copy metadata to meta
meta = {key : value for key, value in metadata.items()}
meta = {**metadata}

# get list of *.unw file
unw_files = sorted(glob.glob(unw_file))
Expand Down
6 changes: 3 additions & 3 deletions src/mintpy/prep_nisar.py
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ def prepare_geometry(
print("-" * 50)
print(f"preparing geometry file: {outfile}")

meta = {key: value for key, value in metadata.items()}
meta = {**metadata}

geo_ds = read_subset(
metaFile, bbox, polarization=polarization, frequency=frequency, geometry=True
Expand Down Expand Up @@ -1271,7 +1271,7 @@ def prepare_water_mask(
print("-" * 50)
print(f"preparing water mask file: {outfile}")

meta = {key: value for key, value in metadata.items()}
meta = {**metadata}

# get subset indices
geo_ds = read_subset(
Expand Down Expand Up @@ -1330,7 +1330,7 @@ def prepare_stack(
print("-" * 50)
print(f"preparing {effective_stack_type} stack file: {outfile}")

meta = {key: value for key, value in metadata.items()}
meta = {**metadata}
num_pair = len(inp_files)
print(f"number of inputs/unwrapped interferograms: {num_pair}")

Expand Down
2 changes: 1 addition & 1 deletion src/mintpy/tropo_pyaps3.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def check_exist_grib_file(gfile_list, print_msg=True):
if gfile_exist:
file_sizes = [os.path.getsize(i) for i in gfile_exist]
if file_sizes:
comm_size = ut.most_common([i for i in file_sizes])
comm_size = ut.most_common([*file_sizes])
if print_msg:
print(f'common file size: {comm_size} bytes')
print(f'number of grib files existed : {len(gfile_exist)}')
Expand Down
2 changes: 1 addition & 1 deletion src/mintpy/utils/utils1.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def spatial_average(fname, datasetName='coherence', maskFile=None, box=None,
def read_text_file(fname):
txtContent = np.loadtxt(fname, dtype=bytes).astype(str)
meanList = [float(i) for i in txtContent[:, 1]]
dateList = [i for i in txtContent[:, 0]]
dateList = [*txtContent[:, 0]]
return meanList, dateList

# Baic File Info
Expand Down
6 changes: 3 additions & 3 deletions src/mintpy/utils/writefile.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def write(datasetDict, out_file, metadata=None, ref_file=None, compression=None,

# copy metadata to meta
if metadata:
meta = {key: value for key, value in metadata.items()}
meta = {**metadata}
elif ref_file:
meta = readfile.read_attribute(ref_file)
else:
Expand Down Expand Up @@ -281,10 +281,10 @@ def layout_hdf5(fname, ds_name_dict=None, metadata=None, ds_unit_dict=None, ref_

# get meta from metadata and ref_file
if metadata:
meta = {key: value for key, value in metadata.items()}
meta = {**metadata}
elif ref_file:
with h5py.File(ref_file, 'r') as fr:
meta = {key: value for key, value in fr.attrs.items()}
meta = {**fr.attrs}
vprint(f'grab metadata from ref_file: {ref_file}')
else:
raise ValueError('No metadata or ref_file found.')
Expand Down
2 changes: 1 addition & 1 deletion src/mintpy/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ def read_input_file_info(inps):
def search_dataset_input(all_list, in_list=[], in_num_list=[], search_dset=True):
"""Get dataset(es) from input dataset / dataset_num"""
# make a copy to avoid weird variable behavior
in_num_list = [x for x in in_num_list]
in_num_list = [*in_num_list]

# in_list --> in_num_list --> outNumList --> outList
if in_list:
Expand Down
Loading