Changeset 31606 for branches/czw_branch/20110406/psphot/src/psphotMagnitudes.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotMagnitudes.c (modified) (4 diffs)

branches/czw_branch/20110406/psphot/src/psphotMagnitudes.c

@@ -167 +167 @@
         pmSource *source = (pmSource *) sources->data[i];
 
+        bool saveTest = false;
+        psImage *testImage = NULL;
+# if (0)
+        if ((fabs(source->peak->xf-3518) < 5) && (fabs(source->peak->yf-3178) < 5)) {
+            saveTest = true;
+            psRegion subregion = psRegionSet (source->peak->xf - 200, source->peak->xf + 200, source->peak->yf - 200, source->peak->yf + 200);
+            testImage = psImageSubset ((psImage *) source->pixels->parent, subregion);
+        }
+# endif
+
+        if (saveTest) {
+            psphotSaveImage(NULL, testImage, "test.image.1.fits");
+        }
+
         // replace object in image
         if (source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED) {
@@ -172 +186 @@
         }
 
+        if (saveTest) {
+            psphotSaveImage(NULL, testImage, "test.image.2.fits");
+        }
+
+        float xPos = source->peak->xf;
+        float yPos = source->peak->yf;
+
+        pmModel *model = source->modelPSF;
+        if (model) {
+            xPos = model->params->data.F32[PM_PAR_XPOS];
+            yPos = model->params->data.F32[PM_PAR_YPOS];
+        } else {
+            bool useMoments = pmSourcePositionUseMoments(source);
+            if (useMoments) {
+                xPos = source->moments->Mx;
+                yPos = source->moments->My;
+            }
+        }
+
         // clear the mask bit and set the circular mask pixels
         psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal));
-        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, source->apRadius, "OR", markVal);
+        psImageKeepCircle (source->maskObj, xPos, yPos, source->apRadius, "OR", markVal);
 
         status = pmSourceMagnitudes (source, psf, photMode, maskVal, markVal, source->apRadius);
-        if (status && isfinite(source->apMag)) Nap ++;
+        if (status && isfinite(source->apFlux)) {
+            Nap ++;
+        } else {
+            fprintf (stderr, "failed to measure mag for source @ %f,%f\n", source->peak->xf, source->peak->yf);
+        }
 
         // clear the mask bit
@@ -185 +222 @@
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
 
+        if (saveTest) {
+            psphotSaveImage(NULL, testImage, "test.image.3.fits");
+        }
+
         if (backModel) {
             psAssert (binning, "if backModel is defined, so should binning be");
-            source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, backModel->image, binning);
+            source->sky = psImageUnbinPixel(xPos, yPos, backModel->image, binning);
             if (isnan(source->sky) && false) {
                 psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "error setting pmSource.sky");
@@ -197 +238 @@
         if (backStdev) {
             psAssert (binning, "if backStdev is defined, so should binning be");
-            source->skyErr = psImageUnbinPixel(source->peak->x, source->peak->y, backStdev->image, binning);
+            source->skyErr = psImageUnbinPixel(xPos, yPos, backStdev->image, binning);
             if (isnan(source->skyErr) && false) {
                 psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "error setting pmSource.skyErr");