Skip to content

Commit d3c4318

Browse files
committed
WaveformPair: improve error logging for missing waveforms
1 parent 558232a commit d3c4318

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

requake/waveforms/waveform_pair.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,14 @@ def _get_pair_stream(self, pair):
115115
# will be different at each iteration
116116
self.tr_cache[cache_key] = tr
117117
st.append(tr)
118-
except NoWaveformError:
118+
except NoWaveformError as err:
119119
self.skipped_evids_traceids.append(cache_key)
120+
msg = str(err).replace('\n', ' ')
120121
logger.warning(
121122
f'No waveform data for event {ev.evid} and trace_id '
122123
f'{ev.trace_id}. Skipping all pairs containing this '
123124
'event and trace_id.'
125+
f'Error message: {msg}'
124126
)
125127
ev1 = False
126128
if len(st) < 2:

requake/waveforms/waveforms.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,19 +165,19 @@ def _get_event_waveform_from_event_data_path(evid, traceid):
165165
"""
166166
event_data_path = config.event_data_path
167167
if event_data_path is None:
168-
raise NoWaveformError('No event_data_path defined in the config file')
168+
raise NoWaveformError('No event_data_path defined in the config file.')
169169
event_data_path = Path(event_data_path)
170170
if not event_data_path.exists():
171171
raise NoWaveformError(
172-
f'Event data path "{event_data_path}" does not exist'
172+
f'Event data path "{event_data_path}" does not exist.'
173173
)
174174
event_dir = next(
175175
(subdir for subdir in event_data_path.iterdir()
176176
if evid in subdir.name),
177177
None)
178178
if event_dir is None:
179179
raise NoWaveformError(
180-
f'No waveform data for event {evid} in "{event_data_path}"'
180+
f'No waveform data for event {evid} in "{event_data_path}."'
181181
)
182182
net, sta, loc, chan = traceid.split('.')
183183
# replace '@@' with an empty network code
@@ -192,7 +192,7 @@ def _get_event_waveform_from_event_data_path(evid, traceid):
192192
network=net, station=sta, location=loc, channel=chan)
193193
if not st:
194194
raise NoWaveformError(
195-
f'No waveform data for trace id: {traceid} in "{event_dir}"'
195+
f'No waveform data for trace id: {traceid} in "{event_dir}."'
196196
)
197197
return st[0]
198198

0 commit comments

Comments
 (0)