Index: trunk/psModules/test/objects/Makefile.am
===================================================================
--- trunk/psModules/test/objects/Makefile.am	(revision 36085)
+++ 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 36085)
+++ 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");