Changeset 34144 for branches/eam_branches/ipp-20120627/psModules/src/objects/models/pmModel_TRAIL.c

Timestamp:

Jul 13, 2012, 6:31:39 AM (14 years ago)

Author:

eugene

Message:

add special fit case for trails; update guess for trails; update cmf output to include trails and errors

File:

• branches/eam_branches/ipp-20120627/psModules/src/objects/models/pmModel_TRAIL.c (modified) (3 diffs)

branches/eam_branches/ipp-20120627/psModules/src/objects/models/pmModel_TRAIL.c

@@ -59 +59 @@
 
 // Lax parameter limits 
-static float paramsMinLax[] = { -1.0e3, 1.0e-2, -1.0e2, -1.0e2,  0.5, -0.1, -1.0 };
-static float paramsMaxLax[] = {  1.0e5, 1.0e+8, +1.0e4, +1.0e4, 50.0, +3.3 , 1.0 };
+static float paramsMinLax[] = { -1.0e3, 1.0e-2, -1.0e2, -1.0e2,  0.5, -3.3, -0.5 };
+static float paramsMaxLax[] = {  1.0e5, 1.0e+8, +1.0e4, +1.0e4, 50.0, +3.3 , 5.0 };
 
 // Moderate parameter limits
@@ -255 +255 @@
     if (!isfinite(axes.theta)) return false;
 
-    PAR[PM_PAR_LENGTH] = axes.major; // XXX major or 2*major?
-    PAR[PM_PAR_THETA] = axes.theta; // XXX theta or theta * RAD_DEG?
-    PAR[PM_PAR_SIGMA] = psfAxes.major; // XXX major or 0.5*major?
+    // axes.major is a sigma in the major direction; scale to 
+    PAR[PM_PAR_LENGTH] = 1.5*2.35*axes.major; // a tophat of length L has L = 1.5 * 2.35 * sigma
+    PAR[PM_PAR_THETA] = axes.theta; // theta in radians
+    PAR[PM_PAR_SIGMA] = psfAxes.major; // psf major axes (sigma of the psf)
 
     // set the model normalization
@@ -285 +286 @@
     psF32 *PAR = params->data.F32;
 
-    return (0.5*PAR[PM_PAR_LENGTH]);
+    // PAR_LENGTH is the unconvolved length.  add a bit for safety
+    return (0.5*PAR[PM_PAR_LENGTH] + 2);
 }