Author: bugman
Date: Wed Sep 24 10:29:31 2014
New Revision: 25997
URL: http://svn.gna.org/viewcvs/relax?rev=25997&view=rev
Log:
The RDC only optimisation now defaults to the *_qrint() frame order target
functions.
This restores the earlier behaviour prior to the restoration of the SciPy
quadratic integration.
Modified:
branches/frame_order_cleanup/target_functions/frame_order.py
Modified: branches/frame_order_cleanup/target_functions/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/target_functions/frame_order.py?rev=25997&r1=25996&r2=25997&view=diff
==============================================================================
--- branches/frame_order_cleanup/target_functions/frame_order.py
(original)
+++ branches/frame_order_cleanup/target_functions/frame_order.py Wed Sep
24 10:29:31 2014
@@ -304,7 +304,7 @@
self.d2rdc_theta = zeros((self.total_num_params,
self.total_num_params, self.num_align, self.num_interatom), float64)
# The quasi-random integration.
- if not quad_int and self.pcs_flag and model not in ['rigid']:
+ if not quad_int and model not in ['rigid']:
# The Sobol' sequence data and target function aliases
(quasi-random integration).
if model == MODEL_PSEUDO_ELLIPSE:
self.create_sobol_data(dims=['theta', 'phi', 'sigma'])
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
