r9283 - in /1.3/test_suite/shared_data: align_data/CaM/ saved_states/ structures/ -- August 12, 2009 - 14:38

Author: bugman
Date: Wed Aug 12 14:38:00 2009
New Revision: 9283

URL: http://svn.gna.org/viewcvs/relax?rev=9283&view=rev
Log:
Modified the shared data scripts to be more non-Unix operating system 
compatible.



Modified:
    1.3/test_suite/shared_data/align_data/CaM/generate_data.py
    1.3/test_suite/shared_data/align_data/CaM/pre_bleach.py
    1.3/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py
    1.3/test_suite/shared_data/structures/generate_str_scientific_results.py

Modified: 1.3/test_suite/shared_data/align_data/CaM/generate_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/align_data/CaM/generate_data.py?rev=9283&r1=9282&r2=9283&view=diff
==============================================================================
--- 1.3/test_suite/shared_data/align_data/CaM/generate_data.py (original)
+++ 1.3/test_suite/shared_data/align_data/CaM/generate_data.py Wed Aug 12 
14:38:00 2009
@@ -55,7 +55,7 @@
 chi_tensor = tensor / pcs_const
 
 # Path to files.
-path = sys.path[-1] + '/test_suite/shared_data/'
+path = sys.path[-1] + sep+'test_suite'+sep+'shared_data'+sep
 
 # Create a data pipe.
 pipe.create('synth', 'N-state')

Modified: 1.3/test_suite/shared_data/align_data/CaM/pre_bleach.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/align_data/CaM/pre_bleach.py?rev=9283&r1=9282&r2=9283&view=diff
==============================================================================
--- 1.3/test_suite/shared_data/align_data/CaM/pre_bleach.py (original)
+++ 1.3/test_suite/shared_data/align_data/CaM/pre_bleach.py Wed Aug 12 
14:38:00 2009
@@ -15,7 +15,7 @@
 
 
 # Path to files.
-path = sys.path[-1] + '/test_suite/shared_data/'
+path = sys.path[-1] + sep+'test_suite'+sep+'shared_data'+sep
 
 # Create a data pipe.
 pipe.create('pre', 'N-state')

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=9283&r1=9282&r2=9283&view=diff
==============================================================================
--- 1.3/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py 
(original)
+++ 1.3/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py 
Wed Aug 12 14:38:00 2009
@@ -2,6 +2,7 @@
 # the saved state becomes incompatible with relax during development.
 
 # Python module imports.
+from os import sep
 import sys
 
 # The relax data store.
@@ -12,13 +13,13 @@
 ds.add(pipe_name='rx', pipe_type='relax_fit')
 
 # Load the Lupin Ap4Aase sequence.
-sequence.read(file="Ap4Aase.seq", dir=sys.path[-1] + 
"/test_suite/shared_data")
+sequence.read(file="Ap4Aase.seq", dir=sys.path[-1] + 
sep+'test_suite'+sep+'shared_data')
 
 # Name the spins so they can be matched to the assignments.
 spin.name(name='N')
 
 # Read the peak heights.
-spectrum.read_intensities(file="T2_ncyc1_ave.list", dir=sys.path[-1] + 
"/test_suite/shared_data/curve_fitting", spectrum_id='0.0176')
+spectrum.read_intensities(file="T2_ncyc1_ave.list", dir=sys.path[-1] + 
sep+'test_suite'+sep+'shared_data'+sep+'curve_fitting', spectrum_id='0.0176')
 
 # Save the state.
 state.save('basic_heights_T2_ncyc1', force=True)

Modified: 
1.3/test_suite/shared_data/structures/generate_str_scientific_results.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/shared_data/structures/generate_str_scientific_results.py?rev=9283&r1=9282&r2=9283&view=diff
==============================================================================
--- 1.3/test_suite/shared_data/structures/generate_str_scientific_results.py 
(original)
+++ 1.3/test_suite/shared_data/structures/generate_str_scientific_results.py 
Wed Aug 12 14:38:00 2009
@@ -1,3 +1,6 @@
+# Python module imports.
+from os import sep
+
 pipe.create('str', 'mf')
-structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir='test_suite/shared_data/structures', parser='scientific')
-results.write('str_scientific', dir='test_suite/shared_data/structures', 
force=True)
+structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir='test_suite'+sep+'shared_data'+sep+'structures', parser='scientific')
+results.write('str_scientific', 
dir='test_suite'+sep+'shared_data'+sep+'structures', force=True)