Changeset 20710 for trunk/ppStack/src/ppStackReadout.c

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.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (2 diffs)

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);