mailr17752 - /branches/tensor_data/data/diff_tensor.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on October 08, 2012 - 18:00:
Author: bugman
Date: Mon Oct  8 18:00:05 2012
New Revision: 17752

URL: http://svn.gna.org/viewcvs/relax?rev=17752&view=rev
Log:
The setting of list values for the DiffTensorSimList object now works 
correctly.

The private _set() method now works correctly by calling the base class 
method, and the normal
setting of diffusion tensor simulation values produces a RelaxError.


Modified:
    branches/tensor_data/data/diff_tensor.py

Modified: branches/tensor_data/data/diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/tensor_data/data/diff_tensor.py?rev=17752&r1=17751&r2=17752&view=diff
==============================================================================
--- branches/tensor_data/data/diff_tensor.py (original)
+++ branches/tensor_data/data/diff_tensor.py Mon Oct  8 18:00:05 2012
@@ -937,7 +937,7 @@
                         value = fn(*args[i])
 
                         # Set the attribute.
-                        self.__dict__[target+'_sim'][i] = value
+                        self.__dict__[target+'_sim']._set(value=value, 
sim_index=i)
 
 
     def fixed(self, flag):
@@ -1122,11 +1122,8 @@
             for i in range(elements):
                 self._append(None)
 
-        # Alias the __setitem__() method.
-        self.__setitem__ = self.__setitem_orig__
-
-
-    def __setitem_orig__(self, slice_obj, value):
+
+    def __setitem__(self, slice_obj, value):
         """This is a read-only object!"""
 
         raise RelaxError("The diffusion tensor is a read-only object.  The 
diffusion tensor set() method must be used instead.")
@@ -1152,14 +1149,8 @@
         @type sim_index:    int
         """
 
-        # Alias the base class method.
-        self.__setitem__ = list.__setitem__
-
         # Execute the base class method.
-        self[sim_index] = value
-
-        # Unalias.
-        self.__setitem__ = self.__setitem_orig__
+        super(DiffTensorSimList, self).__setitem__(sim_index, value)
 
 
     def append(self, value):




Related Messages


Powered by MHonArc, Updated Mon Oct 08 18:20:02 2012