mailr11853 - /branches/peak_list_handling/generic_fns/monte_carlo.py


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

Header


Content

Posted by edward on December 17, 2010 - 11:44:
Author: bugman
Date: Fri Dec 17 11:44:35 2010
New Revision: 11853

URL: http://svn.gna.org/viewcvs/relax?rev=11853&view=rev
Log:
The list-type data can also be a numpy array, so the Monte Carlo code can now 
handle this.

Previously the data was being converted from an ndarray to a list, but now 
this is explicitly
handled.


Modified:
    branches/peak_list_handling/generic_fns/monte_carlo.py

Modified: branches/peak_list_handling/generic_fns/monte_carlo.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_list_handling/generic_fns/monte_carlo.py?rev=11853&r1=11852&r2=11853&view=diff
==============================================================================
--- branches/peak_list_handling/generic_fns/monte_carlo.py (original)
+++ branches/peak_list_handling/generic_fns/monte_carlo.py Fri Dec 17 
11:44:35 2010
@@ -26,6 +26,7 @@
 # Python module imports.
 from copy import deepcopy
 from math import sqrt
+from numpy import ndarray
 from random import gauss
 
 # relax module imports.
@@ -76,7 +77,7 @@
         error = return_error(data_index)
 
         # List type data.
-        if isinstance(data, list):
+        if isinstance(data, list) or isinstance(data, ndarray):
             # Loop over the Monte Carlo simulations.
             random = []
             for j in xrange(cdp.sim_number):




Related Messages


Powered by MHonArc, Updated Fri Dec 17 12:20:02 2010