Changeset 20710

Timestamp:

Nov 12, 2008, 3:14:57 PM (17 years ago)

Author:

Paul Price

Message:

Combine with weights based on the background noise in the image after convolution.

Location:

trunk/ppStack/src

Files:

• ppStackCamera.c (modified) (2 diffs)
• ppStackMatch.c (modified) (1 diff)
• ppStackReadout.c (modified) (2 diffs)

trunk/ppStack/src/ppStackCamera.c

@@ -101 +101 @@
         psString psf = psMetadataLookupStr(&mdok, input, "PSF"); // Name of PSF
         psString sources = psMetadataLookupStr(&mdok, input, "SOURCES"); // Name of sources
-
-        float weighting = psMetadataLookupF32(&mdok, input, "WEIGHTING"); // Relative weighting
-        if (!mdok || isnan(weighting) || weighting == 0.0) {
-            psWarning("Component %s lacks WEIGHTING of type F32 --- assuming 1.0", item->name);
-            weighting = 1.0;
-        }
 
         // Add the image file
@@ -258 +252 @@
 #endif
 
-        psMetadataAddF32(imageFile->fpa->analysis, PS_LIST_TAIL, "PPSTACK.WEIGHTING", 0,
-                         "Relative weighting for image", weighting);
-
         i++;
     }

trunk/ppStack/src/ppStackMatch.c

@@ -384 +384 @@
         (void)psBinaryOp(readout->image, readout->image, "+",
                          psScalarAlloc(- psStatsGetValue(bg, PS_STAT_ROBUST_MEDIAN), PS_TYPE_F32));
+        psMetadataAddF32(readout->analysis, PS_LIST_TAIL, "PPSTACK.WEIGHTING", 0,
+                         "Weighting by 1/noise^2 for stack",
+                         1.0 / PS_SQR(psStatsGetValue(bg, PS_STAT_ROBUST_STDEV)));
     }
     psFree(bg);

trunk/ppStack/src/ppStackReadout.c

@@ -117 +117 @@
             continue;
         }
-        pmFPA *fpa = ro->parent->parent->parent; // Parent FPA
-
-        float weighting = psMetadataLookupF32(&mdok, fpa->analysis, "PPSTACK.WEIGHTING"); // Relative weight
+
+        float weighting = psMetadataLookupF32(&mdok, ro->analysis, "PPSTACK.WEIGHTING"); // Relative weight
         if (!mdok || !isfinite(weighting)) {
-            psWarning("No WEIGHTING supplied for image %d --- set to unity.", i);
+            psWarning("No weighting supplied for image %d --- set to unity.", i);
             weighting = 1.0;
+        } else {
+            psLogMsg("ppStack", PS_LOG_INFO, "Weighting for image %d is %f", i, weighting);
         }
 
@@ -210 +211 @@
         pmReadout *ro = readouts->data[i];
         assert(ro);
-        pmFPA *fpa = ro->parent->parent->parent; // Parent FPA
 
         bool mdok;                      // Status of MD lookup
-        float weighting = psMetadataLookupF32(&mdok, fpa->analysis, "PPSTACK.WEIGHTING"); // Relative weight
+        float weighting = psMetadataLookupF32(&mdok, ro->analysis, "PPSTACK.WEIGHTING"); // Relative weight
         if (!mdok || !isfinite(weighting)) {
             psWarning("No WEIGHTING supplied for image %d --- set to unity.", i);