r13955 - in /branches/gui_testing: ./ generic_fns/structure/ prompt/ sample_scripts/n_state_model/ test_suite/shared_data/al... -- July 28, 2011 - 16:08

Author: bugman
Date: Thu Jul 28 16:08:22 2011
New Revision: 13955

URL: http://svn.gna.org/viewcvs/relax?rev=13955&view=rev
Log:
Merged revisions 13932,13951 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13932 | bugman | 2011-07-27 17:54:24 +0200 (Wed, 27 Jul 2011) | 13 lines
  
  Redesign of the structure.load_spins user function back end.
  
  This redesign is required due to problems encountered by Han in the xyz 
branch.  See the thread
  starting at https://mail.gna.org/public/relax-devel/2011-07/msg00021.html.
  
  This commit consists of a number of changes:
      - The combine_models argument has been removed as it is a relic, and 
isn't used at all.
      - The spins are now created in the standard way via the 
generic_fns.mol_res_spin.create_spin()
  function, eliminating all of the issues and complications of the old code.
      - The atomic positions are now converted to numpy arrays.  
      - Only the created spins are included in the print out, and not 
replicated for each model.
........
  r13951 | bugman | 2011-07-28 15:14:55 +0200 (Thu, 28 Jul 2011) | 7 lines
  
  Redesign of the main relax module.
  
  The module has been renamed to 'relax.py', and the original file 'relax' is 
now a very basic python
  script which simply loads the module and runs the new start() function for 
launching relax.  The MS
  Windows BAT file has also been updated to feed the module into python.
........

Added:
    branches/gui_testing/relax.py
      - copied unchanged from r13951, 1.3/relax.py
Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/generic_fns/structure/main.py
    branches/gui_testing/prompt/structure.py
    branches/gui_testing/relax
    branches/gui_testing/relax.bat
    
branches/gui_testing/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
    
branches/gui_testing/test_suite/shared_data/align_data/population_model/generate.py
    
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py
    
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/missing_data_test.py
    
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/populations.py
    
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/vector_loading.py

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

Modified: branches/gui_testing/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/structure/main.py?rev=13955&r1=13954&r2=13955&view=diff

Modified: branches/gui_testing/prompt/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/prompt/structure.py?rev=13955&r1=13954&r2=13955&view=diff

Modified: branches/gui_testing/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/relax?rev=13955&r1=13954&r2=13955&view=diff

Modified: branches/gui_testing/relax.bat
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/relax.bat?rev=13955&r1=13954&r2=13955&view=diff

Modified: 
branches/gui_testing/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=13955&r1=13954&r2=13955&view=diff

Modified: 
branches/gui_testing/test_suite/shared_data/align_data/population_model/generate.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/shared_data/align_data/population_model/generate.py?rev=13955&r1=13954&r2=13955&view=diff

Modified: 
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/scripts/n_state_model/lactose_n_state.py?rev=13955&r1=13954&r2=13955&view=diff

Modified: 
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/missing_data_test.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/scripts/n_state_model/missing_data_test.py?rev=13955&r1=13954&r2=13955&view=diff

Modified: 
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/populations.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/scripts/n_state_model/populations.py?rev=13955&r1=13954&r2=13955&view=diff

Modified: 
branches/gui_testing/test_suite/system_tests/scripts/n_state_model/vector_loading.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/scripts/n_state_model/vector_loading.py?rev=13955&r1=13954&r2=13955&view=diff