Changeset 27939 for branches/eam_branches/psphot.20100506/src/psphotStackReadout.c

Timestamp:

May 12, 2010, 3:54:46 PM (16 years ago)

Author:

eugene

Message:

re-org so we can do radial apertures and extended sources by object, not image

File:

• branches/eam_branches/psphot.20100506/src/psphotStackReadout.c (modified) (3 diffs)

branches/eam_branches/psphot.20100506/src/psphotStackReadout.c

@@ -150 +150 @@
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
     psphotFitSourcesLinearStack (config, objects, FALSE);
-    psFree (objects);
 
     // identify CRs and extended sources
@@ -157 +156 @@
     // measure aperture photometry corrections
     if (!psphotApResid (config, view, STACK_OUT)) {
+        psFree (objects);
         psLogMsg ("psphot", 3, "failed on psphotApResid");
         return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
-    psphotRadialApertures (config, view, STACK_OUT); 
-    psphotExtendedSourceAnalysis (config, view, STACK_OUT); // pass 1 (detections->allSources)
+    psphotRadialAperturesByObject (config, objects, view, STACK_OUT); 
+    psphotExtendedSourceAnalysisByObject (config, objects, view, STACK_OUT); // pass 1 (detections->allSources)
     psphotExtendedSourceFits (config, view, STACK_OUT); // pass 1 (detections->allSources)
 
@@ -186 +186 @@
     psphotStackRemoveChisqFromInputs(config, STACK_RAW);
 
+    psFree (objects);
+
     // create the exported-metadata and free local data
     return psphotReadoutCleanup (config, view, STACK_OUT);