Author: bugman Date: Mon Feb 21 10:30:13 2011 New Revision: 12602 URL: http://svn.gna.org/viewcvs/relax?rev=12602&view=rev Log: The setting of the integration method in pdc.read() now works. This needed to be done after the packing of the relaxation data. 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=12602&r1=12601&r2=12602&view=diff ============================================================================== --- 1.3/generic_fns/pdc.py (original) +++ 1.3/generic_fns/pdc.py Mon Feb 21 10:30:13 2011 @@ -173,11 +173,14 @@ elif len(line) == 4 and line[0] == 'Used' and line[1] == 'integrals:': # Peak heights. if line[2] == 'peak' and line[3] == 'intensities': - peak_intensity_type(ri_label=ri_label, frq_label=frq_label, type='height') + int_type = 'height' # Peak volumes: if line[2] == 'area' and line[3] == 'integral': - peak_intensity_type(ri_label=ri_label, frq_label=frq_label, type='volume') + int_type = 'volume' # Pack the data. pack_data(ri_label, frq_label, frq, values, errors, spin_ids=res_nums) + + # Set the integration method. + peak_intensity_type(ri_label=ri_label, frq_label=frq_label, type=int_type)