Changeset 27950

Timestamp:

May 13, 2010, 11:01:42 AM (16 years ago)

Author:

eugene

Message:

set up a consistent position; perform extended analysis on all sources for an object processed

Location:

branches/eam_branches/psphot.20100506/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (1 diff)
• psphotExtendedSourceAnalysisByObject.c (modified) (5 diffs)
• psphotRadialAperturesByObject.c (modified) (1 diff)
• psphotStackObjects.c (added)
• psphotStackReadout.c (modified) (5 diffs)

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

@@ -99 +99 @@
         psphotStackMatchPSFsPrepare.c \
         psphotStackOptions.c          \
+        psphotStackObjects.c          \
         psphotStackPSF.c              \
         psphotCleanup.c

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

@@ -465 +465 @@
 bool psphotRadialAperturesByObject (pmConfig *config, psArray *objects, const pmFPAview *view, const char *filerule);
 
+bool psphotStackObjectsUnifyPosition (psArray *objects);
+
 #endif

branches/eam_branches/psphot.20100506/src/psphotExtendedSourceAnalysisByObject.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...
 
 // aperture-like measurements for extended sources
@@ -64 +61 @@
 
     // source analysis is done in S/N order (brightest first)
-    // XXX add this in (need to put S/N in pmPhotObj) : objects = psArraySort (objects, pmPhotObjSortBySN);
+    objects = psArraySort (objects, pmPhotObjSortBySN);
 
     // process the objects in order.  
@@ -72 +69 @@
         if (!object->sources) continue;
 
+        // we need to decide for an object if we are going to measure all sources or not
+        // simple rule : if *any* of the sources would be measured, measure the object
+
         // choose the sources of interest
-        for (int j = 0; j < object->sources->n; j++) {
+        bool measureSource = false;
+        for (int j = 0; !measureSource && (j < object->sources->n); j++) {
 
             pmSource *source = object->sources->data[j];
@@ -88 +89 @@
             assert (source->peak); // how can a source not have a peak?
             if (source->peak->SN < SN_LIM) continue;
+            measureSource = true;
+        }
+        if (!measureSource) continue;
+
+        // choose the sources of interest
+        for (int j = 0; j < object->sources->n; j++) {
+
+            pmSource *source = object->sources->data[j];
+            psAssert (source, "programming error"); // all entries in object->sources must exist, right?
+            psAssert (source->peak, "programming error"); // how can a source not have a peak?
 
             // replace object in image
@@ -146 +157 @@
     return true;
 }
-
-// sort by X (ascending)
-# if (0)
-int pmPhotObjSortBySN (const void **a, const void **b)
-{
-    pmPhotObj *objA = *(pmPhotObj **)a;
-    pmPhotObj *objB = *(pmPhotObj **)b;
-
-    psF32 fA = objA->x;
-    psF32 fB = objB->x;
-
-    psF32 diff = fA - fB;
-    if (diff > FLT_EPSILON) return (+1);
-    if (diff < FLT_EPSILON) return (-1);
-    return (0);
-}
-# endif

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

@@ -41 +41 @@
 
     // source analysis is done in S/N order (brightest first)
-    // XXX are we getting the objects out of order? does it matter?
-    // XXX objects = psArraySort (objects, pmPhotObjSortBySN);
+    objects = psArraySort (objects, pmPhotObjSortBySN);
 
     // generate look-up arrays for readouts

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

@@ -73 +73 @@
     }
 
-    // XXX do this now or below?
-    // remove chisq image from config->file:PSPHOT.INPUT (why?)
-    // psphotStackRemoveChisqFromInputs(config, STACK_RAW);
-
     // copy the detections from RAW to OUT
     if (!psphotCopySources (config, view, STACK_OUT, STACK_RAW)) {
@@ -90 +86 @@
     }
 
-    // *** generate the objects (which unify the sources from the different images)
+    // generate the objects (object unify the sources from the different images)
     psArray *objects = psphotMatchSources (config, view, STACK_OUT);
 
@@ -137 +133 @@
     }
 
-    // include externally-supplied sources
-    // XXX fix this in the new multi-input context
-    // psphotLoadExtSources (config, view, "PSPHOT.INPUT"); // pass 1
-
     // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
     psphotGuessModels (config, view, STACK_OUT);
@@ -161 +153 @@
     }
 
+    psphotStackObjectsUnifyPosition (objects);
     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)
@@ -182 +176 @@
     psphotSourceFreePixels (config, view, STACK_OUT);
 
-    // XXX do this now or above?
     // remove chisq image from config->file:PSPHOT.INPUT (why?)
     psphotStackRemoveChisqFromInputs(config, STACK_RAW);