r2676 - /1.3/specific_fns/model_free.py -- October 27, 2006 - 10:51

Author: bugman
Date: Fri Oct 27 10:50:44 2006
New Revision: 2676

URL: http://svn.gna.org/viewcvs/relax?rev=2676&view=rev
Log:
Fix for bug #7540 (https://gna.org/bugs/index.php?7540).

This bug was reported by Alex Hansen (viochemist at gmail dot com).  The 
problem was that the
function 'self.relax.generic.pdb.load()' had been renamed to 
'self.relax.generic.pdb.read()'.  The
correct function is now being called and the heteronucleus and proton name 
arguments, as well as the
'calc_vectors' argument have been removed.


Modified:
    1.3/specific_fns/model_free.py

Modified: 1.3/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free.py?rev=2676&r1=2675&r2=2676&view=diff
==============================================================================
--- 1.3/specific_fns/model_free.py (original)
+++ 1.3/specific_fns/model_free.py Fri Oct 27 10:50:44 2006
@@ -3243,17 +3243,9 @@
         # PDB model.
         pdb_model = eval(self.file_line[self.col['pdb_model']])
 
-        # Heteronucleus.
-        if self.col.has_key('pdb_heteronuc'):
-            pdb_heteronuc = self.file_line[self.col['pdb_heteronuc']]
-
-        # Proton.
-        if self.col.has_key('pdb_proton'):
-            pdb_proton = self.file_line[self.col['pdb_proton']]
-
-        # Load the PDB.
+        # Read the PDB file (if it exists).
         if not pdb == 'None':
-            self.relax.generic.pdb.load(run=self.run, file=pdb, 
model=pdb_model, heteronuc=pdb_heteronuc, proton=pdb_proton, calc_vectors=0, 
fail=0, print_flag=print_flag)
+            self.relax.generic.pdb.read(run=self.run, file=pdb, 
model=pdb_model, fail=0, print_flag=print_flag)
             return 1
         else:
             return 0