Author: bugman Date: Tue Feb 22 15:12:57 2011 New Revision: 12609 URL: http://svn.gna.org/viewcvs/relax?rev=12609&view=rev Log: Added a catch for the "worst case per peak scenario" option in the PDC. This will now throw a RelaxError, telling the user to go back to the PDC and use the other option. Modified: 1.3/generic_fns/pdc.py Modified: 1.3/generic_fns/pdc.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pdc.py?rev=12609&r1=12608&r2=12609&view=diff ============================================================================== --- 1.3/generic_fns/pdc.py (original) +++ 1.3/generic_fns/pdc.py Tue Feb 22 15:12:57 2011 @@ -115,6 +115,13 @@ for i in range(len(line)-3): version = version + ' ' + line[i+3] + # Check for bad errors. + if len(line) >= 5 and line[0:5] == ['Systematic', 'error', 'estimation', 'of', 'data:']: + # Badness. + if line[5:] == ['worst', 'case', 'per', 'peak', 'scenario']: + raise RelaxError("The errors estimation method \"worst case per peak scenario\" is not suitable for model-free analysis. Please go back to the PDC and switch to \"average variance calculation\".") + + # The data type. if len(line) == 3 and search('T1', line[2]): ri_label = 'R1'