r11855 - in /1.3: ./ generic_fns/ specific_fns/ specific_fns/noe/ test_suite/shared_data/peak_lists/bug_17276/ test_suite/sh... -- December 17, 2010 - 12:10

Author: bugman
Date: Fri Dec 17 12:10:03 2010
New Revision: 11855

URL: http://svn.gna.org/viewcvs/relax?rev=11855&view=rev
Log:
Merged revisions 11815-11816,11819,11832-11835,11847,11850-11853 via svnmerge 
from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/peak_list_handling

........
  r11815 | bugman | 2010-12-14 17:51:09 +0100 (Tue, 14 Dec 2010) | 3 lines
  
  Modified the bug_17276 system test data so that there is some noise 
simulated.
........
  r11816 | bugman | 2010-12-14 17:52:06 +0100 (Tue, 14 Dec 2010) | 3 lines
  
  Peak intensity data is now stored as a dictionary with the spectrum_id arg 
as keys.
........
  r11819 | bugman | 2010-12-14 19:02:59 +0100 (Tue, 14 Dec 2010) | 5 lines
  
  Fix for the Relax_fit.test_read_sparky system test.
  
  This was solely a problem within the test and its data.
........
  r11832 | bugman | 2010-12-15 12:17:28 +0100 (Wed, 15 Dec 2010) | 3 lines
  
  Switched __errors_repl() to use dictionaries rather than lists.
........
  r11833 | bugman | 2010-12-15 18:33:22 +0100 (Wed, 15 Dec 2010) | 3 lines
  
  Converted the specific relaxation curve fitting code to use the dictionary 
data structures.
........
  r11834 | bugman | 2010-12-15 18:33:44 +0100 (Wed, 15 Dec 2010) | 3 lines
  
  The Monte Carlo simulation code can now handle dictionary type data.
........
  r11835 | bugman | 2010-12-15 18:51:02 +0100 (Wed, 15 Dec 2010) | 3 lines
  
  The Grace code can now handle dictionary type data.
........
  r11847 | bugman | 2010-12-17 10:03:04 +0100 (Fri, 17 Dec 2010) | 3 lines
  
  Fixes for the system tests - the data is now in dictionaries.
........
  r11850 | bugman | 2010-12-17 10:48:25 +0100 (Fri, 17 Dec 2010) | 3 lines
  
  Redesigned the specific API common method _return_value_general() to handle 
dictionaries.
........
  r11851 | bugman | 2010-12-17 11:12:52 +0100 (Fri, 17 Dec 2010) | 3 lines
  
  Fix for the API base method _return_value_general() - not all values have 
errors associated with them.
........
  r11852 | bugman | 2010-12-17 11:43:27 +0100 (Fri, 17 Dec 2010) | 3 lines
  
  The NOE specific analysis now uses the dictionary type structure for the 
intensity data structures.
........
  r11853 | bugman | 2010-12-17 11:44:35 +0100 (Fri, 17 Dec 2010) | 6 lines
  
  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:
    1.3/   (props changed)
    1.3/generic_fns/grace.py
    1.3/generic_fns/monte_carlo.py
    1.3/generic_fns/spectrum.py
    1.3/specific_fns/api_common.py
    1.3/specific_fns/noe/main.py
    1.3/specific_fns/relax_fit.py
    1.3/test_suite/shared_data/peak_lists/bug_17276/T10102Ed.txt
    1.3/test_suite/shared_data/peak_lists/bug_17276/T112002Ed.txt
    1.3/test_suite/shared_data/saved_states/basic_heights_T2_ncyc1.bz2
    1.3/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py
    1.3/test_suite/system_tests/peak_lists.py
    1.3/test_suite/system_tests/relax_fit.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: 1.3/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/generic_fns/monte_carlo.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/monte_carlo.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/generic_fns/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/spectrum.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/specific_fns/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/api_common.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/specific_fns/noe/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe/main.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/test_suite/shared_data/peak_lists/bug_17276/T10102Ed.txt
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/peak_lists/bug_17276/T10102Ed.txt?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/test_suite/shared_data/peak_lists/bug_17276/T112002Ed.txt
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/peak_lists/bug_17276/T112002Ed.txt?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/test_suite/shared_data/saved_states/basic_heights_T2_ncyc1.bz2
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/saved_states/basic_heights_T2_ncyc1.bz2?rev=11855&r1=11854&r2=11855&view=diff

Modified: 
1.3/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/peak_lists.py?rev=11855&r1=11854&r2=11855&view=diff

Modified: 1.3/test_suite/system_tests/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/relax_fit.py?rev=11855&r1=11854&r2=11855&view=diff