r17757 - in /branches/tensor_data: data/diff_tensor.py generic_fns/diffusion_tensor.py -- October 08, 2012 - 18:50

Author: bugman
Date: Mon Oct  8 18:50:29 2012
New Revision: 17757

URL: http://svn.gna.org/viewcvs/relax?rev=17757&view=rev
Log:
Renamed the diffusion tensor fixed() method to set_fixed() to avoid clashing 
with the 'fixed' object.


Modified:
    branches/tensor_data/data/diff_tensor.py
    branches/tensor_data/generic_fns/diffusion_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=17757&r1=17756&r2=17757&view=diff
==============================================================================
--- branches/tensor_data/data/diff_tensor.py (original)
+++ branches/tensor_data/data/diff_tensor.py Mon Oct  8 18:50:29 2012
@@ -940,16 +940,6 @@
                         self.__dict__[target+'_sim']._set(value=value, 
sim_index=i)
 
 
-    def fixed(self, flag):
-        """Set if the diffusion tensor should be fixed during optimisation 
or not.
-
-        @param flag:    The fixed flag.
-        @type flag:     bool
-        """
-
-        self.__dict__['fixed'] = flag
-
-
     def from_xml(self, diff_tensor_node, file_version=1):
         """Recreate the diffusion tensor data structure from the XML 
diffusion tensor node.
 
@@ -1067,6 +1057,16 @@
             self._update_object(param, target, update_if_set, depends, 
category)
 
 
+    def set_fixed(self, flag):
+        """Set if the diffusion tensor should be fixed during optimisation 
or not.
+
+        @param flag:    The fixed flag.
+        @type flag:     bool
+        """
+
+        self.__dict__['fixed'] = flag
+
+
     def set_sim_num(self, sim_number=None):
         """Set the number of Monte Carlo simulations for the construction of 
the simulation structures.
 

Modified: branches/tensor_data/generic_fns/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/tensor_data/generic_fns/diffusion_tensor.py?rev=17757&r1=17756&r2=17757&view=diff
==============================================================================
--- branches/tensor_data/generic_fns/diffusion_tensor.py (original)
+++ branches/tensor_data/generic_fns/diffusion_tensor.py Mon Oct  8 18:50:29 
2012
@@ -797,7 +797,7 @@
     cdp.diff_tensor = DiffTensorData()
 
     # Set the fixed flag.
-    cdp.diff_tensor.fixed(fixed)
+    cdp.diff_tensor.set_fixed(fixed)
 
     # Spherical diffusion.
     if isinstance(params, float):