Changeset 27939 for branches/eam_branches/psphot.20100506/src/psphotSourceMatch.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/psphotSourceMatch.c (modified) (4 diffs)

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;
+}