Changeset 17396 for trunk/psModules/src/objects/models

Timestamp:

Apr 8, 2008, 8:36:06 AM (18 years ago)

Author:

eugene

Message:

merging from eam_branch_20080324 : psphot work on extended source fitting and related I/O functions

Location:

trunk/psModules/src/objects/models

Files:

• pmModel_QGAUSS.c (modified) (2 diffs)
• pmModel_SERSIC.c (modified) (5 diffs)

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

@@ -237 +237 @@
     if (!isfinite(shape.sxy)) return false;
 
-    PAR[PM_PAR_SKY]  = moments->Sky;
-    PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
+    // XXX turn this off here for now PAR[PM_PAR_SKY]  = moments->Sky;
+    PAR[PM_PAR_SKY]  = 0.0;
+    PAR[PM_PAR_I0]   = moments->Peak;
     PAR[PM_PAR_XPOS] = peak->x;
     PAR[PM_PAR_YPOS] = peak->y;
@@ -457 +458 @@
 
     status = true;
-    status &= (dP < 0.5);
+//    status &= (dP < 0.5);
     status &= (PAR[PM_PAR_I0] > 0);
     status &= ((dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]) < 0.5);
+
+    fprintf (stderr, "QGAUSS status pars: dP: %f, I0: %f, S/N: %f\n",
+             dP, PAR[PM_PAR_I0], (dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]));
 
     return status;

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

@@ -19 +19 @@
 
    note that a standard sersic model uses exp(-K*(z^(1/n) - 1).  the additional elements (K,
-   the -1 offset) are absorbed in this model by the normalization, the exponenet, and the
+   the -1 offset) are absorbed in this model by the normalization, the exponent, and the
    radial scale.  We fit the elements in this form, then re-normalize them on output.
    *****************************************************************************/
@@ -157 +157 @@
             break;
         case PM_PAR_SXX:
-            params_min =   0.25;
+            params_min =   0.05;
             break;
         case PM_PAR_SYY:
-            params_min =   0.25;
+            params_min =   0.05;
             break;
         case PM_PAR_SXY:
@@ -166 +166 @@
             break;
         case PM_PAR_7:
-            params_min =   0.1;
+            params_min =   0.05;
             break;
         default:
@@ -247 +247 @@
     if (!isfinite(shape.sxy)) return false;
 
-    PAR[PM_PAR_SKY]  = moments->Sky;
-    PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
+    // XXX PAR[PM_PAR_SKY]  = moments->Sky;
+    PAR[PM_PAR_SKY]  = 0.0;
+    PAR[PM_PAR_I0]   = moments->Peak;
     PAR[PM_PAR_XPOS] = peak->x;
     PAR[PM_PAR_YPOS] = peak->y;
@@ -442 +443 @@
 
     status = true;
-    status &= (dP < 0.5);
+//    status &= (dP < 0.5);
     status &= (PAR[PM_PAR_I0] > 0);
     status &= ((dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]) < 0.5);
+
+    fprintf (stderr, "SERSIC status pars: dP: %f, I0: %f, S/N: %f\n",
+             dP, PAR[PM_PAR_I0], (dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]));
 
     return status;