Changeset 5828 for trunk/psphot/src/psphotApResid.c

Timestamp:

Dec 22, 2005, 4:20:27 PM (21 years ago)

Author:

eugene

Message:

various cleanups, fixes, additions...

File:

• trunk/psphot/src/psphotApResid.c (modified) (4 diffs)

trunk/psphot/src/psphotApResid.c

@@ -21 +21 @@
     psVector *rflux   = psVectorAlloc (300, PS_TYPE_F64);
     psVector *apResid = psVectorAlloc (300, PS_TYPE_F64);
-    mask->n = rflux->n = apResid->n = 0;
+    mask->n = xPos->n = yPos->n = rflux->n = apResid->n = 0;
     Npsf = 0;
 
@@ -43 +43 @@
 
         psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PSPHOT_MASK_MARKED);
-        // XXX EAM : add in source flux
         status = pmSourcePhotometry (&fitMag, &obsMag, model, source->pixels, source->mask);
         psImageKeepCircle (source->mask, x, y, RADIUS, "AND", ~PSPHOT_MASK_MARKED);
+
+        pmSourceSubModel (source->pixels, source->mask, model, false, false);
         if (!status) continue;
 
@@ -55 +56 @@
 
         psVectorExtend (mask, 100, 1);
+        psVectorExtend (xPos, 100, 1);
+        psVectorExtend (yPos, 100, 1);
         psVectorExtend (rflux, 100, 1);
         psVectorExtend (apResid, 100, 1);
         Npsf ++;
-
-        pmSourceSubModel (source->pixels, source->mask, model, false, false);
-        psMemCheckCorruption (true);
     }
+    psLogMsg ("psphot.apresid", 4, "measure aperture residuals : %f sec\n", psTimerMark ("psphot"));
 
     // 3hi/1lo sigma clipping on the rflux vs metric fit
@@ -70 +71 @@
 
     // linear clipped fit of apResid to rflux, xPos, yPos
-    psf->ApTrend  = psVectorClipFitPolynomial3D (psf->ApTrend, stats, mask, PSFTRY_MASK_ALL, apResid, NULL, rflux, xPos, yPos);
+    psf->ApTrend  = psVectorClipFitPolynomial3D (psf->ApTrend, stats, mask, PSFTRY_MASK_ALL, apResid, NULL, xPos, yPos, rflux);
     psf->skyBias  = psf->ApTrend->coeff[0][0][1] / (M_PI * PS_SQR(RADIUS));
     psf->ApResid  = psf->ApTrend->coeff[0][0][0];
     psf->dApResid = stats->sampleStdev;
+    psf->ApTrend->coeff[0][0][1] = 0;
 
-    psLogMsg ("ApResid", 4, "aperture residual: %f +/- %f : %f bias\n", psf->ApResid, psf->dApResid, psf->skyBias);
+    /*
+      (aprMag' - fitMag) = rflux*skyBias + ApTrend(x,y)
+      (aprMag - rflux*skyBias) - fitMag = ApTrend(x,y)
+      (aprMag - rflux*skyBias) = fitMag + ApTrend(x,y)
+    */
+
+    # if (0)
+    psPolynomial3D *poly = psf->ApTrend;
+    for (int nz = 0; nz <= poly->nZ; nz++) {
+        for (int ny = 0; ny <= poly->nY; ny++) {
+            for (int nx = 0; nx <= poly->nX; nx++) {
+                fprintf (stderr, "%d %d %d : %22.15g\n", nx, ny, nz, poly->coeff[nx][ny][nz]);
+            }
+        }
+    }
+    # endif
+
+    psLogMsg ("psphot.apresid", 3, "measure full-frame aperture residual: %f sec\n", psTimerMark ("psphot"));
+    psLogMsg ("psphot.apresid", 4, "aperture residual: %f +/- %f : %f bias\n", psf->ApResid, psf->dApResid, psf->skyBias);
 
     psFree (stats);