Hi Ed, I am not sure I understand all what you say here...
Am I right if I say that you propose to return the spin_id directly from the intensity_*() functions ? This would simplify the code. Perfect. What about not doing so for the intensity_generic function also ? What difference would this make ? This is where I don't follow what you say... That function is not already returning the spin_id, right ? Sorry, this may be an English understanding failure from me here... Regards, Séb :) Edward d'Auvergne wrote: > Hi, > > I think we need to rethink what the intensity_*() functions return > here. In the case of intensity_generic(), I think we should be > returning the spin_id string as per the generic intensity file. So > maybe, rather than returning the residue number, all these functions > construct and return the spin_id. Maybe the line: > > spin_id = generate_spin_id(res_num=res_num, spin_name=X_name) > > can be duplicated and placed inside the intensity_*() functions (all > except for intensity_generic). Seb, can you see an issue with > approach? > > Regards, > > Edward > > > On Thu, Dec 4, 2008 at 3:48 PM, <[EMAIL PROTECTED]> wrote: > >> Author: semor >> Date: Thu Dec 4 15:48:24 2008 >> New Revision: 8127 >> >> URL: http://svn.gna.org/viewcvs/relax?rev=8127&view=rev >> Log: >> Added some printouts for the loading of the generic intensity file. >> >> This is as suggested in a post by Edward at: >> https://mail.gna.org/public/relax-devel/2008-12/msg00016.html >> (Message-id: <[EMAIL PROTECTED]>) >> >> >> Modified: >> 1.3/generic_fns/spectrum.py >> >> Modified: 1.3/generic_fns/spectrum.py >> URL: >> http://svn.gna.org/viewcvs/relax/1.3/generic_fns/spectrum.py?rev=8127&r1=8126&r2=8127&view=diff >> ============================================================================== >> --- 1.3/generic_fns/spectrum.py (original) >> +++ 1.3/generic_fns/spectrum.py Thu Dec 4 15:48:24 2008 >> @@ -462,6 +462,10 @@ >> intensity.append(float(line[i + 5])) >> except ValueError: >> raise RelaxError, "The peak intensity value " + `intensity` + " >> from the line " + `line` + " is invalid." >> + >> + print '' >> + print 'The following information was extracted from the intensity file >> (res_num, h_name, x_name, intensities).' >> + print ' ' + `res_num`, h_name, x_name, intensity >> >> # Return the data. >> return res_num, h_name, x_name, intensity >> >> >> _______________________________________________ >> relax (http://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 >> >> > > _______________________________________________ > relax (http://nmr-relax.com) > > This is the relax-devel 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-devel > > _______________________________________________ relax (http://nmr-relax.com) This is the relax-devel 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-devel
