r15121 - in /branches/frame_order_testing/generic_fns/structure: api_base.py scientific.py -- January 02, 2012 - 22:05

Author: bugman
Date: Mon Jan  2 22:05:23 2012
New Revision: 15121

URL: http://svn.gna.org/viewcvs/relax?rev=15121&view=rev
Log:
The structural API atom_loop() methods now all have the model_num_flag arg 
dropped.


Modified:
    branches/frame_order_testing/generic_fns/structure/api_base.py
    branches/frame_order_testing/generic_fns/structure/scientific.py

Modified: branches/frame_order_testing/generic_fns/structure/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/api_base.py?rev=15121&r1=15120&r2=15121&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/api_base.py (original)
+++ branches/frame_order_testing/generic_fns/structure/api_base.py Mon Jan  2 
22:05:23 2012
@@ -118,7 +118,7 @@
         raise RelaxImplementError
 
 
-    def atom_loop(self, atom_id=None, str_id=None, model_num=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=None, 
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):
         """Prototype generator method stub for looping over all atoms in the 
structural data object.
 
         This method should be designed as a generator 
(http://www.python.org/dev/peps/pep-0255/).
@@ -142,8 +142,6 @@
         @type str_id:               str, int, or None
         @keyword model_num:         Only loop over a specific model.
         @type model_num:            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.
         @type mol_name_flag:        bool
         @keyword res_num_flag:      A flag which if True will cause the 
residue number to be yielded.

Modified: branches/frame_order_testing/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/scientific.py?rev=15121&r1=15120&r2=15121&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/scientific.py 
(original)
+++ branches/frame_order_testing/generic_fns/structure/scientific.py Mon Jan  
2 22:05:23 2012
@@ -154,7 +154,7 @@
                 yield res, res.number, res.name, res_index
 
 
-    def atom_loop(self, atom_id=None, str_id=None, model_num=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=None, 
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
@@ -166,8 +166,6 @@
         @type str_id:               str, int, or None
         @keyword model_num:         Only loop over a specific model.
         @type model_num:            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.
         @type mol_name_flag:        bool
         @keyword res_num_flag:      A flag which if True will cause the 
residue number to be
@@ -243,11 +241,6 @@
 
                         # Build the tuple to be yielded.
                         atomic_tuple = ()
-                        if model_num_flag:
-                            if ave:
-                                atomic_tuple = atomic_tuple + (None,)
-                            else:
-                                atomic_tuple = atomic_tuple + (model.num,)
                         if mol_name_flag:
                             atomic_tuple = atomic_tuple + (mol_name,)
                         if res_num_flag: