r20183 - in /branches/relax_disp/specific_analyses/relax_disp: api.py disp_data.py -- June 17, 2013 - 18:29

Author: bugman
Date: Mon Jun 17 18:29:18 2013
New Revision: 20183

URL: http://svn.gna.org/viewcvs/relax?rev=20183&view=rev
Log:
The Monte Carlo simulations now generate parameter errors for the relaxation 
dispersion analysis.

The simulation index was being ignored, hence the input data was never the 
randomised data and all
errors were zero.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/api.py
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=20183&r1=20182&r2=20183&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/api.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/api.py Mon Jun 17 
18:29:18 2013
@@ -1071,7 +1071,7 @@
                 raise RelaxError("The spectrometer frequency information has 
not been specified.")
 
             # The R2eff/R1rho data.
-            values, errors, missing, frqs = return_r2eff_arrays(spins=spins, 
spin_ids=spin_ids, fields=fields, field_count=field_count)
+            values, errors, missing, frqs = return_r2eff_arrays(spins=spins, 
spin_ids=spin_ids, fields=fields, field_count=field_count, 
sim_index=sim_index)
 
             # Create the initial parameter vector.
             param_vector = assemble_param_vector(spins=spins)

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=20183&r1=20182&r2=20183&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Mon Jun 17 
18:29:18 2013
@@ -869,7 +869,7 @@
             if sim_index == None:
                 values[spin_index, frq_index, disp_pt_index] = 
spin.r2eff[key]
             else:
-                values[spin_index, frq_index, disp_pt_index] = 
spin.r2eff_sim[key][sim_index]
+                values[spin_index, frq_index, disp_pt_index] = 
spin.r2eff_sim[sim_index][key]
 
             # The errors.
             errors[spin_index, frq_index, disp_pt_index] = 
spin.r2eff_err[key]