Hi,
Of course, the reverted revision is not 13065, but 13064... (typed too
fast!)
Séb
On 11-06-16 12:32 PM, sebastien.morin@xxxxxxxxx wrote:
Author: semor
Date: Thu Jun 16 12:32:43 2011
New Revision: 13067
URL: http://svn.gna.org/viewcvs/relax?rev=13067&view=rev
Log:
Reverted r13065.
This follows a remark by Ed at:
https://mail.gna.org/public/relax-devel/2011-06/msg00150.html
Message-id:<BANLkTi=_Hw3VHk6aHzJU6e3d1inKtWOJRA@xxxxxxxxxxxxxx>
The command used was:
svn merge -r13065:13064 .
Modified:
branches/inversion-recovery/maths_fns/inversion-recovery.c
Modified: branches/inversion-recovery/maths_fns/inversion-recovery.c
URL:
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/maths_fns/inversion-recovery.c?rev=13067&r1=13066&r2=13067&view=diff
==============================================================================
--- branches/inversion-recovery/maths_fns/inversion-recovery.c (original)
+++ branches/inversion-recovery/maths_fns/inversion-recovery.c Thu Jun 16
12:32:43 2011
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2006 Edward d'Auvergne
- * Copyright (C) 2011 Sebastien Morin
*
* This file is part of the program relax.
*
@@ -28,12 +27,12 @@
-void inversion-recovery(double *params, double *relax_times, double
*back_calc, int num_times) {
- /* Function to back calculate the peak intensities.
- */
+void exponential(double *params, double *relax_times, double *back_calc, int
num_times) {
+ /* Function to back calculate the peak intensities.
+ */
/* Declarations */
- double Rx, I0, Iinf;
+ double Rx, I0;
int i;
@@ -46,7 +45,7 @@
/* Back calculate */
else
- back_calc[i] = params[2] - (params[2] - params[1]) *
exp(-relax_times[i] * params[0]);
+ back_calc[i] = params[1] * exp(-relax_times[i] * params[0]);
}
}
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
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
--
Sébastien Morin, Ph.D.
Postdoctoral Fellow, S. Grzesiek NMR Laboratory
Department of Structural Biology
Biozentrum, Universität Basel
Klingelbergstrasse 70
4056 Basel
Switzerland
Re: r13067 - /branches/inversion-recovery/maths_fns/inversion-recovery.c