Merge pull request #17 from aoifeboyle/plasma/multiple_outputs

Fixes.
wkerzendorf · Jul 1, 2015 · f69f230 · f69f230
2 parents 347622a + 057cd86
commit f69f230
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tardis/plasma/properties/ion_population.py b/tardis/plasma/properties/ion_population.py
@@ -60,7 +60,7 @@ class PhiSahaNebular(ProcessingPlasmaProperty):
 
     """
 
-    outputs = 'phi'
+    outputs = ('phi',)
 
     @staticmethod
     def calculate(general_phi, t_rad, w, zeta_data, t_electron, delta):

diff --git a/tardis/plasma/properties/radiative_properties.py b/tardis/plasma/properties/radiative_properties.py
@@ -116,6 +116,8 @@ class BetaSobolev(ProcessingPlasmaProperty):
     def calculate(self, tau_sobolevs):
         if getattr(self, 'beta_sobolev', None) is None:
             beta_sobolev = np.zeros_like(tau_sobolevs.values)
+        else:
+            beta_sobolev = self.beta_sobolev
 
         macro_atom.calculate_beta_sobolev(
             tau_sobolevs.values.ravel(order='F'),
@@ -127,7 +129,7 @@ class TransitionProbabilities(ProcessingPlasmaProperty):
 
     def calculate(self, atomic_data, beta_sobolev, j_blues,
         stimulated_emission_factor, tau_sobolevs):
-        if j_blues.empty:
+        if len(j_blues) == 0:
             transition_probabilities = None
         else:
             try:
@@ -142,7 +144,7 @@ def calculate(self, atomic_data, beta_sobolev, j_blues,
                 (macro_atom_data.transition_type == 1).values
             macro_atom_transition_up_filter = \
                 macro_atom_data.lines_idx.values[transition_up_filter]
-            j_blues = j_blues.values.take(macro_atom_transition_up_filter,
+            j_blues = j_blues.take(macro_atom_transition_up_filter,
                 axis=0, mode='raise')
             macro_stimulated_emission = stimulated_emission_factor.take(
                 macro_atom_transition_up_filter, axis=0, mode='raise')