Index: trunk/psModules/configure.ac
===================================================================
--- trunk/psModules/configure.ac	(revision 38232)
+++ trunk/psModules/configure.ac	(revision 38280)
@@ -7,5 +7,5 @@
 AC_CONFIG_SUBDIRS([test/tap])
 
-AM_INIT_AUTOMAKE([1.7 foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.7 foreign dist-bzip2 subdir-objects])
 AM_CONFIG_HEADER([src/config.h])
 AM_MAINTAINER_MODE
Index: trunk/psModules/src/objects/models/fwhm.sh
===================================================================
--- trunk/psModules/src/objects/models/fwhm.sh	(revision 38232)
+++ trunk/psModules/src/objects/models/fwhm.sh	(revision 38280)
@@ -110,5 +110,5 @@
     $Zhm = 1.0
     $FWHM = 2*sqrt(2)
-    echo $K : $Zhm : $FWHM
+    fprintf "%4.2f, // %4.1f, %4.2f" $FWHM $K $Zhm 
     return
   end
@@ -121,27 +121,36 @@
   
   set f = $K*z + z^1.667 - 1.0
-  set dfdz = $K + z^0.667
+  set dfdz = $K + 1.677*z^0.667
 
   #lim -n 0 z f; clear; box; plot z f
   #lim -n 1 z dfdz; clear; box; plot z dfdz  
 
-  $nZ0 = 0
-  $nZ1 = 5 / $dz
-
-  $Zg = 0.5*(z[$nZ0] + z[$nZ1])  
-  $nZg = int($Zg / $dz)
-  $dZ = 1.0
-
-  for i 0 10
-    $Fg = f[$nZg]
-    $dFdz_g = dfdz[$nZg]
-
-    $dZ = $Fg / $dFdz_g
-
-    # echo $Zg $Fg $dZ $dFdz_g
-
-    $Zg -= $dZ
-    $Zg = max ($Zg , 0)
-    $nZg = int($Zg / $dz)
+  # these just need to bound the solution
+  $nZ0 = 0.5 / $dz
+  $nZ1 = 5.0 / $dz
+
+  $Zg = 0.5*(z[$nZ0] + z[$nZ1])  
+  $nZg = int($Zg / $dz)
+  $dZ = 1.0
+
+  for i 0 10
+    # interpolate between $nZg and $nZg + 1
+    $Fg = f[$nZg] + ($Zg - $nZg*$dz)*(f[$nZg+1] - f[$nZg])/$dz
+    $dFdz_g = dfdz[$nZg] + ($Zg - $nZg*$dz)*(dfdz[$nZg+1] - dfdz[$nZg])/$dz
+
+    # $Fg = f[$nZg]
+    # $dFdz_g = dfdz[$nZg]
+
+    $dZ = $Fg / $dFdz_g
+
+    # echo -no-return $Zg $Fg $dZ $dFdz_g
+
+    $Zg -= $dZ
+
+    $Zg = max ($Zg , 0)
+    $Zg = min ($Zg , z[-2])
+    $nZg = int($Zg / $dz)
+    
+    # echo ": $Zg $nZg"
   end 
   # echo $Zg $Fg $dZ $dFdz_g
@@ -149,5 +158,5 @@
   $FWHM = 2*sqrt(2*$Zg)
 
-  echo $K : $Zhm : $FWHM
+  fprintf "%4.2f, // %4.1f, %4.2f" $FWHM $K $Zhm 
 end
 
@@ -164,5 +173,5 @@
     $Zhm = 1.0
     $FWHM = 2*sqrt(2)
-    echo $K : $Zhm : $FWHM
+    fprintf "%4.2f, // %4.1f, %4.2f" $FWHM $K $Zhm 
     return
   end
@@ -175,5 +184,5 @@
   
   set f = $K*z + z^2.25 - 1.0
-  set dfdz = $K + z^1.25
+  set dfdz = $K + 2.25*z^1.25
 
   #lim -n 0 z f; clear; box; plot z f
@@ -188,6 +197,10 @@
 
   for i 0 10
-    $Fg = f[$nZg]
-    $dFdz_g = dfdz[$nZg]
+    # interpolate between $nZg and $nZg + 1
+    $Fg = f[$nZg] + ($Zg - $nZg*$dz)*(f[$nZg+1] - f[$nZg])/$dz
+    $dFdz_g = dfdz[$nZg] + ($Zg - $nZg*$dz)*(dfdz[$nZg+1] - dfdz[$nZg])/$dz
+
+    # $Fg = f[$nZg]
+    # $dFdz_g = dfdz[$nZg]
 
     $dZ = $Fg / $dFdz_g
