Changeset 30772 for branches/eam_branches/ipp-20110213/psphot/src/psphotMagnitudes.c

Timestamp:

Mar 1, 2011, 6:21:28 PM (15 years ago)

Author:

eugene

Message:

fix threading for psphotStack; use standard PS_ARGUMENTS_ macros for ppSub, ppStack, pswarp, ppImage, psphotStack; fix FPA.EXPOSURE in ppImageAddNoise; fix accounting for psf bad and poor weights; added flags for substantial poor masks due to each poor mask bit type; fix the measurement of the fwhm in pmPSFtoFWHM

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotMagnitudes.c (modified) (4 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotMagnitudes.c

@@ -76 +76 @@
     maskVal |= markVal;
 
-    pmSourceMagnitudesInit (recipe);
+    pmSourceMagnitudesInit (config, recipe);
 
     // the binning details are saved on the analysis metadata
@@ -176 +176 @@
         psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, source->apRadius, "OR", markVal);
 
-        status = pmSourceMagnitudes (source, psf, photMode, maskVal, markVal);
+        status = pmSourceMagnitudes (source, psf, photMode, maskVal, markVal, source->apRadius);
         if (status && isfinite(source->apMag)) Nap ++;
 
@@ -295 +295 @@
     psArray *sources                = job->args->data[0];
     psImageMaskType maskVal         = PS_SCALAR_VALUE(job->args->data[1],PS_TYPE_IMAGE_MASK_DATA);
-    psImageMaskType markVal         = PS_SCALAR_VALUE(job->args->data[2],PS_TYPE_IMAGE_MASK_DATA);
 
     for (int i = 0; i < sources->n; i++) {
@@ -309 +308 @@
         }
 
-        status = pmSourcePixelWeight (&source->pixWeightNotBad, &source->pixWeightNotPoor, model, source->maskObj, maskVal, markVal);
+        status = pmSourcePixelWeight (source, model, source->maskObj, maskVal, source->apRadius);
         if (!status) {
           psTrace ("psphot", 3, "fail to measure pixel weight");