Changeset 19532 for trunk/psModules/src/imcombine/pmSubtractionIO.c

Timestamp:

Sep 11, 2008, 6:12:42 PM (18 years ago)

Author:

Paul Price

Message:

Correcting stack variances for the imperfect convolution. Changed (again) the way the deviations are calculated; they're now straight chi^{2, which allows us to estimate how the variance factor needs to be changed in order to correct for it. Moving additional values into pmSubtractionKernels so that this can be calculated from a kernel that has been read in (very useful for debugging, also nice to have a record of the quality of the fit).}

File:

• trunk/psModules/src/imcombine/pmSubtractionIO.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionIO.c

@@ -32 +32 @@
 #define NAME_SOL1 "SOLUTION_1"          // Solution for convolving image 1
 #define NAME_SOL2 "SOLUTION_2"          // Solution for convolving image 2
+#define NAME_MEAN "MEAN"                // Mean of chi^2 from stamps
+#define NAME_RMS  "RMS"                 // RMS of chi^2 from stamps
+#define NAME_NUMSTAMPS "NUMSTAMPS"      // Number of good stamps
 
 #define FALLBACK_EXTNAME "SUBTRACTION_KERNEL" // Fallback extension name
@@ -159 +162 @@
             psMetadataAddVector(row, PS_LIST_TAIL, NAME_SOL2, 0, "Solution vector 2", kernel->solution2);
         }
+        psMetadataAddF32(row, PS_LIST_TAIL, NAME_MEAN,  0, "Mean of chi^2 from stamps", kernel->mean);
+        psMetadataAddF32(row, PS_LIST_TAIL, NAME_RMS,  0, "RMS of chi^2 from stamps", kernel->rms);
+        psMetadataAddF32(row, PS_LIST_TAIL, NAME_NUMSTAMPS,  0, "Number of good stamps", kernel->numStamps);
     }
     psFree(regions);
@@ -167 +173 @@
     // CVS tags, used to identify the version of this file (in case incompatibilities are introduced)
     psString cvsFile = psStringCopy("$RCSfile: pmSubtractionIO.c,v $");
-    psString cvsRev  = psStringCopy("$Revision: 1.3 $");
-    psString cvsDate = psStringCopy("$Date: 2008-08-27 02:54:44 $");
+    psString cvsRev  = psStringCopy("$Revision: 1.4 $");
+    psString cvsDate = psStringCopy("$Date: 2008-09-12 04:12:42 $");
     psStringSubstitute(&cvsFile, NULL, "RCSfile: ");
     psStringSubstitute(&cvsRev,  NULL, "Revision: ");
@@ -338 +344 @@
         TABLE_LOOKUP(int, S32, numRows, NAME_ROWS);
 
+        TABLE_LOOKUP(float, F32, mean,      NAME_MEAN);
+        TABLE_LOOKUP(float, F32, rms,       NAME_RMS);
+        TABLE_LOOKUP(int,   S32, numStamps, NAME_NUMSTAMPS);
+
         pmSubtractionKernels *kernels = pmSubtractionKernelsFromDescription(description, bg, mode);
         kernels->numCols = numCols;
         kernels->numRows = numRows;
+        kernels->mean = mean;
+        kernels->rms = rms;
+        kernels->numStamps = numStamps;
 
         bool mdok;                      // Status of MD lookup