@@ -197,4 +210,5 @@
     $Zg -= $dZ
     $Zg = max ($Zg , 0)
+    $Zg = min ($Zg , z[-2])
     $nZg = int($Zg / $dz)
   end 
@@ -203,16 +217,38 @@
   $FWHM = 2*sqrt(2*$Zg)
 
-  echo $K : $Zhm : $FWHM
+  fprintf "%4.2f, // %4.1f, %4.2f" $FWHM $K $Zhm 
 end
 
 macro fwhm.trend
+  if ($0 != 4)
+    echo "USAGE: fwhm.trend (model) (struct) (output)"
+    echo "  model: pgauss, rgauss, ps1v1, qgauss"
+    break
+  end
 
   delete fwhm_v k_v
 
-  for k 0 20 1.0
-    find.fwhm.qgauss $k
+  $SAVE = 0
+  if ($SAVE) exec rm -f $3
+  if ($SAVE) output $3
+
+  $minK = -1
+  $maxK = 20
+  $delK = 0.2
+
+  if ($SAVE) echo "# define FWHM_BIN $delK"
+  if ($SAVE) echo "# define MIN_FWHM_BIN $minK"
+  if ($SAVE) echo "# define N_FWHM_BIN {int(($maxK - $minK) / $delK) + 1}"
+  if ($SAVE) echo "static float $2[] = \{"
+
+  for k $minK $maxK $delK -incl
+    find.fwhm.$1 $k
     concat $k k_v
     concat $FWHM fwhm_v
   end
-end
-
+  if ($SAVE) echo "\}@"
+  if ($SAVE) output stdout
+
+  lim k_v fwhm_v; clear; box; plot k_v fwhm_v -pt 10 -sz 1.0
+end
+
Index: trunk/psModules/src/objects/models/pmModel_PS1_V1.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_PS1_V1.c	(revision 38232)
+++ trunk/psModules/src/objects/models/pmModel_PS1_V1.c	(revision 38280)
@@ -337,30 +337,6 @@
 }
 
-// I used the script in models/fwhm.sh to generate the trend of FWHM scaling vs the K value
-// FWHM = Scale * Sigma (not that PAR[PM_PAR_SXX] = sigma * sqrt(2)
-//  K : z_hm  : FWHM
-//  0 : 1.000 : 2.83
-//  1 : 0.597 : 2.19
-//  2 : 0.396 : 1.78
-//  3 : 0.291 : 1.53
-//  4 : 0.232 : 1.36
-//  5 : 0.198 : 1.26
-//  6 : 0.169 : 1.16
-//  7 : 0.142 : 1.07
-//  8 : 0.124 : 0.99
-//  9 : 0.118 : 0.97
-// 10 : 0.106 : 0.92
-// 11 : 0.092 : 0.86
-// 12 : 0.091 : 0.85
-// 13 : 0.080 : 0.80
-// 14 : 0.078 : 0.79
-// 15 : 0.073 : 0.76
-// 16 : 0.063 : 0.71
-// 17 : 0.068 : 0.74
-// 18 : 0.056 : 0.67
-// 19 : 0.058 : 0.68
-
-// static float PS1_V1_Core[] = { 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0};
-static float PS1_V1_Scale[] = {2.83, 2.19, 1.78, 1.53, 1.36, 1.26, 1.16, 1.07, 0.99, 0.97, 0.92, 0.86, 0.85, 0.80, 0.79, 0.76, 0.71, 0.74, 0.67, 0.68};
+// I used the script in models/fwhm.sh to generate the trend of FWHM scaling vs the K value:
+# include "ps1v1.fwhm.h"
 
 psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) {
@@ -372,13 +348,10 @@
     if (!isfinite(core)) return (2.0*M_SQRT2*sigma);
 
-    // if PS1_V1_Core is defined as a set of integer steps, so we can simplify:
-    int binCore = MAX(0, MIN (19, (int)core));
-
-    float scale = NAN;
-    if (binCore == 0) {
-	scale = (core - binCore + 0) * (PS1_V1_Scale[binCore + 1] - PS1_V1_Scale[binCore + 0]) + PS1_V1_Scale[binCore + 0];
-    } else {
-	scale = (core - binCore - 1) * (PS1_V1_Scale[binCore + 0] - PS1_V1_Scale[binCore - 1]) + PS1_V1_Scale[binCore - 1];
-    }
+    int binCore = MAX(0, MIN (N_FWHM_BIN - 2, (int)((core - MIN_FWHM_BIN)/FWHM_BIN)));
+    float coreBin = binCore * FWHM_BIN + MIN_FWHM_BIN;
+
+    float scale = (core - coreBin) * (PS1_V1_Scale[binCore + 1] - PS1_V1_Scale[binCore]) / FWHM_BIN + PS1_V1_Scale[binCore];
+
+    // fprintf (stderr, "core: %f, binCore: %d, scale: %f\n", core, binCore, scale);
 
     return (scale * sigma);
Index: trunk/psModules/src/objects/models/pmModel_QGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 38232)
+++ trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 38280)
@@ -339,29 +339,5 @@
 
 // I used the script in models/fwhm.sh to generate the trend of FWHM scaling vs the K value
