Merge pull request #213 from mhearne-usgs/usmagfix

Fixed authoritative info to show nan for magnitude when it is obtaine…

Author: hschovanec-usgs

libcomcat/classes.py

@@ -648,12 +648,11 @@ def toDict(self, catalog=None,
             phase_url = phase_data.getContentURL('quakeml.xml')
             catalog = read_events(phase_url)
             event = catalog.events[0]
-            imag = 1
-            for magnitude in event.magnitudes:
+            for imag, magnitude in enumerate(event.magnitudes):
                 edict['magnitude%i' % imag] = magnitude.mag
                 edict['magtype%i' %
                       imag] = magnitude.magnitude_type
-                imag += 1
+                edict['magsource%i' % imag] = magnitude.creation_info.agency_id
 
         return edict
 

libcomcat/search.py

@@ -610,8 +610,12 @@ def get_authoritative_info(eventid):
         origins = detail.getProducts('origin', source='all')
         for origin in origins:
             source = origin.source
-            magtype = origin['magnitude-type']
-            magval = float(origin['magnitude'])
+            if origin['magnitude-source'].lower() != source.lower():
+                magval = np.nan
+                magtype = 'NA'
+            else:
+                magval = float(origin['magnitude'])
+                magtype = origin['magnitude-type']
             colname = '%s-%s' % (source, magtype)
             mag_row[colname] = magval
             latname = '%s-%s' % (origin.source, 'latitude')

notebooks/ComparingMagnitudes.ipynb

@@ -55,7 +55,7 @@ def test_mag():
         shutil.rmtree(tmpdir)
     # The largest recorded earthquake is a relatively stable check
     target_columns = ['id', 'time', 'lat', 'lon', 'depth', 'location',
-                      'url', 'hypo_src', 'official-mw', 'us-mw']
+                      'url', 'hypo_src', 'official-mw', 'us-NA']
     np.testing.assert_array_equal(df.columns, target_columns)
     target_id = 'official19600522191120_30'
     target_location = '1960 Great Chilean Earthquake (Valdivia Earthquake)'
@@ -78,7 +78,7 @@ def test_mag():
         shutil.rmtree(tmpdir)
     # The largest recorded earthquake is a relatively stable check
     target_columns = ['id', 'time', 'lat', 'lon', 'depth', 'location',
-                      'url', 'hypo_src', 'official-mw', 'us-mw']
+                      'url', 'hypo_src', 'official-mw', 'us-NA']
     np.testing.assert_array_equal(df.columns, target_columns)
     target_id = 'official19600522191120_30'
     target_location = '1960 Great Chilean Earthquake (Valdivia Earthquake)'

notebooks/data/events.xlsx

@@ -200,7 +200,7 @@ def test_detail():
         assert atdict['depth'] == 9.0
 
         ncdict_allmags = event.toDict(get_all_magnitudes=True)
-        assert ncdict_allmags['magtype3'] == 'Ml'
+        assert ncdict_allmags['magtype1'] == 'Md'
 
         ncdict_alltensors = event.toDict(get_tensors='all')
         assert ncdict_alltensors['us_Mwb_mrr'] == 7.63e+16