Author: bugman Date: Mon Dec 3 16:38:40 2012 New Revision: 18068 URL: http://svn.gna.org/viewcvs/relax?rev=18068&view=rev Log: Merged revisions 18066 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18066 | bugman | 2012-12-03 16:36:44 +0100 (Mon, 03 Dec 2012) | 3 lines Fix for a bug introduced at r18055 - the interatom.absolute_rdc data structure does not always exist. ........ Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/generic_fns/rdc.py Propchange: branches/frame_order_testing/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Dec 3 16:38:40 2012 @@ -1,1 +1,1 @@ -/trunk:1-18061 +/trunk:1-18067 Modified: branches/frame_order_testing/generic_fns/rdc.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/rdc.py?rev=18068&r1=18067&r2=18068&view=diff ============================================================================== --- branches/frame_order_testing/generic_fns/rdc.py (original) +++ branches/frame_order_testing/generic_fns/rdc.py Mon Dec 3 16:38:40 2012 @@ -120,7 +120,7 @@ interatom.rdc_bc[id] = ave_rdc_tensor(dj, unit_vect, cdp.N, cdp.align_tensors[get_tensor_index(align_id=id)].A, weights=weights) # The absolute value. - if id in interatom.absolute_rdc.keys() and interatom.absolute_rdc[id]: + if hasattr(interatom, 'absolute_rdc') and id in interatom.absolute_rdc.keys() and interatom.absolute_rdc[id]: interatom.rdc_bc[id] = abs(interatom.rdc_bc[id])