r11850 - /branches/peak_list_handling/specific_fns/api_common.py -- December 17, 2010 - 10:48

Author: bugman
Date: Fri Dec 17 10:48:25 2010
New Revision: 11850

URL: http://svn.gna.org/viewcvs/relax?rev=11850&view=rev
Log:
Redesigned the specific API common method _return_value_general() to handle 
dictionaries.


Modified:
    branches/peak_list_handling/specific_fns/api_common.py

Modified: branches/peak_list_handling/specific_fns/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_list_handling/specific_fns/api_common.py?rev=11850&r1=11849&r2=11850&view=diff
==============================================================================
--- branches/peak_list_handling/specific_fns/api_common.py (original)
+++ branches/peak_list_handling/specific_fns/api_common.py Fri Dec 17 
10:48:25 2010
@@ -273,15 +273,16 @@
         if object_name:
             object_error = object_name + '_err'
             object_sim = object_name + '_sim'
+            key = None
 
         # The data type does not exist.
         else:
             # Is it a spectrum id?
             if param in cdp.spectrum_ids:
-                index = cdp.spectrum_ids.index(param)
                 object_name = 'intensities'
                 object_error = 'intensity_err'
                 object_sim = 'intensity_sim'
+                key = param
 
             # Unknown data type.
             else:
@@ -291,44 +292,35 @@
         value = None
         error = None
 
-        # Value and error.
+        # Value or sim value?
+        if sim != None:
+            object_name = object_sim
+
+        # The spin value.
+        if hasattr(spin, object_name):
+            value = getattr(spin, object_name)
+            error = getattr(spin, object_error)
+
+        # The global value.
+        elif hasattr(cdp, object_name):
+            value = getattr(cdp, object_name)
+            error = getattr(cdp, object_error)
+
+        # List object.
+        if index != None:
+            value = value[index]
+            error = error[index]
+
+        # Dictionary object.
+        if key:
+            value = value[key]
+            error = error[key]
+
+        # Return the data.
         if sim == None:
-            # Get the value.
-            if hasattr(spin, object_name):
-                value = getattr(spin, object_name)
-                if index != None:
-                    value = value[index]
-            elif hasattr(cdp, object_name):
-                value = getattr(cdp, object_name)
-                if index != None:
-                    value = value[index]
-
-            # Get the error.
-            if hasattr(spin, object_error):
-                error = getattr(spin, object_error)
-                if index != None:
-                    error = error[index]
-            elif hasattr(cdp, object_error):
-                error = getattr(cdp, object_error)
-                if index != None:
-                    error = error[index]
-
-        # Simulation value.
+            return value, error
         else:
-            # Get the value.
-            if hasattr(spin, object_sim):
-                object = getattr(spin, object_sim)
-                if index != None:
-                    object = object[index]
-                value = object[sim]
-            elif hasattr(cdp, object_sim):
-                object = getattr(cdp, object_sim)
-                if index != None:
-                    object = object[index]
-                value = object[sim]
-
-        # Return the data.
-        return value, error
+            return value[sim], error
 
 
     def _set_error_spin(self, model_info, index, error):