Merge pull request #122 from namurphy/reorganize-atomic

Reorganize and refactor atomic subpackage. This merge breaks backward compatibility for the atomic subpackage.
PlasmaPy · Sep 29, 2017 · 7f06dd7 · 7f06dd7
2 parents c286e55 + 78ca910
commit 7f06dd7
Show file tree

Hide file tree

Showing 10 changed files with 1,154 additions and 706 deletions.
diff --git a/.gitignore b/.gitignore
@@ -104,4 +104,10 @@ ENV/
 .#*
 
 # Auxilliary files associated with vim
-*.swp
+*.swp
+
+# Miscellaneous files
+.idea/
+Untitled*
+untitled*
+*debuglog*
diff --git a/plasmapy/atomic/__init__.py b/plasmapy/atomic/__init__.py
@@ -1,11 +1,12 @@
 """Physical and mathematical constants for use within PlasmaPy"""
-from .atomic import (element_symbol, isotope_symbol, atomic_number,
+from .atomic import (atomic_symbol, isotope_symbol, atomic_number,
                      mass_number, element_name, standard_atomic_weight,
-                     isotope_mass, ion_mass, nuclear_binding_energy, half_life,
-                     energy_from_nuclear_reaction, is_isotope_stable,
+                     isotope_mass, ion_mass, half_life, is_isotope_stable,
                      known_isotopes, common_isotopes, stable_isotopes,
                      isotopic_abundance, charge_state)
 
+from .nuclear import (nuclear_binding_energy, nuclear_reaction_energy)
+
 from .elements import Elements
 
 from .isotopes import Isotopes