Changeset 18206

Timestamp:

Jun 19, 2008, 3:41:17 PM (18 years ago)

Author:

Paul Price

Message:

had wrong place for varfactor

File:

• trunk/ppStack/src/ppStackMatch.c (modified) (1 diff)

trunk/ppStack/src/ppStackMatch.c

@@ -127 +127 @@
 
         // Set the variance factor
-        float vfNew = psMetadataLookupF32(NULL, output->analysis, PM_SUBTRACTION_ANALYSIS_VARFACTOR);
-        float vfOld = psMetadataLookupF32(NULL, readout->parent->concepts, "CELL.VARFACTOR");
-        if (isfinite(vfOld)) {
-            vfNew *= vfOld;
-        }
-        psMetadataItem *vfItem = psMetadataLookup(output->parent->concepts, "CELL.VARFACTOR");
-        if (!isfinite(vfItem->data.F32)) {
-            vfItem->data.F32 *= vfNew;
+        psMetadataItem *vfItem = psMetadataLookup(readout->parent->concepts, "CELL.VARFACTOR");
+        float vf = psMetadataLookupF32(NULL, output->analysis, PM_SUBTRACTION_ANALYSIS_VARFACTOR);
+        if (!isfinite(vf)) {
+            vf = 1.0;
+        }
+        if (isfinite(vfItem->data.F32)) {
+            vfItem->data.F32 *= vf;
         } else {
-            vfItem->data.F32 = vfNew;
+            vfItem->data.F32 = vf;
         }