Changeset 36311

Timestamp:

Nov 25, 2013, 11:51:42 AM (13 years ago)

Author:

eugene

Message:

new fitting tests

Location:

branches/eam_branches/ipp-20130904

Files:

• psModules/src/objects/pmPCM_MinimizeChisq.c (modified) (1 diff)
• psphot/src/psphotExtendedSourceFits.c (modified) (1 diff)
• psphot/src/psphotSourceFits.c (modified) (4 diffs)
• psphot/test/tap_psphot_galaxygrid.pro (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmPCM_MinimizeChisq.c

@@ -135 +135 @@
         }
 
-        if (0) {
-            fprintf (stderr, "%d : \n", min->iter);
+        if (1) {
+            fprintf (stderr, "%d : ", min->iter);
             for (int ti = 0; ti < params->n; ti++) {
                 fprintf (stderr, "%f  ", params->data.F32[ti]);
             }
-            fprintf (stderr, "\n");
+            fprintf (stderr, " : %f\n", min->value);
         }
 

branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c

@@ -315 +315 @@
 
 // XXX TEST 
-            if (!isInteractive) {
+            if (false && !isInteractive) {
                 if (!psThreadJobAddPending(job)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");

branches/eam_branches/ipp-20130904/psphot/src/psphotSourceFits.c

@@ -21 +21 @@
 
 bool psphotPCMfitCheckSize (pmPCMdata *pcm, pmSource *source, psImageMaskType maskVal, float psfSize);
+bool psphotPCMfitRetry (pmPCMdata *pcm, pmSource *source, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal, float psfSize);
 
 bool psphotFitInit (int nThreads) {
@@ -652 +653 @@
     if (TIMING) { t4 = psTimerMark ("psphotFitPCM"); }
 
-    psphotPCMfitCheckSize (pcm, source, maskVal, psfSize);
+    if (pcm->modelConv->nIter == fitOptions->nIter) {
+        psphotPCMfitRetry (pcm, source, &options, maskVal, markVal, psfSize);
+    }
+    // psphotPCMfitCheckSize (pcm, source, maskVal, psfSize);
     if (TIMING) { t5 = psTimerMark ("psphotFitPCM"); }
 
@@ -1325 +1329 @@
             rMin = dref;
         }
-        // fprintf (stderr, "%d | %f %f %f | %f %f %f\n", j, dref, Io, Chisq, rMin, iMin, xMin);
+        fprintf (stderr, "%d | %f %f %f | %f %f %f\n", j, dref, Io, Chisq, rMin, iMin, xMin);
     }
 
@@ -1344 +1348 @@
 }
 
+// we have an initial fit, check to see if the current size is besst
+bool psphotPCMfitRetry (pmPCMdata *pcm, pmSource *source, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal, float psfSize) {
+
+    // PAR is already at my current best guess
+    psF32 *PAR = pcm->modelConv->params->data.F32;
+
+    // store best guess as a shape
+    psEllipseAxes centerAxes;
+    pmModelParamsToAxes (&centerAxes, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], true);
+
+    // retry with axes smaller by 1 pixel
+    psEllipseAxes guessAxes;
+    guessAxes.major = centerAxes.major - 0.08;
+    guessAxes.minor = guessAxes.major * centerAxes.minor / centerAxes.major;
+    guessAxes.theta = centerAxes.theta;
+
+    if (!isfinite(guessAxes.major)) return false;
+    if (!isfinite(guessAxes.minor)) return false;
+    if (!isfinite(guessAxes.theta)) return false;
+
+    // convert the major,minor,theta to shape parameters for an Reff-like model
+    pmModelAxesToParams (&PAR[PM_PAR_SXX], &PAR[PM_PAR_SXY], &PAR[PM_PAR_SYY], guessAxes, true);
+
+    // generated the modelFlux
+    pmPCMMakeModel (source, pcm->modelConv, maskVal, psfSize);
+        
+    float YY = 0.0;
+    float YM = 0.0;
+    float MM = 0.0;
+    bool usePoisson = false;
+
+    for (int iy = 0; iy < source->pixels->numRows; iy++) {
+        for (int ix = 0; ix < source->pixels->numCols; ix++) {
+            // skip masked points
+            if (source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix]) {
+                continue;
+            }
+            // skip zero-variance points
+            if (source->variance->data.F32[iy][ix] == 0) {
+                continue;
+            }
+            // skip nan value points
+            if (!isfinite(source->pixels->data.F32[iy][ix])) {
+                continue;
+            }
+
+            float fy = source->pixels->data.F32[iy][ix];
+            float fm = source->modelFlux->data.F32[iy][ix];
+            float wt = (usePoisson) ? 1.0 / source->variance->data.F32[iy][ix] : 1.0;
+
+            YY += PS_SQR(fy) * wt;
+            YM += fm * fy * wt;
+            MM += PS_SQR(fm) * wt;
+        }
+    }
+
+    float Io = YM / MM;
+    PAR[PM_PAR_I0] = Io;
+
+    pmSourceFitPCM (pcm, source, fitOptions, maskVal, markVal, psfSize);  // NOTE : 1687 allocs in here
+
+    return true;
+}
+
+

branches/eam_branches/ipp-20130904/psphot/test/tap_psphot_galaxygrid.pro

@@ -1278 +1278 @@
     foreach radius 1.0 1.5 2.0 2.5 3.0 4.0 6.0 8.0
       # mkexp.devexp.single tests.20131120/testrad.ps1v1.exp.$Nrun EXP $radius 1.0
-      fitexp tests.20131120/testrad.ps1v1.exp.$Nrun tests.20131120/testrad.ps1v1.exp.$Nrun.t4s EXP_CONV
+      fitexp tests.20131120/testrad.ps1v1.exp.$Nrun tests.20131120/testrad.ps1v1.exp.$Nrun.t4p EXP_CONV
       $Nrun ++
     end
@@ -1285 +1285 @@
   $Nrun = 0
   foreach radius 1.0 1.5 2.0 2.5 3.0 4.0 6.0 8.0
-    cmf.load.concat tests.20131120/testrad.ps1v1.exp.$Nrun.dat tests.20131120/testrad.ps1v1.exp.$Nrun.t4s.cmf EXP
+    cmf.load.concat tests.20131120/testrad.ps1v1.exp.$Nrun.dat tests.20131120/testrad.ps1v1.exp.$Nrun.t4p.cmf EXP
     set dM_m = Mot_m - Min_m
     vstat -q dM_m