r6670 - /branches/rdc_analysis/generic_fns/structure/scientific.py -- July 04, 2008 - 16:35

Author: bugman
Date: Fri Jul  4 16:09:11 2008
New Revision: 6670

URL: http://svn.gna.org/viewcvs/relax?rev=6670&view=rev
Log:
Added the str_id arg to the Scientific PDB object atom_loop() method.


Modified:
    branches/rdc_analysis/generic_fns/structure/scientific.py

Modified: branches/rdc_analysis/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/generic_fns/structure/scientific.py?rev=6670&r1=6669&r2=6670&view=diff
==============================================================================
--- branches/rdc_analysis/generic_fns/structure/scientific.py (original)
+++ branches/rdc_analysis/generic_fns/structure/scientific.py Fri Jul  4 
16:09:11 2008
@@ -199,12 +199,16 @@
                 yield res, res.number, res.name
 
 
-    def atom_loop(self, atom_id=None, model_num_flag=False, 
mol_name_flag=False, res_num_flag=False, res_name_flag=False, 
atom_num_flag=False, atom_name_flag=False, element_flag=False, 
pos_flag=False, ave=False):
+    def atom_loop(self, atom_id=None, str_id=None, model_num_flag=False, 
mol_name_flag=False, res_num_flag=False, res_name_flag=False, 
atom_num_flag=False, atom_name_flag=False, element_flag=False, 
pos_flag=False, ave=False):
         """Generator function for looping over all atoms in the Scientific 
Python data objects.
 
         @keyword atom_id:           The molecule, residue, and atom 
identifier string.  Only atoms
                                     matching this selection will be yielded.
         @type atom_id:              str
+        @keyword str_id:            The structure identifier.  This can be 
the file name, model
+                                    number, or structure number.  If None, 
then all structures will
+                                    be looped over.
+        @type str_id:               str, int, or None
         @keyword model_num_flag:    A flag which if True will cause the 
model number to be yielded.
         @type model_num_flag:       bool
         @keyword mol_name_flag:     A flag which if True will cause the 
molecule name to be yielded.