Changeset 25027 for branches/pap/ppStack

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src/ppStackMatch.c (modified) (6 diffs)
• ppStack/src/ppStackPhotometry.c (modified) (1 diff)
• ppStack/src/ppStackThread.c (modified) (3 diffs)

branches/pap/ppStack/src/ppStackMatch.c

@@ -209 +209 @@
             pmFPAview *view = pmFPAviewAlloc(0); // View to readout of interest
             view->chip = view->cell = view->readout = 0;
-            psString filename = pmFPAfileNameFromRule(filerule->rule, file, view); // Filename of interest
+            psString filename = pmFPAfileNameFromRule(file->filerule, file, view); // Filename of interest
 
             // Read convolution kernel
@@ -241 +241 @@
                 !readImage(&readout->variance, options->varianceNames->data[index], config)) {
                 psError(PS_ERR_IO, false, "Unable to read previously produced image.");
-                psFree(imageName);
-                psFree(maskName);
-                psFree(varianceName);
                 return false;
             }
-            psFree(imageName);
-            psFree(maskName);
-            psFree(varianceName);
 
             psRegion *region = psMetadataLookupPtr(NULL, conv->analysis,
@@ -317 +311 @@
             }
 
+            fake->mask = psImageCopy(NULL, readout->mask, PS_TYPE_IMAGE_MASK);
+
             // Add the background into the target image
             psImage *bgImage = stackBackgroundModel(readout, config); // Image of background
@@ -361 +357 @@
                     psFree(stampSources);
                     psFree(conv);
+                    if (threads > 0) {
+                        pmSubtractionThreadsFinalize(readout, fake);
+                    }
                     return false;
                 }
@@ -375 +374 @@
                     psFree(stampSources);
                     psFree(conv);
+                    if (threads > 0) {
+                        pmSubtractionThreadsFinalize(readout, fake);
+                    }
                     return false;
                 }
@@ -510 +512 @@
         psBinaryOp(readout->variance, readout->variance, "*", psScalarAlloc(PS_SQR(norm), PS_TYPE_F32));
     }
-
+   
     // Ensure the background value is zero
     psStats *bg = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV); // Statistics for background
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS); // Random number generator
     if (!psImageBackground(bg, NULL, readout->image, readout->mask, maskVal | maskBad, rng)) {
-        psWarning("Can't measure background for image.");
-        psErrorClear();
+      psWarning("Can't measure background for image.");
+      psErrorClear();
     } else {
-        psLogMsg("ppStack", PS_LOG_INFO, "Correcting convolved image background by %lf (+/- %lf)",
-                 psStatsGetValue(bg, PS_STAT_ROBUST_MEDIAN), psStatsGetValue(bg, PS_STAT_ROBUST_STDEV));
-        (void)psBinaryOp(readout->image, readout->image, "-",
-                         psScalarAlloc(psStatsGetValue(bg, PS_STAT_ROBUST_MEDIAN), PS_TYPE_F32));
-    }
+      if (!psMetadataLookupBool(NULL, config->arguments, "PPSTACK.SKIP.BG.SUB")) {
+        psLogMsg("ppStack", PS_LOG_INFO, "Correcting convolved image background by %lf (+/- %lf)",
+                 psStatsGetValue(bg, PS_STAT_ROBUST_MEDIAN), psStatsGetValue(bg, PS_STAT_ROBUST_STDEV));
+        (void)psBinaryOp(readout->image, readout->image, "-",
+                         psScalarAlloc(psStatsGetValue(bg, PS_STAT_ROBUST_MEDIAN), PS_TYPE_F32));
+      }
+    }
+    
 
     // Measure the variance level for the weighting

branches/pap/ppStack/src/ppStackPhotometry.c

@@ -94 +94 @@
         psArray *sources = psMetadataLookupPtr(NULL, photRO->analysis, "PSPHOT.SOURCES"); // Sources
         psMetadataAddS32(options->stats, PS_LIST_TAIL, "NUM_SOURCES", 0,
-                         "Number of sources detected", sources->n);
+                         "Number of sources detected", sources ? sources->n : 0);
         psMetadataAddF32(options->stats, PS_LIST_TAIL, "TIME_PHOT", 0,
                          "Time to do photometry", psTimerMark("PPSTACK_PHOT"));

branches/pap/ppStack/src/ppStackThread.c

@@ -187 +187 @@
 
 
+                int zMax = 0;
                 bool keepReading = false;
-                if (pmReadoutMore(ro, imageFits, 0, rows, config)) {
+                if (pmReadoutMore(ro, imageFits, 0, &zMax, rows, config)) {
                     keepReading = true;
-                    if (!pmReadoutReadChunk(ro, imageFits, 0, rows, overlap, config)) {
+                    if (!pmReadoutReadChunk(ro, imageFits, 0, NULL, rows, overlap, config)) {
                         psError(PS_ERR_IO, false, "Unable to read chunk %d for file PPSTACK.INPUT %d",
                                 numChunk, i);
@@ -198 +199 @@
                 }
 
-                if (pmReadoutMoreMask(ro, maskFits, 0, rows, config)) {
+                if (pmReadoutMoreMask(ro, maskFits, 0, &zMax, rows, config)) {
                     keepReading = true;
-                    if (!pmReadoutReadChunkMask(ro, maskFits, 0, rows, overlap, config)) {
+                    if (!pmReadoutReadChunkMask(ro, maskFits, 0, NULL, rows, overlap, config)) {
                         psError(PS_ERR_IO, false, "Unable to read chunk %d for file PPSTACK.INPUT.MASK %d",
                                 numChunk, i);
@@ -208 +209 @@
                 }
 
-                if (pmReadoutMoreVariance(ro, varianceFits, 0, rows, config)) {
+                if (pmReadoutMoreVariance(ro, varianceFits, 0, &zMax, rows, config)) {
                     keepReading = true;
-                    if (!pmReadoutReadChunkVariance(ro, varianceFits, 0, rows, overlap, config)) {
+                    if (!pmReadoutReadChunkVariance(ro, varianceFits, 0, NULL, rows, overlap, config)) {
                         psError(PS_ERR_IO, false,
                                 "Unable to read chunk %d for file PPSTACK.INPUT.VARIANCE %d",