Merge pull request #14 from mkelley/activity-biblio-fixes

Activity biblio fixes
NASA-Planetary-Science · Dec 1, 2017 · 87d32c1 · 87d32c1
2 parents e67c852 + 691d75a
commit 87d32c1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/sbpy/activity/dust.py b/sbpy/activity/dust.py
@@ -87,8 +87,13 @@ def phase_HalleyMarcus(phase):
     """
 
     from .. import bib
-    bib.register('activity.dust.phase_HalleyMarcus',
-                 ('1998Icar..132..397S', '2007ICQ....29...39M'))
+    bib.register(
+        'activity.dust.phase_HalleyMarcus',
+        {
+            'Halley phase function': '1998Icar..132..397S',
+            'Marcus phase function': '2007ICQ....29...39M'
+        }
+    )
 
     th = np.arange(181)
     ph = np.array(
@@ -373,7 +378,7 @@ def fluxd(self, wave_or_freq, aper, eph, phasecor=False, Phi=None,
         #from ..data import solar_fluxd
         from .. import bib
 
-        bib.register('activity.dust.Afrho.fluxd', '1984AJ.....89..579A')
+        bib.register('activity.dust.Afrho.fluxd', {'model': '1984AJ.....89..579A'})
 
         # check aperture radius
         if isinstance(aper, Aperture):
@@ -636,7 +641,7 @@ def fluxd(self, wave_or_freq, aper, eph, Tscale=1.1, T=None):
         from .core import rho_as_length, Aperture
         from .. import bib
 
-        bib.register('activity.dust.Efrho.fluxd', '2013Icar..225..475K')
+        bib.register('activity.dust.Efrho.fluxd', {'model', '2013Icar..225..475K'})
 
         # check aperture radius
         if isinstance(aper, Aperture):

diff --git a/sbpy/activity/gas.py b/sbpy/activity/gas.py
@@ -67,8 +67,8 @@ def photo_lengthscale(species, source=None):
     """
 
     data = {   # (value, ADS bibcode)
-        'H2O': { 'CS93': (2.4e4 * u.km, '1993Icar..105..235C'), },
-         'OH': { 'CS93': (1.6e5 * u.km, '1993Icar..105..235C'), },
+        'H2O': { 'CS93': (2.4e4 * u.km, {'H2O photodissociation lengthscale': '1993Icar..105..235C'})},
+         'OH': { 'CS93': (1.6e5 * u.km, {'OH photodissociation lengthscale', '1993Icar..105..235C'})},
 
     }
 
@@ -133,15 +133,14 @@ def photo_timescale(species, source=None):
     """
 
     data = {   # (value, ADS bibcode)
-        'H2O':   { 'CS93': (5.2e4 * u.s, '1993Icar..105..235C'), },
-        'OH':    { 'CS93': (1.6e5 * u.s, '1993Icar..105..235C'), },
-        'HCN':   { 'C94': (6.7e4 * u.s, '1994JGR....99.3777C'), },
-        'CH3OH': { 'C94': (7.7e4 * u.s, '1994JGR....99.3777C'), },
-        'H2CO':  { 'C94': (5.0e3 * u.s, '1994JGR....99.3777C'), },
-        'CO':    { 'CE83': (1.5e6 * u.s, '1983A%26A...126..170C'), },
-        'CO2':   { 'CE83': (5.0e5 * u.s, '1983A%26A...126..170C'), },
-        'CN':    { 'H92': ([3.15e5, 1.35e5] * u.s, '1992Ap%26SS.195....1H'), },
-
+        'H2O':   { 'CS93': (5.2e4 * u.s, {'H2O photodissociation timescale': '1993Icar..105..235C'}) },
+        'OH':    { 'CS93': (1.6e5 * u.s, {'OH photodissociation timescale': '1993Icar..105..235C'}) },
+        'HCN':   { 'C94': (6.7e4 * u.s, {'HCN photodissociation timescale': '1994JGR....99.3777C'}) },
+        'CH3OH': { 'C94': (7.7e4 * u.s, {'CH3OH photodissociation timescale': '1994JGR....99.3777C'}) },
+        'H2CO':  { 'C94': (5.0e3 * u.s, {'H2CO photodissociation timescale': '1994JGR....99.3777C'}) },
+        'CO':    { 'CE83': (1.5e6 * u.s, {'CO photodissociation timescale': '1983A%26A...126..170C'}) },
+        'CO2':   { 'CE83': (5.0e5 * u.s, {'CO2 photodissociation timescale': '1983A%26A...126..170C'}) },
+        'CN':    { 'H92': ([3.15e5, 1.35e5] * u.s, {'CN photodissociation timescale': '1992Ap%26SS.195....1H'}) },
     }
 
     default_sources = {
@@ -239,10 +238,10 @@ def fluorescence_band_strength(species, rdot=0 * u.km / u.s,
     # implement list treatment
 
     data = {   # (value, bibcode)
-        'OH 0-0': { 'SA88': ('XXX', '1988ApJ...331.1058S') },
-        'OH 1-0': { 'SA88': ('XXX', '1988ApJ...331.1058S') },
-        'OH 1-1': { 'SA88': ('XXX', '1988ApJ...331.1058S') },
-        'OH 2-2': { 'SA88': ('XXX', '1988ApJ...331.1058S') },
+        'OH 0-0': { 'SA88': ('XXX', {'OH 0-0 fluorescence band efficiency': '1988ApJ...331.1058S'})},
+        'OH 1-0': { 'SA88': ('XXX', {'OH 1-0 fluorescence band efficiency': '1988ApJ...331.1058S'})},
+        'OH 1-1': { 'SA88': ('XXX', {'OH 1-1 fluorescence band efficiency': '1988ApJ...331.1058S'})},
+        'OH 2-2': { 'SA88': ('XXX', {'OH 2-2 fluorescence band efficiency': '1988ApJ...331.1058S'})},
     }
 
     default_sources = {
@@ -456,7 +455,7 @@ class Haser(GasComa):
     def __init__(self, Q, v, parent, daughter=None):
         super(Haser, self).__init__(Q, v)
 
-        bib.register('activity.gas.Haser', '1957BSRSL..43..740H')
+        bib.register('activity.gas.Haser', {'model': '1957BSRSL..43..740H'})
 
         assert isinstance(parent, u.Quantity)
         assert parent.unit.is_equivalent(u.m)