mailr17764 - /branches/tensor_data/specific_fns/model_free/main.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 - 19:27:
Author: bugman
Date: Mon Oct  8 19:27:45 2012
New Revision: 17764

URL: http://svn.gna.org/viewcvs/relax?rev=17764&view=rev
Log:
Fix for the setup of the model-free Monte Carlo simulations for the new 
diffusion tensor design.


Modified:
    branches/tensor_data/specific_fns/model_free/main.py

Modified: branches/tensor_data/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/tensor_data/specific_fns/model_free/main.py?rev=17764&r1=17763&r2=17764&view=diff
==============================================================================
--- branches/tensor_data/specific_fns/model_free/main.py (original)
+++ branches/tensor_data/specific_fns/model_free/main.py Mon Oct  8 19:27:45 
2012
@@ -2364,21 +2364,13 @@
 
         # Diffusion tensor parameters and non spin specific minimisation 
statistics.
         if model_type == 'diff' or model_type == 'all':
-            # Loop over the parameters.
+            # Set up the number of simulations.
+            cdp.diff_tensor.set_sim_num(cdp.sim_number)
+
+            # Loop over the parameters, setting the initial simulation 
values to those of the parameter value.
             for object_name in diff_params:
-                # Name for the simulation object.
-                sim_object_name = object_name + '_sim'
-
-                # Create the simulation object.
-                setattr(cdp.diff_tensor, sim_object_name, [])
-
-                # Get the simulation object.
-                sim_object = getattr(cdp.diff_tensor, sim_object_name)
-
-                # Loop over the simulations.
                 for j in range(cdp.sim_number):
-                    # Copy and append the data.
-                    sim_object.append(deepcopy(getattr(cdp.diff_tensor, 
object_name)))
+                    cdp.diff_tensor.set(param=object_name, 
value=deepcopy(getattr(cdp.diff_tensor, object_name)), category='sim', 
sim_index=j)
 
         # Spin specific parameters.
         if model_type != 'diff':




Related Messages


Powered by MHonArc, Updated Mon Oct 08 19:40:01 2012