r9798 - /branches/bmrb/bmrblib/kinetics/general_relaxation.py -- October 27, 2009 - 15:12

Author: bugman
Date: Tue Oct 27 15:12:27 2009
New Revision: 9798

URL: http://svn.gna.org/viewcvs/relax?rev=9798&view=rev
Log:
The entity ID tag is now present in the general relaxation saveframe.


Modified:
    branches/bmrb/bmrblib/kinetics/general_relaxation.py

Modified: branches/bmrb/bmrblib/kinetics/general_relaxation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/bmrblib/kinetics/general_relaxation.py?rev=9798&r1=9797&r2=9798&view=diff
==============================================================================
--- branches/bmrb/bmrblib/kinetics/general_relaxation.py (original)
+++ branches/bmrb/bmrblib/kinetics/general_relaxation.py Tue Oct 27 15:12:27 
2009
@@ -57,7 +57,7 @@
         self.add_tag_categories()
 
 
-    def add(self, data_type=None, sample_cond_list_id=None, 
sample_cond_list_label='$conditions_1', temp_calibration=None, 
temp_control=None, frq=None, details=None, assembly_atom_ids=None, 
entity_assembly_ids=None, res_nums=None, seq_id=None, res_names=None, 
atom_names=None, atom_types=None, isotope=None, data=None, errors=None, 
rex_val=None, rex_err=None):
+    def add(self, data_type=None, sample_cond_list_id=None, 
sample_cond_list_label='$conditions_1', temp_calibration=None, 
temp_control=None, frq=None, details=None, assembly_atom_ids=None, 
entity_assembly_ids=None, entity_id=None, res_nums=None, seq_id=None, 
res_names=None, atom_names=None, atom_types=None, isotope=None, data=None, 
errors=None, rex_val=None, rex_err=None):
         """Add relaxation data to the data nodes.
 
         Note that units of 1/s are actually rad/s in NMR.  This is the 
hidden radian unit, which if not present would mean that the units would be 
Hz.  For more details, see 
https://mail.gna.org/public/relax-users/2009-01/msg00000.html.
@@ -75,6 +75,8 @@
         @type assembly_atom_ids:            list of int
         @keyword entity_assembly_ids:       The entity assembly ID numbers.
         @type entity_assembly_ids:          list of int
+        @keyword entity_id:                 The entity ID number.
+        @type entity_id:                    int
         @keyword entity_id:                 The entity ID number.
         @type entity_id:                    int
         @keyword res_nums:                  The residue number list.
@@ -122,7 +124,7 @@
         self.details = translate(details)
 
         # Convert to lists and check the lengths.
-        for name in ['assembly_atom_ids', 'entity_assembly_ids', 'res_nums', 
'seq_id', 'res_names', 'atom_names', 'atom_types', 'isotope', 'data', 
'errors', 'rex_val', 'rex_err']:
+        for name in ['assembly_atom_ids', 'entity_assembly_ids', 
'entity_id', 'res_nums', 'seq_id', 'res_names', 'atom_names', 'atom_types', 
'isotope', 'data', 'errors', 'rex_val', 'rex_err']:
             # Get the object.
             obj = locals()[name]
 
@@ -355,6 +357,7 @@
             ['RxID',                    'data_ids'],
             ['AssemblyAtomID',          'assembly_atom_ids'],
             ['EntityAssemblyID',        'entity_assembly_ids'],
+            ['EntityID',                'entity_id'],
             ['CompIndexID',             'res_nums'],
             ['SeqID',                   'seq_id'],
             ['CompID',                  'res_names'],