From 71d4269a4ff698bf418f1f07be9436961870eeda Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 9 Oct 2024 17:07:22 +0200 Subject: [PATCH] [bugfix] reverting code from commit 3069e7d5. Checking for coordinates in dataless Parser IS necessary to make sure correct Metadata were found. Fixes #37. [minor] Commented out search for network name in metadata filename considered being unsafe --- pylot/core/util/dataprocessing.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pylot/core/util/dataprocessing.py b/pylot/core/util/dataprocessing.py index 178f4175..825a2dda 100644 --- a/pylot/core/util/dataprocessing.py +++ b/pylot/core/util/dataprocessing.py @@ -268,9 +268,6 @@ class Metadata(object): if not fnames: # search for station name in filename fnames = glob.glob(os.path.join(path_to_inventory, '*' + station + '*')) - if not fnames: - # search for network name in filename - fnames = glob.glob(os.path.join(path_to_inventory, '*' + network + '*')) if not fnames: if self.verbosity: print('Could not find filenames matching station name, network name or seed id') @@ -282,7 +279,7 @@ class Metadata(object): continue invtype, robj = self._read_metadata_file(os.path.join(path_to_inventory, fname)) try: - # robj.get_coordinates(station_seed_id) # TODO: Commented out, failed with Parser, is this needed? + robj.get_coordinates(station_seed_id) self.inventory_files[fname] = {'invtype': invtype, 'data': robj} if station_seed_id in self.seed_ids.keys(): @@ -290,6 +287,7 @@ class Metadata(object): self.seed_ids[station_seed_id] = fname return True except Exception as e: + logging.warning(e) continue print('Could not find metadata for station_seed_id {} in path {}'.format(station_seed_id, path_to_inventory))