Changeset 27314 for trunk/psphot

Timestamp:

Mar 17, 2010, 4:01:19 PM (16 years ago)

Author:

eugene

Message:

fixes for psphotForced

Location:

trunk/psphot/src

Files:

• psphotForcedReadout.c (modified) (1 diff)
• psphotMergeSources.c (modified) (4 diffs)

trunk/psphot/src/psphotForcedReadout.c

@@ -58 +58 @@
     psphotGuessModels (config, view);
 
+    // merge the newly selected sources into the existing list
+    // NOTE: merge OLD and NEW
+    psphotMergeSources (config, view);
+
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
     psphotFitSourcesLinear (config, view, false);

trunk/psphot/src/psphotMergeSources.c

@@ -85 +85 @@
 
     pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
-    psAssert (detections, "missing detections?");
-
-    // XXX allSources or newSources?
-    psArray *sources = detections->allSources;
+    if (!detections) {
+        detections = pmDetectionsAlloc();
+        detections->newSources = psArrayAllocEmpty (100);
+        // save detections on the readout->analysis
+        if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot detections", detections)) {
+            psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+            return false;
+        }
+    } else {
+        psMemIncrRefCounter(detections); // so we can free the detections below
+    }
+
+    psArray *sources = detections->newSources;
     psAssert (sources, "missing sources?");
 
@@ -110 +119 @@
                 source->modelPSF = NULL;
 
-                psArrayAdd (detections->allSources, 100, source);
+                psArrayAdd (detections->newSources, 100, source);
             }
         }
@@ -132 +141 @@
                 source->modelPSF = NULL;
 
-                psArrayAdd (detections->allSources, 100, source);
+                psArrayAdd (detections->newSources, 100, source);
             }
         }
@@ -138 +147 @@
 
 finish:
+
+    psFree (detections);
 
     if (!extCMF && !extSourcesTXT) {