BUG-FIX: in EELSSpectrum the global elements variable was being overwritten in the add_elements method. Bug reported by Magnus Nord in issue matplotlib#58

francisco-dlp · francisco-dlp · commit 0ab8ae0120e7 · 2013-01-25T16:38:08.000Z
diff --git a/hyperspy/signals/eels.py b/hyperspy/signals/eels.py
@@ -25,7 +25,7 @@
 
 from hyperspy.signals.spectrum import Spectrum
 from hyperspy.signals.image import Image
-from hyperspy.misc.eels.elements import elements
+from hyperspy.misc.eels.elements import elements as elements_db
 import hyperspy.axes
 from hyperspy.gui.egerton_quantification import SpikesRemoval
 from hyperspy.decorators import only_interactive
@@ -73,7 +73,7 @@ def add_elements(self, elements, include_pre_edges=False):
         
         """
         for element in elements:
-            if element in elements:
+            if element in elements_db:
                 self.elements.add(element)
             else:
                 print(
@@ -103,10 +103,10 @@ def generate_subshells(self, include_pre_edges=False):
         end_energy = Eaxis[-1]
         for element in self.elements:
             e_shells = list()
-            for shell in elements[element]['subshells']:
+            for shell in elements_db[element]['subshells']:
                 if shell[-1] != 'a':
                     if start_energy <= \
-                    elements[element]['subshells'][shell][
+                    elements_db[element]['subshells'][shell][
                         'onset_energy'] \
                     <= end_energy :
                         subshell = '%s_%s' % (element, shell)
