Changeset 19670

Timestamp:

Sep 23, 2008, 9:26:52 AM (18 years ago)

Author:

Paul Price

Message:

Stamp quality information is in the kernel now, not on the analysis metadata directly.

Location:

trunk/ppStack/src

Files:

• ppStackLoop.c (modified) (1 diff)
• ppStackMatch.c (modified) (1 diff)

trunk/ppStack/src/ppStackLoop.c

@@ -441 +441 @@
 
         if (stats) {
-            float stampMean = psMetadataLookupF32(NULL, readout->analysis,
-                                                  PM_SUBTRACTION_ANALYSIS_STAMPS_MEAN); // Mean deviation
-            float stampRMS = psMetadataLookupF32(NULL, readout->analysis,
-                                                 PM_SUBTRACTION_ANALYSIS_STAMPS_RMS);  // RMS deviation
+            pmSubtractionKernel kernels = psMetadataLookupPtr(NULL, readout->analysis,
+                                                              PM_SUBTRACTION_ANALYSIS_KERNEL); // Conv. kernel
             psMetadataAddF32(stats, PS_LIST_TAIL, "TIME_MATCH", PS_META_DUPLICATE_OK,
                              "Time to match PSF", psTimerMark("PPSTACK_MATCH"));
             psMetadataAddF32(stats, PS_LIST_TAIL, "STAMP.MEAN", PS_META_DUPLICATE_OK,
-                             "Mean deviation for stamps", stampMean);
+                             "Mean deviation for stamps", kernels->mean);
             psMetadataAddF32(stats, PS_LIST_TAIL, "STAMP.RMS", PS_META_DUPLICATE_OK,
-                             "RMS deviation for stamps", stampRMS);
+                             "RMS deviation for stamps", kernels->rms);
+            psMetadataAddF32(stats, PS_LIST_TAIL, "STAMP.NUM", PS_META_DUPLICATE_OK,
+                             "RMS deviation for stamps", kernels->numStamps);
 
         }

trunk/ppStack/src/ppStackMatch.c

@@ -267 +267 @@
             readout->weight = psMemIncrRefCounter(output->weight);
 
-            psMetadataCopy(readout->analysis, output->analysis);
+            readout->analysis = psMetadataCopy(readout->analysis, output->analysis);
         } else {
             // Fake the convolution