r13067 - /branches/inversion-recovery/maths_fns/inversion-recovery.c -- June 16, 2011 - 12:32

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]);
 
     }
 }