Author: bugman
Date: Fri Oct 2 16:06:14 2015
New Revision: 27960
URL: http://svn.gna.org/viewcvs/relax?rev=27960&view=rev
Log:
Fix for the merger of the frame_order_cleanup branch.
The data_store/__init__.py changes of r27769 were lost with the r27951 merge
commit.
Modified:
trunk/data_store/__init__.py
Modified: trunk/data_store/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/data_store/__init__.py?rev=27960&r1=27959&r2=27960&view=diff
==============================================================================
--- trunk/data_store/__init__.py (original)
+++ trunk/data_store/__init__.py Fri Oct 2 16:06:14 2015
@@ -353,6 +353,28 @@
# Add the oversampling variable.
cdp.sobol_oversample = 1
+ # PCS Q factor conversions.
+ if hasattr(dp, 'q_factors_pcs'):
+ dp.q_factors_pcs_norm_squared_sum = dp.q_factors_pcs
+ del dp.q_factors_pcs
+ if hasattr(dp, 'q_pcs'):
+ dp.q_pcs_norm_squared_sum = dp.q_pcs
+ del dp.q_pcs
+
+ # RDC Q factor conversions.
+ if hasattr(dp, 'q_factors_rdc'):
+ dp.q_factors_rdc_norm_tensor_size = dp.q_factors_rdc
+ del dp.q_factors_rdc
+ if hasattr(dp, 'q_rdc'):
+ dp.q_rdc_norm_tensor_size = dp.q_rdc
+ del dp.q_rdc
+ if hasattr(dp, 'q_factors_rdc_norm2'):
+ dp.q_factors_rdc_norm_squared_sum = dp.q_factors_rdc_norm2
+ del dp.q_factors_rdc_norm2
+ if hasattr(dp, 'q_rdc_norm2'):
+ dp.q_rdc_norm_squared_sum = dp.q_rdc_norm2
+ del dp.q_rdc_norm2
+
def add(self, pipe_name, pipe_type, bundle=None, switch=True):
"""Method for adding a new data pipe container to the dictionary.
_______________________________________________
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
