Changeset 27939

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

Location:

branches/eam_branches/psphot.20100506/src

Files:

• Makefile.am (modified) (2 diffs)
• psphot.h (modified) (1 diff)
• psphotExtendedSourceAnalysis.c (modified) (1 diff)
• psphotExtendedSourceAnalysisByObject.c (added)
• psphotFitSourcesLinearStack.c (modified) (1 diff)
• psphotRadialAperturesByObject.c (added)
• psphotSourceMatch.c (modified) (4 diffs)
• psphotStackReadout.c (modified) (3 diffs)

branches/eam_branches/psphot.20100506/src/Makefile.am

@@ -164 +164 @@
         psphotModelWithPSF.c           \
         psphotExtendedSourceAnalysis.c \
+        psphotExtendedSourceAnalysisByObject.c \
         psphotExtendedSourceFits.c     \
         psphotKernelFromPSF.c          \
@@ -192 +193 @@
         psphotRadialBins.c             \
         psphotRadialApertures.c        \
+        psphotRadialAperturesByObject.c \
         psphotPetrosian.c              \
         psphotPetrosianRadialBins.c    \

branches/eam_branches/psphot.20100506/src/psphot.h

@@ -462 +462 @@
 bool psphotRadialApertureSource (pmSource *source, psMetadata *recipe, float skynoise, psImageMaskType maskVal, const psVector *radMax);
 
+bool psphotExtendedSourceAnalysisByObject (pmConfig *config, psArray *objects, const pmFPAview *view, const char *filerule);
+bool psphotRadialAperturesByObject (pmConfig *config, psArray *objects, const pmFPAview *view, const char *filerule);
+
 #endif

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

@@ -1 +1 @@
 # include "psphotInternal.h"
+
+// ?? these cannot happen here --> we would need to do this in psphotExtendedSourceAnalysis
+// XXX option to choose a consistent position
+// XXX option to choose a consistent elliptical contour
+// XXX SDSS uses the r-band petrosian radius to measure petrosian fluxes in all bands
+// XXX consistent choice of extendedness...
 
 // for now, let's store the detections on the readout->analysis for each readout

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

@@ -28 +28 @@
 
     // analysis is done in spatial order (to speed up overlap search)
-    // sort by first element in each source list
     objects = psArraySort (objects, pmPhotObjSortByX);
 

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

@@ -1 +1 @@
 # include "psphotInternal.h" 
 
-bool psphotMatchSourcesGenerate (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objects);
+bool psphotMatchSourcesAddMissing (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objects);
+bool psphotMatchSourcesSetIDs (psArray *objects);
  
 psArray *psphotMatchSources (pmConfig *config, const pmFPAview *view, const char *filerule) 
@@ -21 +22 @@
     }
 
-    psphotMatchSourcesGenerate (config, view, filerule, objects);
+    // create sources for images where an object has been detected in the other images
+    psphotMatchSourcesAddMissing (config, view, filerule, objects);
+
+    // choose a consistent position; set common sequence values
+    psphotMatchSourcesSetIDs (objects);
 
     return objects;
@@ -145 +150 @@
 } 
 
-bool psphotMatchSourcesGenerate (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objects) {
+bool psphotMatchSourcesAddMissing (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objects) {
 
     bool status = false;
@@ -255 +260 @@
     return true;
 }
+
+bool psphotMatchSourcesSetIDs (psArray *objects) {
+
+    for (int i = 0; i < objects->n; i++) { 
+        pmPhotObj *obj = objects->data[i]; 
+
+        // set the source->seq values 
+        for (int j = 0; j < obj->sources->n; j++) {
+            pmSource *src = obj->sources->data[j]; 
+            src->seq = i;
+        }
+    }
+    return true;
+}

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);