Skip to content

Commit

Permalink
fetch amplitude even if no magnitude type
Browse files Browse the repository at this point in the history
  • Loading branch information
@thefroid
thefroid committed Jun 26, 2019
1 parent 76606ba commit fe82f51
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
7 changes: 2 additions & 5 deletions obspy/io/gse2/bulletin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,8 @@ def _parse_arrivals(self, event, origin, origin_res_id):

public_id = "amplitude/%s" % line_id
amplitude.resource_id = self._get_res_id(public_id)
flag_sta_mag = False

event.amplitudes.append(amplitude)
for i in [0, 1]:
sta_mag = StationMagnitude()
sta_mag.creation_info = self._get_creation_info()
Expand All @@ -912,12 +912,9 @@ def _parse_arrivals(self, event, origin, origin_res_id):
sta_mag.mag = magnitude_values[i]
except ValueError:
continue
flag_sta_mag = True
public_id = "magnitude/station/%s/%s" % (line_id, i)
sta_mag.resource_id = self._get_res_id(public_id)
event.station_magnitudes.append(sta_mag)
if flag_sta_mag:
event.amplitudes.append(amplitude)
except ValueError:
pass

Expand Down
29 changes: 15 additions & 14 deletions obspy/io/gse2/tests/test_bulletin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# -*- coding: utf-8 -*-
"""
The gse2.bulletin test suite.
:author:
EOST (École et Observatoire des Sciences de la Terre)
:copyright:
Expand Down Expand Up @@ -358,7 +359,7 @@ def test_amplitude(self):
amplitudes = catalog[0].amplitudes
# test a new feature: don't store an object amplitude if the magnitude
# type is not defined
self.assertEqual(len(amplitudes), 4)
self.assertEqual(len(amplitudes), 6)
# Test first amplitude
amplitude_1 = amplitudes[0]
self.assertEqual(
Expand Down Expand Up @@ -389,26 +390,26 @@ def test_amplitude(self):
# Test second amplitude
amplitude_2 = amplitudes[1]
self.assertEqual(
amplitude_2.resource_id, 'smi:local/amplitude/3586555')
self.assertEqual(amplitude_2.generic_amplitude, 4.5)
amplitude_2.resource_id, 'smi:local/amplitude/3586513')
self.assertEqual(amplitude_2.generic_amplitude, 2.9)
self.assertEqual(amplitude_2.type, None)
self.assertEqual(amplitude_2.category, None)
self.assertEqual(amplitude_2.unit, None)
self.assertEqual(amplitude_2.method_id, None)
self.assertEqual(amplitude_2.period, 0.8)
self.assertEqual(amplitude_2.snr, 7.3)
self.assertEqual(amplitude_2.period, 0.6)
self.assertEqual(amplitude_2.snr, 4.9)
self.assertEqual(amplitude_2.time_window, None)
self.assertEqual(amplitude_2.pick_id, 'smi:local/pick/3586555')
self.assertEqual(amplitude_2.pick_id, 'smi:local/pick/3586513')
# WaveformStreamId
waveform_2 = amplitude_2.waveform_id
self.assertEqual(waveform_2.network_code, 'XX')
self.assertEqual(waveform_2.station_code, 'FINES')
self.assertEqual(waveform_2.station_code, 'GERES')
self.assertEqual(waveform_2.channel_code, None)
self.assertEqual(waveform_2.location_code, None)
self.assertEqual(waveform_2.resource_uri, None)
self.assertEqual(amplitude_2.filter_id, None)
self.assertEqual(amplitude_2.scaling_time, None)
self.assertEqual(amplitude_2.magnitude_hint, 'mb')
self.assertEqual(amplitude_2.magnitude_hint, None)
self.assertEqual(amplitude_2.evaluation_mode, None)
self.assertEqual(amplitude_2.evaluation_status, None)
self.assertNotEqual(amplitude_2.creation_info, None)
Expand All @@ -430,7 +431,7 @@ def test_several_events(self):
'GREECE-ALBANIA BORDER REGION')
self.assertEqual(len(event_1.comments), 1)
self.assertEqual(len(event_1.picks), 9)
self.assertEqual(len(event_1.amplitudes), 4)
self.assertEqual(len(event_1.amplitudes), 6)
self.assertEqual(len(event_1.origins), 1)
self.assertEqual(len(event_1.magnitudes), 2)
self.assertEqual(len(event_1.station_magnitudes), 4)
Expand All @@ -443,7 +444,7 @@ def test_several_events(self):
'VANCOUVER ISLAND REGION')
self.assertEqual(len(event_2.comments), 1)
self.assertEqual(len(event_2.picks), 7)
self.assertEqual(len(event_2.amplitudes), 2)
self.assertEqual(len(event_2.amplitudes), 5)
self.assertEqual(len(event_2.origins), 1)
self.assertEqual(len(event_2.magnitudes), 1)
self.assertEqual(len(event_2.station_magnitudes), 2)
Expand Down Expand Up @@ -553,7 +554,7 @@ def test_parameters(self):
self.assertEqual(
sta_mag.resource_id, 'quakeml:idc/magnitude/station/3586432/0')
# Test Amplitude ResourceIdentifier
self.assertEqual(len(event.amplitudes), 4)
self.assertEqual(len(event.amplitudes), 6)
amplitude = event.amplitudes[0]
self.assertEqual(
amplitude.resource_id, 'quakeml:idc/amplitude/3586432')
Expand Down Expand Up @@ -604,7 +605,7 @@ def test_non_standard_format(self):
self.assertEqual(len(event.picks), 9)
pick = event.picks[0]
self.assertEqual(pick.phase_hint, 'Pg')
self.assertEqual(len(event.amplitudes), 3)
self.assertEqual(len(event.amplitudes), 4)
amplitude = event.amplitudes[0]
self.assertEqual(amplitude.generic_amplitude, 2.9)

Expand Down Expand Up @@ -709,7 +710,7 @@ def test_several_begin(self):
'GREECE-ALBANIA BORDER REGION')
self.assertEqual(len(event_1.comments), 1)
self.assertEqual(len(event_1.picks), 9)
self.assertEqual(len(event_1.amplitudes), 4)
self.assertEqual(len(event_1.amplitudes), 6)
self.assertEqual(len(event_1.origins), 1)
self.assertEqual(len(event_1.magnitudes), 2)
self.assertEqual(len(event_1.station_magnitudes), 4)
Expand All @@ -722,7 +723,7 @@ def test_several_begin(self):
'VANCOUVER ISLAND REGION')
self.assertEqual(len(event_2.comments), 1)
self.assertEqual(len(event_2.picks), 7)
self.assertEqual(len(event_2.amplitudes), 2)
self.assertEqual(len(event_2.amplitudes), 5)
self.assertEqual(len(event_2.origins), 1)
self.assertEqual(len(event_2.magnitudes), 1)
self.assertEqual(len(event_2.station_magnitudes), 2)
Expand Down

0 comments on commit fe82f51

Please sign in to comment.