Changeset 19123

Timestamp:

Aug 18, 2008, 2:53:41 PM (18 years ago)

Author:

Paul Price

Message:

Enabling threads. So far, only using the threaded parts of pmSubtraction*.

Location:

trunk/ppStack/src

Files:

• ppStackArguments.c (modified) (2 diffs)
• ppStackMatch.c (modified) (5 diffs)

trunk/ppStack/src/ppStackArguments.c

@@ -175 +175 @@
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-temp-delete", 0,
                       "Delete temporary files on completion?", false);
+    psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Number of threads to use", 0);
 
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 3) {
@@ -194 +195 @@
 
     valueArgStr(arguments, "-stats", "STATS", arguments);
+
+    int numThreads = psMetadataLookupS32(NULL, arguments, "-threads"); // Number of threads
+    if (numThreads > 0 && !psThreadPoolInit(numThreads)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to setup %d threads", numThreads);
+        return false;
+    }
 
     return true;

trunk/ppStack/src/ppStackMatch.c

@@ -43 +43 @@
     int renormWidth = psMetadataLookupS32(&mdok, recipe, "RENORM.WIDTH"); // Width for renormalisation box
     float penalty = psMetadataLookupF32(NULL, ppsub, "PENALTY"); // Penalty for wideness
+    int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
 
     if (!pmReadoutMaskNonfinite(readout, maskIn)) {
@@ -83 +84 @@
         }
 
+        float minFlux = INFINITY;       // Minimum flux for fake image
+        {
+            psStats *bg = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV); // Statistics for bg
+            if (!psImageBackground(bg, NULL, readout->image, readout->mask, maskIn, rng)) {
+                psWarning("Can't measure background for image.");
+                psErrorClear();
+            } else {
+                minFlux = bg->robustStdev;
+            }
+            psFree(bg);
+        }
+
         // Generate a fake image to match to
-        float maxMag = -INFINITY;           // Maximum magnitude of sources
-        for (int i = 0; i < sources->n; i++) {
-            pmSource *source = sources->data[i]; // Source of interest
-            if (source->psfMag > maxMag && source->psfMag <= MAG_IGNORE && !(source->mode & SOURCE_MASK)) {
-                maxMag = source->psfMag;
+        if (!isfinite(minFlux)) {
+            float maxMag = -INFINITY;   // Maximum magnitude of sources
+            for (int i = 0; i < sources->n; i++) {
+                pmSource *source = sources->data[i]; // Source of interest
+                if (source->psfMag > maxMag && source->psfMag <= MAG_IGNORE &&
+                    !(source->mode & SOURCE_MASK)) {
+                    maxMag = source->psfMag;
+                }
             }
+            minFlux = 0.1 * powf(10.0, -0.4 * maxMag);
         }
 
@@ -95 +112 @@
 
         if (!pmReadoutFakeFromSources(fake, readout->image->numCols, readout->image->numRows, sources, NULL,
-                                      NULL, psf, powf(10.0, -0.4 * maxMag), 0, false)) {
+                                      NULL, psf, minFlux, 0, false)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to generate fake image with target PSF.");
             psFree(fake);
@@ -110 +127 @@
         }
 #endif
+
+        if (threads > 0) {
+            pmSubtractionThreadsInit(output, NULL, readout, fake);
+        }
 
         // Do the image matching
@@ -124 +145 @@
         psFree(fake);
         psFree(optWidths);
+
+        if (threads > 0) {
+            pmSubtractionThreadsFinalize(output, NULL, readout, fake);
+        }
 
         // Set the variance factor