Author: bugman Date: Mon Jun 27 17:34:17 2011 New Revision: 13243 URL: http://svn.gna.org/viewcvs/relax?rev=13243&view=rev Log: Rearranged the data checks in the NOE page to match the page layout. Modified: branches/gui_testing/gui/analyses/auto_noe.py Modified: branches/gui_testing/gui/analyses/auto_noe.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_noe.py?rev=13243&r1=13242&r2=13243&view=diff ============================================================================== --- branches/gui_testing/gui/analyses/auto_noe.py (original) +++ branches/gui_testing/gui/analyses/auto_noe.py Mon Jun 27 17:34:17 2011 @@ -138,28 +138,28 @@ else: data.seq_args = None + # The frequency. + frq = gui_to_str(self.field_nmr_frq.GetValue()) + if frq == None: + missing.append('NMR frequency') + + # Filename. + data.filename = 'noe.%s.out' % frq + + # Saturated peak list and background noe. + data.sat_file = self.data.sat_file + if not data.sat_file: + missing.append('Saturated peak list') + data.sat_rmsd = int(self.data.sat_rmsd) + # Reference peak list and background noe. data.ref_file = self.data.ref_file if not data.ref_file: missing.append('Reference peak list') data.ref_rmsd = int(self.data.ref_rmsd) - # Saturated peak list and background noe. - data.sat_file = self.data.sat_file - if not data.sat_file: - missing.append('Saturated peak list') - data.sat_rmsd = int(self.data.sat_rmsd) - # Results directory. data.save_dir = self.data.save_dir - - # The frequency. - frq = gui_to_str(self.field_nmr_frq.GetValue()) - if frq == None: - missing.append('NMR frequency') - - # Filename. - data.filename = 'noe.%s.out' % frq # The integration method. data.int_method = 'height'