Changeset 38280 for trunk/psModules/src/objects/models/pmModel_QGAUSS.c

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

File:

• trunk/psModules/src/objects/models/pmModel_QGAUSS.c (modified) (2 diffs)

trunk/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -339 +339 @@
 
 // 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 +349 @@
     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);