Changeset 28013 for trunk/psphot/src/psphotSourceMatch.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotSourceMatch.c (modified) (7 diffs)

trunk/psphot/src/psphotSourceMatch.c

@@ -1 +1 @@
 # include "psphotInternal.h" 
 
-bool psphotMatchSourcesGenerate (pmConfig *config, const pmFPAview *view, psArray *objects);
- 
-psArray *psphotMatchSources (pmConfig *config, const pmFPAview *view) 
+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) 
 {
     bool status = true;
@@ -14 +15 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotMatchSourcesReadout (objects, config, view, "PSPHOT.INPUT", i)) {
+        if (!psphotMatchSourcesReadout (objects, config, view, filerule, i)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to merge sources for PSPHOT.INPUT entry %d", i);
             psFree (objects);
@@ -21 +22 @@
     }
 
-    psphotMatchSourcesGenerate (config, view, 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;
 }
 
-bool psphotMatchSourcesReadout (psArray *objects, pmConfig *config, const pmFPAview *view, char *filename, int index) { 
+bool psphotMatchSourcesReadout (psArray *objects, pmConfig *config, const pmFPAview *view, const char *filerule, int index) { 
  
     bool status = false;
@@ -38 +43 @@
 
     // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
     psAssert (file, "missing file?");
 
@@ -145 +150 @@
 } 
 
-bool psphotMatchSourcesGenerate (pmConfig *config, const pmFPAview *view, psArray *objects) {
+bool psphotMatchSourcesAddMissing (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objects) {
 
     bool status = false;
@@ -167 +172 @@
 
         // find the currently selected readout
-        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", i); // File of interest
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, i); // File of interest
         psAssert (file, "missing file?");
 
@@ -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;
+}