Changeset 35908

Timestamp:

Aug 7, 2013, 6:43:41 PM (13 years ago)

Author:

watersc1

Message:

Merge changes on chi^{2 handling for simple kernel. Also change for SCL_ values.}

Location:

tags/ipp-20130712/ppStack/src

Files:

• . (modified) (1 prop)
• ppStackMatch.c (modified) (1 diff)
• ppStackUpdateHeader.c (modified) (2 diffs)

tags/ipp-20130712/ppStack/src/ppStackMatch.c

@@ -467 +467 @@
                 sum += kernels->rms;
                 num++;
-                //              psLogMsg("ppStack", PS_LOG_INFO, "KERNMATCHDUMP %d %d %g %g %g\n",
-                //                       index,num,kernels->mean,kernels->rms,sum);
+                //                              psLogMsg("ppStack", PS_LOG_INFO, "KERNMATCHDUMP %d %d %g %g %g %g\n",
+                //                                       index,num,kernels->mean,kernels->rms,sum,psImageCovarianceFactor(readout->covariance));
             }
             psFree(iter);
-            options->matchChi2->data.F32[index] = sum / (psImageCovarianceFactor(readout->covariance) * num);
+
+            // Apply the covariance factor to the chi^2 value
+            double covar_factor = 1.0;
+            if (type != PM_SUBTRACTION_KERNEL_SIMPLE) { // Except if we're using simple kernels.
+              covar_factor = psImageCovarianceFactor(readout->covariance);
+            }
+            options->matchChi2->data.F32[index] = sum / (covar_factor * num);
 
         }

tags/ipp-20130712/ppStack/src/ppStackUpdateHeader.c

@@ -98 +98 @@
 
         float value = options->norm ? pow(10.0, -0.4*options->norm->data.F32[i]) : NAN;
+        if ((options->inputMask)&&(options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i])) {
+          value = 0.0; // If this is NAN, then it's recorded in the header as a character string instead of a float.
+        }
         snprintf (field, 64, "SCL_%04d", i);
         psMetadataAddF32(hdu->header, PS_LIST_TAIL, field, PS_META_REPLACE, "input image scale factor", value);
@@ -132 +135 @@
         expROhdu->header = psMetadataAlloc();
       }
+
       expRO->parent->parent->parent->hdu->header = psMetadataCopy(expRO->parent->parent->parent->hdu->header,
                                                                   outRO->parent->parent->parent->hdu->header);