Author: bugman
Date: Thu Feb 5 19:12:57 2015
New Revision: 27567
URL: http://svn.gna.org/viewcvs/relax?rev=27567&view=rev
Log:
Fixes for the N-state model num_data_points() function.
The deselected interatomic data containers are no longer used for counting RDC
data. And the
skipping of deselected spin containers for the PCS is now via the spin_loop()
skip_desel argument.
Modified:
trunk/specific_analyses/n_state_model/data.py
Modified: trunk/specific_analyses/n_state_model/data.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/n_state_model/data.py?rev=27567&r1=27566&r2=27567&view=diff
==============================================================================
--- trunk/specific_analyses/n_state_model/data.py (original)
+++ trunk/specific_analyses/n_state_model/data.py Thu Feb 5 19:12:57 2015
@@ -138,11 +138,7 @@
n = 0
# Spin loop.
- for spin in spin_loop():
- # Skip deselected spins.
- if not spin.select:
- continue
-
+ for spin in spin_loop(skip_desel=True):
# PCS data (skipping array elements set to None).
if 'pcs' in data_types:
if hasattr(spin, 'pcs'):
@@ -151,7 +147,7 @@
n += 1
# Interatomic data loop.
- for interatom in interatomic_loop():
+ for interatom in interatomic_loop(skip_desel=True):
# RDC data (skipping array elements set to None).
if 'rdc' in data_types:
if hasattr(interatom, 'rdc'):
_______________________________________________
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
