Changeset 24274 for trunk/psphot

Timestamp:

May 28, 2009, 2:17:52 PM (17 years ago)

Author:

Paul Price

Message:

When running under 'minimal' mode, want to find sources with the second (lower) threshold.

Location:

trunk/psphot/src

Files:

• psphotFindFootprints.c (modified) (1 diff)
• psphotReadoutMinimal.c (modified) (1 diff)

trunk/psphot/src/psphotFindFootprints.c

@@ -59 +59 @@
 
         psArray *mergedFootprints = pmFootprintArraysMerge(detections->footprints, footprints, includePeaks);
-        psLogMsg ("psphot", PS_LOG_MINUTIA, "merged %ld new footprints with %ld existing ones: %f sec\n", footprints->n, detections->footprints->n, psTimerMark ("psphot.footprints"));
+        psLogMsg ("psphot", PS_LOG_MINUTIA, "merged %ld new footprints with %ld existing ones: %f sec\n", footprints->n, (detections->footprints ? detections->footprints->n : 0), psTimerMark ("psphot.footprints"));
 
         psFree(footprints);

trunk/psphot/src/psphotReadoutMinimal.c

@@ -46 +46 @@
 
     // find the detections (by peak and/or footprint) in the image.
-    pmDetections *detections = psphotFindDetections (NULL, readout, recipe);
+    pmDetections *detections = pmDetectionsAlloc(); // New detections; allocated to ensure pass=2
+    detections = psphotFindDetections(detections, readout, recipe);
     if (!detections) {
         psLogMsg ("psphot", 3, "unable to find detections in this image");