Changeset 38280 for trunk/psModules/test/objects

Timestamp:

May 15, 2015, 1:56:42 PM (11 years ago)

Author:

eugene

Message:

fix interpolation of Sigma,Core -> FWHM in PS1_V1 and QGAUSS; test code to prove fix

Location:

trunk/psModules/test/objects

Files:

• Makefile.am (modified) (1 diff)
• tap_pmModel_SET_FWHM.c (added)
• tap_pmPeaks.c (modified) (3 diffs)

trunk/psModules/test/objects/Makefile.am

@@ -21 +21 @@
         tap_pmModel_CentralPixel \
         tap_pmModel_CentralPixel_v2 \
+        tap_pmModel_SET_FWHM \
         tap_pmPSF \
         tap_pmTrend2D \

trunk/psModules/test/objects/tap_pmPeaks.c

@@ -218 +218 @@
                 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 +225 @@
                 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 +260 @@
         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");