-// FWHM = Scale * Sigma (not that PAR[PM_PAR_SXX] = sigma * sqrt(2)
-//  K : z_hm  : FWHM
-//  0 : 1.000 : 2.83
-//  1 : 0.648 : 2.28
-//  2 : 0.430 : 1.85
-//  3 : 0.310 : 1.58
-//  4 : 0.244 : 1.40
-//  5 : 0.200 : 1.26
-//  6 : 0.165 : 1.15
-//  7 : 0.149 : 1.09
-//  8 : 0.125 : 1.00
-//  9 : 0.116 : 0.96
-// 10 : 0.101 : 0.90
-// 11 : 0.095 : 0.87
-// 12 : 0.083 : 0.82
-// 13 : 0.082 : 0.81
-// 14 : 0.080 : 0.80
-// 15 : 0.074 : 0.77
-// 16 : 0.064 : 0.71
-// 17 : 0.068 : 0.74
-// 18 : 0.057 : 0.67
-// 19 : 0.058 : 0.68
-
-// static float QGAUSS_Core[] = { 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0};
-static float QGAUSS_Scale[] = {2.83, 2.28, 1.85, 1.58, 1.40, 1.26, 1.15, 1.09, 1.00, 0.96, 0.90, 0.87, 0.82, 0.81, 0.80, 0.77, 0.71, 0.74, 0.67, 0.68};
+# include "qgauss.fwhm.h"
 
 psF64 PM_MODEL_SET_FWHM (const psVector *params, psF64 sigma) {
@@ -373,13 +349,8 @@
     if (!isfinite(core)) return (2.0*M_SQRT2*sigma);
 
-    // QGAUSS_Core is defined as a set of integer steps, so we can simplify:
-    int binCore = MAX(0, MIN (19, (int)core));
-
-    float scale = NAN;
-    if (binCore == 0) {
-	scale = (core - binCore + 0) * (QGAUSS_Scale[binCore + 1] - QGAUSS_Scale[binCore + 0]) + QGAUSS_Scale[binCore + 0];
-    } else {
-	scale = (core - binCore - 1) * (QGAUSS_Scale[binCore + 0] - QGAUSS_Scale[binCore - 1]) + QGAUSS_Scale[binCore - 1];
-    }
+    int binCore = MAX(0, MIN (N_FWHM_BIN - 2, (int)((core - MIN_FWHM_BIN)/FWHM_BIN)));
+    float coreBin = binCore * FWHM_BIN + MIN_FWHM_BIN;
+
+    float scale = (core - coreBin) * (QGAUSS_Scale[binCore + 1] - QGAUSS_Scale[binCore]) / FWHM_BIN + QGAUSS_Scale[binCore];
 
     return (scale * sigma);
Index: trunk/psModules/src/objects/models/ps1v1.fwhm.h
===================================================================
--- trunk/psModules/src/objects/models/ps1v1.fwhm.h	(revision 38280)
+++ trunk/psModules/src/objects/models/ps1v1.fwhm.h	(revision 38280)
@@ -0,0 +1,111 @@
+# define FWHM_BIN 0.2
+# define MIN_FWHM_BIN -1
+# define N_FWHM_BIN 106
+static float PS1_V1_Scale[] = {
+3.89, // -1.0, 1.89
+3.64, // -0.8, 1.66
+3.42, // -0.6, 1.46
+3.20, // -0.4, 1.28
+3.01, // -0.2, 1.13
+2.83, //  0.0, 1.00
+2.67, //  0.2, 0.89
+2.52, //  0.4, 0.79
+2.39, //  0.6, 0.71
+2.27, //  0.8, 0.65
+2.17, //  1.0, 0.59
+2.07, //  1.2, 0.54
+1.99, //  1.4, 0.49
+1.91, //  1.6, 0.46
+1.84, //  1.8, 0.42
+1.78, //  2.0, 0.39
+1.72, //  2.2, 0.37
+1.66, //  2.4, 0.35
+1.61, //  2.6, 0.33
+1.57, //  2.8, 0.31
+1.53, //  3.0, 0.29
+1.49, //  3.2, 0.28
+1.45, //  3.4, 0.26
+1.41, //  3.6, 0.25
+1.38, //  3.8, 0.24
+1.35, //  4.0, 0.23
+1.32, //  4.2, 0.22
+1.30, //  4.4, 0.21
+1.27, //  4.6, 0.20
+1.25, //  4.8, 0.19
+1.23, //  5.0, 0.19
+1.20, //  5.2, 0.18
+1.18, //  5.4, 0.18
+1.16, //  5.6, 0.17
+1.15, //  5.8, 0.16
+1.13, //  6.0, 0.16
+1.11, //  6.2, 0.15
+1.09, //  6.4, 0.15
+1.08, //  6.6, 0.15
+1.06, //  6.8, 0.14
+1.05, //  7.0, 0.14
+1.04, //  7.2, 0.13
+1.02, //  7.4, 0.13
+1.01, //  7.6, 0.13
+1.00, //  7.8, 0.12
+0.99, //  8.0, 0.12
+0.97, //  8.2, 0.12
+0.96, //  8.4, 0.12
+0.95, //  8.6, 0.11
+0.94, //  8.8, 0.11
+0.93, //  9.0, 0.11
+0.92, //  9.2, 0.11
+0.91, //  9.4, 0.10
+0.90, //  9.6, 0.10
+0.89, //  9.8, 0.10
+0.89, // 10.0, 0.10
+0.88, // 10.2, 0.10
+0.87, // 10.4, 0.09
+0.86, // 10.6, 0.09
+0.85, // 10.8, 0.09
+0.85, // 11.0, 0.09
+0.84, // 11.2, 0.09
+0.83, // 11.4, 0.09
+0.82, // 11.6, 0.08
+0.82, // 11.8, 0.08
+0.81, // 12.0, 0.08
+0.80, // 12.2, 0.08
+0.80, // 12.4, 0.08
+0.79, // 12.6, 0.08
+0.79, // 12.8, 0.08
+0.78, // 13.0, 0.08
+0.77, // 13.2, 0.07
+0.77, // 13.4, 0.07
+0.76, // 13.6, 0.07
+0.76, // 13.8, 0.07
+0.75, // 14.0, 0.07
+0.75, // 14.2, 0.07
+0.74, // 14.4, 0.07
+0.74, // 14.6, 0.07
+0.73, // 14.8, 0.07
+0.73, // 15.0, 0.07
+0.72, // 15.2, 0.07
+0.72, // 15.4, 0.06
+0.71, // 15.6, 0.06
+0.71, // 15.8, 0.06
+0.70, // 16.0, 0.06
+0.70, // 16.2, 0.06
+0.70, // 16.4, 0.06
+0.69, // 16.6, 0.06
+0.69, // 16.8, 0.06
+0.68, // 17.0, 0.06
+0.68, // 17.2, 0.06
+0.68, // 17.4, 0.06
+0.67, // 17.6, 0.06
+0.67, // 17.8, 0.06
+0.66, // 18.0, 0.06
+0.66, // 18.2, 0.05
+0.66, // 18.4, 0.05
+0.65, // 18.6, 0.05
+0.65, // 18.8, 0.05
+0.65, // 19.0, 0.05
+0.64, // 19.2, 0.05
+0.64, // 19.4, 0.05
+0.64, // 19.6, 0.05
+0.63, // 19.8, 0.05
+0.63, // 20.0, 0.05
+};
Index: trunk/psModules/src/objects/models/qgauss.fwhm.h
===================================================================
--- trunk/psModules/src/objects/models/qgauss.fwhm.h	(revision 38280)
+++ trunk/psModules/src/objects/models/qgauss.fwhm.h	(revision 38280)
@@ -0,0 +1,111 @@
+# define FWHM_BIN 0.2
+# define MIN_FWHM_BIN -1
+# define N_FWHM_BIN 106
+static float QGAUSS_Scale[] = {
+3.47, // -1.0, 1.50
+3.34, // -0.8, 1.40
+3.21, // -0.6, 1.29
+3.08, // -0.4, 1.19
+2.96, // -0.2, 1.09
+2.83, //  0.0, 1.00
+2.70, //  0.2, 0.91
+2.58, //  0.4, 0.83
+2.47, //  0.6, 0.76
+2.36, //  0.8, 0.70
+2.26, //  1.0, 0.64
+2.16, //  1.2, 0.58
+2.07, //  1.4, 0.54
+1.99, //  1.6, 0.50
+1.92, //  1.8, 0.46
+1.85, //  2.0, 0.43
+1.78, //  2.2, 0.40
+1.72, //  2.4, 0.37
+1.67, //  2.6, 0.35
+1.62, //  2.8, 0.33
+1.57, //  3.0, 0.31
+1.53, //  3.2, 0.29
+1.49, //  3.4, 0.28
+1.45, //  3.6, 0.26
+1.42, //  3.8, 0.25
+1.39, //  4.0, 0.24
+1.35, //  4.2, 0.23
+1.33, //  4.4, 0.22
+1.30, //  4.6, 0.21
+1.27, //  4.8, 0.20
+1.25, //  5.0, 0.19
+1.23, //  5.2, 0.19
+1.20, //  5.4, 0.18
+1.18, //  5.6, 0.18
+1.16, //  5.8, 0.17
+1.14, //  6.0, 0.16
+1.13, //  6.2, 0.16
+1.11, //  6.4, 0.15
+1.09, //  6.6, 0.15
+1.08, //  6.8, 0.15
+1.06, //  7.0, 0.14
+1.05, //  7.2, 0.14
+1.03, //  7.4, 0.13
+1.02, //  7.6, 0.13
+1.01, //  7.8, 0.13
+1.00, //  8.0, 0.12
+0.98, //  8.2, 0.12
+0.97, //  8.4, 0.12
+0.96, //  8.6, 0.12
+0.95, //  8.8, 0.11
+0.94, //  9.0, 0.11
+0.93, //  9.2, 0.11
+0.92, //  9.4, 0.11
+0.91, //  9.6, 0.10
+0.90, //  9.8, 0.10
+0.89, // 10.0, 0.10
+0.88, // 10.2, 0.10
+0.87, // 10.4, 0.10
+0.87, // 10.6, 0.09
+0.86, // 10.8, 0.09
+0.85, // 11.0, 0.09
+0.84, // 11.2, 0.09
+0.84, // 11.4, 0.09
+0.83, // 11.6, 0.09
+0.82, // 11.8, 0.08
+0.81, // 12.0, 0.08
+0.81, // 12.2, 0.08
+0.80, // 12.4, 0.08
+0.80, // 12.6, 0.08
+0.79, // 12.8, 0.08
+0.78, // 13.0, 0.08
+0.78, // 13.2, 0.08
+0.77, // 13.4, 0.07
+0.77, // 13.6, 0.07
+0.76, // 13.8, 0.07
+0.75, // 14.0, 0.07
+0.75, // 14.2, 0.07
+0.74, // 14.4, 0.07
+0.74, // 14.6, 0.07
+0.73, // 14.8, 0.07
+0.73, // 15.0, 0.07
+0.72, // 15.2, 0.07
+0.72, // 15.4, 0.06
+0.72, // 15.6, 0.06
+0.71, // 15.8, 0.06
+0.71, // 16.0, 0.06
+0.70, // 16.2, 0.06
+0.70, // 16.4, 0.06
+0.69, // 16.6, 0.06
+0.69, // 16.8, 0.06
+0.69, // 17.0, 0.06
+0.68, // 17.2, 0.06
+0.68, // 17.4, 0.06
+0.67, // 17.6, 0.06
+0.67, // 17.8, 0.06
+0.67, // 18.0, 0.06
+0.66, // 18.2, 0.05
+0.66, // 18.4, 0.05
+0.66, // 18.6, 0.05
+0.65, // 18.8, 0.05
+0.65, // 19.0, 0.05
+0.65, // 19.2, 0.05
+0.64, // 19.4, 0.05
+0.64, // 19.6, 0.05
+0.64, // 19.8, 0.05
+0.63, // 20.0, 0.05
+};
Index: trunk/psModules/test/objects/Makefile.am
===================================================================
--- trunk/psModules/test/objects/Makefile.am	(revision 38232)
+++ trunk/psModules/test/objects/Makefile.am	(revision 38280)
@@ -21,4 +21,5 @@
 	tap_pmModel_CentralPixel \
 	tap_pmModel_CentralPixel_v2 \
+	tap_pmModel_SET_FWHM \
 	tap_pmPSF \
 	tap_pmTrend2D \
Index: trunk/psModules/test/objects/tap_pmModel_SET_FWHM.c
===================================================================
--- trunk/psModules/test/objects/tap_pmModel_SET_FWHM.c	(revision 38280)
+++ trunk/psModules/test/objects/tap_pmModel_SET_FWHM.c	(revision 38280)
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <string.h>
+#include <pslib.h>
+#include <psmodules.h>
+#include "tap.h"
+#include "pstap.h"
+
+int main(int argc, char **argv) {
+
+  psLogSetFormat("HLNM");
+  psLogSetLevel(PS_LOG_INFO);
+  psTraceSetLevel("err", 5);
+  plan_tests(53);
+
+  // call pmModelAlloc() with acceptable input params
+  {
+    psMemId id = psMemGetId();
+    pmModelClassInit();
+    
+    pmModelType type = pmModelClassGetType ("PS_MODEL_PS1_V1");
+    ok(type == 3, "pmModelClassGetType returned the right value");
+    
+    pmModel *model = pmModelAlloc(type);
+    ok(model != NULL && psMemCheckModel(model), "pmModelAlloc() returned a non-NULL pmModel");
+
+    int nParams = pmModelClassParameterCount(type);
+    ok(model->params != NULL && model->params->n == nParams, "pmModelAlloc() set the pmModel->params psVector correctly");
+    ok(model->dparams != NULL && model->dparams->n == nParams, "pmModelAlloc() set the pmModel->dparams psVector correctly");
+
+    float core;
+    for (core = -1.33; core < 15.0; core += 0.33) {
+      model->params->data.F32[PM_PAR_7] = core;
+      float fwhm = model->class->modelSetFWHM(model->params, 1.0);
+      fprintf (stderr, "%f : %f\n", core, fwhm);
+    }
+    psFree(model);
+    pmModelClassCleanup();
+    ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+  }
+}
+
+
Index: trunk/psModules/test/objects/tap_pmPeaks.c
===================================================================
--- trunk/psModules/test/objects/tap_pmPeaks.c	(revision 38232)
+++ trunk/psModules/test/objects/tap_pmPeaks.c	(revision 38280)
@@ -218,5 +218,5 @@
                 if (!((tmpPeak->type & PM_PEAK_LONE) || (tmpPeak->type & PM_PEAK_EDGE))) {
                     diag("TEST ERROR: (0) peak at (%d, %d) (%f) ->type set improperly (0x%x).",
-                          tmpPeak->y, tmpPeak->x, tmpPeak->value, tmpPeak->type);
+                          tmpPeak->y, tmpPeak->x, tmpPeak->detValue, tmpPeak->type);
                     diag(" should be (0x%x or 0x%x).\n", PM_PEAK_LONE, PM_PEAK_EDGE);
                     testStatus = false;
@@ -225,10 +225,10 @@
                 if (tmpPeak->type != PM_PEAK_LONE) {
                     diag("TEST ERROR: (1) peak at (%d, %d) (%f) ->type set improperly (0x%x).\n",
-                           tmpPeak->y, tmpPeak->x, tmpPeak->value, tmpPeak->type);
+                           tmpPeak->y, tmpPeak->x, tmpPeak->detValue, tmpPeak->type);
                     diag(" should be (0x%x).\n", PM_PEAK_LONE);
                     testStatus = false;
                 }
             } else {
-                diag("TEST ERROR: Peak at (%d, %d) (%f)\n", tmpPeak->y, tmpPeak->x, tmpPeak->value);
+                diag("TEST ERROR: Peak at (%d, %d) (%f)\n", tmpPeak->y, tmpPeak->x, tmpPeak->detValue);
                 testStatus = false;
             }
@@ -260,5 +260,5 @@
         ok(tmpPeak->x == 1, "pmPeakAlloc() set pmPeak->x");
         ok(tmpPeak->y == 2, "pmPeakAlloc() set pmPeak->y");
-        ok(tmpPeak->value == 3.0, "pmPeakAlloc() set pmPeak->value");
+        ok(tmpPeak->detValue == 3.0, "pmPeakAlloc() set pmPeak->detValue");
         ok(tmpPeak->flux == 0, "pmPeakAlloc() pmPeak->flux");
         ok(tmpPeak->SN == 0, "pmPeakAlloc() pmPeak->SN");