r2995 - in /1.3: data/diff_tensor.py specific_fns/model_free.py -- January 13, 2007 - 05:21

Author: bugman
Date: Sat Jan 13 05:20:50 2007
New Revision: 2995

URL: http://svn.gna.org/viewcvs/relax?rev=2995&view=rev
Log:
Changed the diffusion tensor MC sim objects from lists to the ListType 
'DiffTensorSimList'.

These changes are part of the solution for bug #7979 
(https://gna.org/bugs/?7979).

The 'append()' and '__setattr__()' methods of 'DiffTensorSimList' have been 
set to dummy functions.


Modified:
    1.3/data/diff_tensor.py
    1.3/specific_fns/model_free.py

Modified: 1.3/data/diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/diff_tensor.py?rev=2995&r1=2994&r2=2995&view=diff
==============================================================================
--- 1.3/data/diff_tensor.py (original)
+++ 1.3/data/diff_tensor.py Sat Jan 13 05:20:50 2007
@@ -304,7 +304,7 @@
             # Only update the MC simulation object if its dependancies exist.
             if not missing_dep:
                 # Initialise an empty array to store the MC simulation 
object elements.
-                sim_values = []
+                sim_values = DiffTensorSimList()
 
                 # Loop over the simulations.
                 for i in xrange(num_sim):
@@ -318,3 +318,16 @@
 
                 # Set the attribute.
                 self.__dict__[target+'_sim'] = sim_values
+
+
+
+class DiffTensorSimList(ListType):
+    def __init__(self):
+        """Empty data container for Monte Carlo simulation diffusion tensor 
data."""
+
+    def __setitem__(self):
+        """Set the value."""
+        print "Setitem"
+
+    def append(self, value):
+        print "append: " + `value`

Modified: 1.3/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free.py?rev=2995&r1=2994&r2=2995&view=diff
==============================================================================
--- 1.3/specific_fns/model_free.py (original)
+++ 1.3/specific_fns/model_free.py Sat Jan 13 05:20:50 2007
@@ -21,6 +21,7 @@
 
###############################################################################
 
 from copy import deepcopy
+from data.diff_tensor import DiffTensorSimList
 from LinearAlgebra import inverse
 from math import pi
 from Numeric import Float64, array, identity, matrixmultiply, ones, 
transpose, zeros
@@ -2782,7 +2783,7 @@
             else:
                 # Create the data structure if it doesn't exist.
                 if not hasattr(self.relax.data.diff[self.run], 'tm_sim'):
-                    self.relax.data.diff[self.run].tm_sim = []
+                    self.relax.data.diff[self.run].tm_sim = 
DiffTensorSimList()
 
                 # Append the value.
                 self.relax.data.diff[self.run].tm_sim.append(tm)
@@ -2819,13 +2820,13 @@
             else:
                 # Create the data structure if it doesn't exist.
                 if not hasattr(self.relax.data.diff[self.run], 'tm_sim'):
-                    self.relax.data.diff[self.run].tm_sim = []
+                    self.relax.data.diff[self.run].tm_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'Da_sim'):
-                    self.relax.data.diff[self.run].Da_sim = []
+                    self.relax.data.diff[self.run].Da_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'theta_sim'):
-                    self.relax.data.diff[self.run].theta_sim = []
+                    self.relax.data.diff[self.run].theta_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'phi_sim'):
-                    self.relax.data.diff[self.run].phi_sim = []
+                    self.relax.data.diff[self.run].phi_sim = 
DiffTensorSimList()
 
                 # Append the value.
                 self.relax.data.diff[self.run].tm_sim.append(tm)
@@ -2869,17 +2870,17 @@
             else:
                 # Create the data structure if it doesn't exist.
                 if not hasattr(self.relax.data.diff[self.run], 'tm_sim'):
-                    self.relax.data.diff[self.run].tm_sim = []
+                    self.relax.data.diff[self.run].tm_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'Da_sim'):
-                    self.relax.data.diff[self.run].Da_sim = []
+                    self.relax.data.diff[self.run].Da_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'Dr_sim'):
-                    self.relax.data.diff[self.run].Dr_sim = []
+                    self.relax.data.diff[self.run].Dr_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'alpha_sim'):
-                    self.relax.data.diff[self.run].alpha_sim = []
+                    self.relax.data.diff[self.run].alpha_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'beta_sim'):
-                    self.relax.data.diff[self.run].beta_sim = []
+                    self.relax.data.diff[self.run].beta_sim = 
DiffTensorSimList()
                 if not hasattr(self.relax.data.diff[self.run], 'gamma_sim'):
-                    self.relax.data.diff[self.run].gamma_sim = []
+                    self.relax.data.diff[self.run].gamma_sim = 
DiffTensorSimList()
 
                 # Append the value.
                 self.relax.data.diff[self.run].tm_sim.append(tm)