Changeset 32322 for branches/eam_branches/ipp-20110710/psphot/src/psphotRadialApertures.c

Timestamp:

Sep 5, 2011, 9:02:13 AM (15 years ago)

Author:

eugene

Message:

major re-work of psphotStackReadout to be more consistent with psphotReadout; psphotRadialApertures now assumes the 0 element is the unconvolved version; for the convolved versions, the vector of target psfs is saved as STACK.PSF.FWHM.VALUES

File:

• branches/eam_branches/ipp-20110710/psphot/src/psphotRadialApertures.c (modified) (11 diffs)

branches/eam_branches/ipp-20110710/psphot/src/psphotRadialApertures.c

@@ -3 +3 @@
 bool psphotRadialAperturesSortFlux (psVector *radius, psVector *pixFlux, psVector *pixVar);
 
+// this function measures the radial aperture fluxes for the set of readouts.  this function
+// may be called multiple times, presumably for different versions of PSF-matched or unmatched images.  
+
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotRadialApertures (pmConfig *config, const pmFPAview *view, const char *filerule)
+bool psphotRadialApertures (pmConfig *config, const pmFPAview *view, const char *filerule, int entry)
 {
     bool status = true;
+
+    fprintf (stdout, "\n");
+    psLogMsg ("psphot", PS_LOG_INFO, "--- psphot Radial Apertures ---");
 
     // select the appropriate recipe information
@@ -22 +28 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotRadialAperturesReadout (config, view, filerule, i, recipe)) {
+        if (!psphotRadialAperturesReadout (config, view, filerule, i, recipe, entry)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed on measure extended source aperture-like parameters for %s entry %d", filerule, i);
             return false;
@@ -32 +38 @@
 // aperture-like measurements for extended sources
 // flux in simple, circular apertures
-bool psphotRadialAperturesReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe) {
+// 'entry' tells us which of the matched-PSF images we are working on (0 == unmatched image, also non-stack psphot)
+bool psphotRadialAperturesReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe, int entry) {
 
     bool status;
@@ -72 +79 @@
     // XXX are we getting the objects out of order? does it matter?
     sources = psArraySort (sources, pmSourceSortByFlux);
+
+    // XXX make this consistent with entry 0 == unmatched
+    int nEntry = 1;
+    psVector *fwhmValues = psMetadataLookupVector(&status, readout->analysis, "STACK.PSF.FWHM.VALUES");
+    if (fwhmValues) {
+        psAssert (entry < fwhmValues->n, "inconsistent matched-PSF entry");
+        nEntry = fwhmValues->n;
+    }
+    if (entry > 0) {
+        psLogMsg ("psphot", PS_LOG_DETAIL, "Radial Apertures for matched image %s : PSF FWHM = %f pixels\n", file->name, fwhmValues->data.F32[entry]);
+    } else {
+        psLogMsg ("psphot", PS_LOG_DETAIL, "Radial Apertures for unmatched image %s\n", file->name);
+    }
 
     // option to limit analysis to a specific region
@@ -98 +118 @@
             psArrayAdd(job->args, 1, AnalysisRegion);
             psArrayAdd(job->args, 1, recipe);
+
+            PS_ARRAY_ADD_SCALAR(job->args, entry,  PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, nEntry, PS_TYPE_S32);
 
             PS_ARRAY_ADD_SCALAR(job->args, 0, PS_TYPE_S32); // this is used as a return value for Nradial
@@ -115 +138 @@
             }
             psScalar *scalar = NULL;
-            scalar = job->args->data[4];
+            scalar = job->args->data[6];
             Nradial += scalar->data.S32;
             psFree(job);
@@ -135 +158 @@
             } else {
                 psScalar *scalar = NULL;
-                scalar = job->args->data[4];
+                scalar = job->args->data[6];
                 Nradial += scalar->data.S32;
             }
@@ -159 +182 @@
     psMetadata *recipe      = job->args->data[3];
 
+    int entry               = PS_SCALAR_VALUE(job->args->data[4],S32); // which psf-matched image are we working on? (0 == unmatched)
+    int nEntry              = PS_SCALAR_VALUE(job->args->data[5],S32); // total number of psf-matched images + 1 unmatched
+
     // radMax stores the upper bounds of the annuli
     // XXX keep the same name here as for the petrosian / elliptical apertures?
@@ -198 +224 @@
 
         // allocate pmSourceExtendedParameters, if not already defined
-        if (!source->radialAper) {
-            source->radialAper = psArrayAlloc(1);
+        // XXX check that nPSFsizes is consistent with targets
+        if (source->parent) {
+            if (!source->parent->radialAper) {
+                source->parent->radialAper = psArrayAlloc(nEntry);
+            }
+        } else {
+            if (!source->radialAper) {
+                source->radialAper = psArrayAlloc(nEntry);
+            }
         }
 
@@ -219 +252 @@
         pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, outerRadius + 2);
 
-        if (!psphotRadialApertureSource (source, recipe, maskVal, radMax, 0)) {
+        if (!psphotRadialApertureSource (source, recipe, maskVal, radMax, entry)) {
             psTrace ("psphot", 5, "failed to extract radial profile for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
         } else {
@@ -233 +266 @@
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     }
-    psScalar *scalar = job->args->data[4];
+    psScalar *scalar = job->args->data[6];
     scalar->data.S32 = Nradial;