Changeset 36123 for trunk/psModules

Timestamp:

Sep 17, 2013, 11:42:14 AM (13 years ago)

Author:

eugene

Message:

dump psf star info if we fail to get a fit

Location:

trunk/psModules/src/objects

Files:

• pmPSFtryFitPSF.c (modified) (2 diffs)
• pmPSFtryModel.c (modified) (1 diff)

trunk/psModules/src/objects/pmPSFtryFitPSF.c

@@ -118 +118 @@
     psfTry->psf->nPSFstars = Npsf;
 
-    // DEBUG code: save the PSF model fit data in detail
-# ifdef DEBUG
-
-    char filename[64];
-    snprintf (filename, 64, "psffit.%dx%d.dat", psfTry->psf->trendNx, psfTry->psf->trendNy);
-    FILE *f = fopen (filename, "w");
-    psAssert (f, "failed open");
-
-    for (int i = 0; i < psfTry->sources->n; i++) {
-
-        // skip masked sources
-        if (psfTry->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PSFTRY_MASK_ALL) continue;
-
-        pmSource *source = psfTry->sources->data[i];
-
-        fprintf (f, "%6.1f %6.1f : %6.1f %6.1f : %8.3f %8.3f %8.3f : %f : %f %f %f : %f\n",
-                 source->peak->xf, source->peak->yf, 
-                 source->modelPSF->params->data.F32[PM_PAR_XPOS], source->modelPSF->params->data.F32[PM_PAR_YPOS], 
-                 source->psfMag, source->apMag, source->psfMagErr,
-                 source->modelPSF->params->data.F32[PM_PAR_I0], 
-                 source->modelPSF->params->data.F32[PM_PAR_SXX], source->modelPSF->params->data.F32[PM_PAR_SXY], 
-                 source->modelPSF->params->data.F32[PM_PAR_SYY], source->modelPSF->params->data.F32[PM_PAR_7]);
-    }
-    fclose (f);
-# endif
-
     pmSourceVisualShowModelFits (psfTry->psf, psfTry->sources, maskVal);
 
@@ -150 +124 @@
 
     if (Npsf == 0) {
-        psError(PS_ERR_UNKNOWN, false, "No sources with good PSF fits after model is built.");
-        return false;
+        // DEBUG code: save the PSF model fit data in detail
+
+        char hostname[256];
+        gethostname (hostname, 256);
+
+        int pid = getpid();
+
+        char filename[64];
+        snprintf (filename, 64, "psffit.%s.%d.%dx%d.dat", hostname, pid, psfTry->psf->trendNx, psfTry->psf->trendNy);
+        FILE *f = fopen (filename, "w");
+        psAssert (f, "failed open");
+
+        for (int i = 0; i < psfTry->sources->n; i++) {
+
+            // skip masked sources
+          // if (psfTry->mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & PSFTRY_MASK_ALL) continue;
+
+            pmSource *source = psfTry->sources->data[i];
+
+            float par7 = (source->modelPSF->params->n == 7) ? -100 : source->modelPSF->params->data.F32[PM_PAR_7];
+            fprintf (f, "%6.1f %6.1f : %6.1f %6.1f : %8.3f %8.3f %8.3f : %f : %f %f %f : %f %d\n",
+                     source->peak->xf, source->peak->yf, 
+                     source->modelPSF->params->data.F32[PM_PAR_XPOS], source->modelPSF->params->data.F32[PM_PAR_YPOS], 
+                     source->psfMag, source->apMag, source->psfMagErr,
+                     source->modelPSF->params->data.F32[PM_PAR_I0], 
+                     source->modelPSF->params->data.F32[PM_PAR_SXX], source->modelPSF->params->data.F32[PM_PAR_SXY], 
+                     source->modelPSF->params->data.F32[PM_PAR_SYY], par7,
+                     psfTry->mask->data.PS_TYPE_VECTOR_MASK_DATA[i]);
+        }
+        fclose (f);
+
+        psError(PS_ERR_UNKNOWN, false, "No sources with good PSF fits after model is built.");
+        return false;
     }
 

trunk/psModules/src/objects/pmPSFtryModel.c

@@ -236 +236 @@
     // linear clipped fit of chisq trend vs flux
     if (options->chiFluxTrend) {
+
+        if (0) {
+            FILE *f = fopen ("test.psf.dat", "w");
+            int fd = fileno (f);
+            p_psVectorPrint (fd, flux, "flux");
+            p_psVectorPrint (fd, chisq, "chisq");
+            p_psVectorPrint (fd, mask, "mask");
+            fclose (f);
+        }
+
         bool result = psVectorClipFitPolynomial1D(psfTry->psf->ChiTrend, options->stats,
                                                   mask, 0xff, chisq, NULL, flux);