Author: bugman
Date: Wed Aug 12 14:53:54 2009
New Revision: 9284
URL: http://svn.gna.org/viewcvs/relax?rev=9284&view=rev
Log:
Removed the last '/' directory separators to be more non-Unix operating
system compatible.
Modified:
1.3/generic_fns/dasha.py
1.3/generic_fns/palmer.py
1.3/sample_scripts/full_analysis.py
1.3/sample_scripts/xh_vector_dist.py
1.3/scons/manuals.py
1.3/test_suite/system_tests/structure.py
Modified: 1.3/generic_fns/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=9284&r1=9283&r2=9284&view=diff
==============================================================================
--- 1.3/generic_fns/dasha.py (original)
+++ 1.3/generic_fns/dasha.py Wed Aug 12 14:53:54 2009
@@ -25,7 +25,7 @@
# Python module imports.
from math import pi
-from os import F_OK, access, chdir, getcwd, popen3
+from os import F_OK, access, chdir, getcwd, popen3, sep
from string import lower
import sys
@@ -456,7 +456,7 @@
# Loop over the parameters.
for param in ['S2', 'S2f', 'S2s', 'te', 'tf', 'ts', 'Rex']:
# The file name.
- file_name = dir + '/' + param + '.out'
+ file_name = dir + sep + param + '.out'
# Test if the file exists.
if not access(file_name, F_OK):
@@ -487,7 +487,7 @@
setattr(spin, lower(param), None)
# Extract the chi-squared values.
- file_name = dir + '/chi2.out'
+ file_name = dir + sep+'chi2.out'
# Test if the file exists.
if not access(file_name, F_OK):
Modified: 1.3/generic_fns/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=9284&r1=9283&r2=9284&view=diff
==============================================================================
--- 1.3/generic_fns/palmer.py (original)
+++ 1.3/generic_fns/palmer.py Wed Aug 12 14:53:54 2009
@@ -155,7 +155,7 @@
run = open_write_file('run.sh', dir, force)
create_run(run, binary=binary, dir=dir)
run.close()
- chmod(dir + '/run.sh', 0755)
+ chmod(dir + sep+'run.sh', 0755)
def create_mfdata(file, spin=None, spin_id=None, num_frq=None, frq=None):
@@ -619,14 +619,14 @@
raise RelaxDirError, ('Modelfree4', dir)
# Test if the file exists.
- if not access(dir + "/mfout", F_OK):
- raise RelaxFileError, ('Modelfree4', dir + "/mfout")
+ if not access(dir + sep+'mfout', F_OK):
+ raise RelaxFileError, ('Modelfree4', dir + sep+'mfout')
# Determine the parameter set.
model_type = model_free_obj.determine_model_type()
# Open the file.
- mfout_file = open(dir + "/mfout", 'r')
+ mfout_file = open(dir + sep+'mfout', 'r')
mfout_lines = mfout_file.readlines()
mfout_file.close()
Modified: 1.3/sample_scripts/full_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/full_analysis.py?rev=9284&r1=9283&r2=9284&view=diff
==============================================================================
--- 1.3/sample_scripts/full_analysis.py (original)
+++ 1.3/sample_scripts/full_analysis.py Wed Aug 12 14:53:54 2009
@@ -248,7 +248,7 @@
pipe.create(name, 'mf')
# Load the local tm diffusion model MI results.
- results.read(file='results', dir='local_tm/aic')
+ results.read(file='results', dir='local_tm'+sep+'aic')
# Remove the tm parameter.
model_free.remove_tm()
@@ -331,7 +331,7 @@
pipe.create('local_tm', 'mf')
# Load the local tm diffusion model MI results.
- results.read(file='results', dir='local_tm/aic')
+ results.read(file='results', dir='local_tm'+sep+'aic')
# Loop over models MII to MV.
for model in ['sphere', 'prolate', 'oblate', 'ellipsoid']:
Modified: 1.3/sample_scripts/xh_vector_dist.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/sample_scripts/xh_vector_dist.py?rev=9284&r1=9283&r2=9284&view=diff
==============================================================================
--- 1.3/sample_scripts/xh_vector_dist.py (original)
+++ 1.3/sample_scripts/xh_vector_dist.py Wed Aug 12 14:53:54 2009
@@ -20,6 +20,10 @@
#
#
###############################################################################
+# Python module imports.
+from os import sep
+
+
# Script for creating a PDB representation of the distribution of XH bond
vectors.
##################################################################################
@@ -34,7 +38,7 @@
structure.load_spins(spin_id='@N')
# Select solely the NH vectors used in the analysis.
-select.read(file='../rates.txt', change_all=True, res_num_col=1)
+select.read(file='..'+sep+'rates.txt', change_all=True, res_num_col=1)
# Extract the XH vectors.
structure.vectors()
Modified: 1.3/scons/manuals.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/scons/manuals.py?rev=9284&r1=9283&r2=9284&view=diff
==============================================================================
--- 1.3/scons/manuals.py (original)
+++ 1.3/scons/manuals.py Wed Aug 12 14:53:54 2009
@@ -96,17 +96,17 @@
# The list of objects to document.
modules = ['relax',
'*.py',
- 'docs/*.py',
- 'docs/latex/*.py',
- 'dx/*.py',
- 'generic_fns/*.py',
- 'generic_fns/structure/*.py',
- 'maths_fns/*.py',
- 'prompt/*.py',
- 'specific_fns/*.py',
- 'test_suite/[a-z]*.py',
- 'test_suite/unit_tests/unit_test_runner.py',
- 'scons/*.py']
+ 'docs'+sep+'*.py',
+ 'docs'+sep+'latex'+sep+'*.py',
+ 'dx'+sep+'*.py',
+ 'generic_fns'+sep+'*.py',
+ 'generic_fns'+sep+'structure'+sep+'*.py',
+ 'maths_fns'+sep+'*.py',
+ 'prompt'+sep+'*.py',
+ 'specific_fns'+sep+'*.py',
+ 'test_suite'+sep+'[a-z]*.py',
+ 'test_suite'+sep+'unit_tests'+sep+'unit_test_runner.py',
+ 'scons'+sep+'*.py']
# exclude
# The list of objects to exclude.
@@ -119,7 +119,7 @@
# target
# The path to the output directory. May be relative or absolute.
- target = 'docs/api'
+ target = 'docs'+sep+'api'
# docformat
# The default markup language for docstrings, for modules that do
@@ -283,7 +283,7 @@
######################
# Open the file.
- css_file = open(target + '/epydoc.css', 'a')
+ css_file = open(target + sep+'epydoc.css', 'a')
# Header.
css_file.write("\n\n\n\n/* Edward */\n\n")
Modified: 1.3/test_suite/system_tests/structure.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/structure.py?rev=9284&r1=9283&r2=9284&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/structure.py (original)
+++ 1.3/test_suite/system_tests/structure.py Wed Aug 12 14:53:54 2009
@@ -130,7 +130,7 @@
mol = cdp.structure.structural_data[0].mol[0]
self.assertEqual(mol.file_name, 'Ap4Aase_res1-12.pdb')
- self.assertEqual(mol.file_path, 'test_suite/shared_data/structures')
+ self.assertEqual(mol.file_path,
'test_suite'+sep+'shared_data'+sep+'structures')
self.assertEqual(mol.file_model, 1)
self.assertEqual(mol.file_mol_num, 1)
r9284 - in /1.3: generic_fns/ sample_scripts/ scons/ test_suite/system_tests/