r7356 - in /1.3/generic_fns/structure: internal.py main.py scientific.py -- September 26, 2008 - 18:04

Author: bugman
Date: Fri Sep 26 18:04:05 2008
New Revision: 7356

URL: http://svn.gna.org/viewcvs/relax?rev=7356&view=rev
Log:
Shifted the setting of the file and path to the specific structural object 
load_pdb() methods.


Modified:
    1.3/generic_fns/structure/internal.py
    1.3/generic_fns/structure/main.py
    1.3/generic_fns/structure/scientific.py

Modified: 1.3/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/internal.py?rev=7356&r1=7355&r2=7356&view=diff
==============================================================================
--- 1.3/generic_fns/structure/internal.py (original)
+++ 1.3/generic_fns/structure/internal.py Fri Sep 26 18:04:05 2008
@@ -25,6 +25,7 @@
 
 # Python module imports.
 from numpy import array, float64, linalg, zeros
+from os import path
 from re import search
 from string import split, strip, upper
 from warnings import warn
@@ -784,6 +785,14 @@
         if verbosity:
             print "Internal relax PDB parser.\n"
 
+        # Set the file name and path.
+        expanded = path.split(file_path)
+        self.path.append(expanded[0])
+        self.file.append(expanded[1])
+
+        # Store the model number.
+        self.model = model
+
         # Use pointers (references) if the PDB data exists in another pipe.
         for data_pipe in ds:
             if hasattr(data_pipe, 'structure'):

Modified: 1.3/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/main.py?rev=7356&r1=7355&r2=7356&view=diff
==============================================================================
--- 1.3/generic_fns/structure/main.py (original)
+++ 1.3/generic_fns/structure/main.py Fri Sep 26 18:04:05 2008
@@ -23,7 +23,7 @@
 # Python module imports.
 from math import sqrt
 from numpy import dot, float64, ndarray, zeros
-from os import F_OK, access, path
+from os import F_OK, access
 from re import search
 import sys
 from warnings import warn
@@ -198,11 +198,6 @@
         elif parser == 'internal':
             cdp.structure = Internal()
 
-    # Set the file name and path.
-    expanded = path.split(file_path)
-    cdp.structure.path.append(expanded[0])
-    cdp.structure.file.append(expanded[1])
-
     # Load the structures.
     cdp.structure.load_pdb(file_path, model, verbosity)
 

Modified: 1.3/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/scientific.py?rev=7356&r1=7355&r2=7356&view=diff
==============================================================================
--- 1.3/generic_fns/structure/scientific.py (original)
+++ 1.3/generic_fns/structure/scientific.py Fri Sep 26 18:04:05 2008
@@ -29,6 +29,7 @@
 # Python module imports.
 from math import sqrt
 from numpy import array, dot, float64, zeros
+from os import path
 if dep_check.scientific_pdb_module:
     import Scientific.IO.PDB
 from warnings import warn
@@ -477,6 +478,11 @@
         if verbosity:
             print "Scientific Python PDB parser.\n"
 
+        # Set the file name and path.
+        expanded = path.split(file_path)
+        self.path.append(expanded[0])
+        self.file.append(expanded[1])
+
         # Store the model number.
         self.model = model