Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psModules/src/detrend/pmOverscan.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/detrend/pmOverscan.c (modified) (5 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/detrend/pmOverscan.c

@@ -74 +74 @@
             mask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 0;
             ordinate->data.F32[i] = 2.0*(float)i/(float)pixels->n - 1.0; // Scale to [-1,1]
-            psVectorStats(myStats, values, NULL, NULL, 0);
+            if (!psVectorStats(myStats, values, NULL, NULL, 0)) {
+                psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                return false;
+            }
             reduced->data.F32[i] = psStatsGetValue(myStats, statistic);
         } else if (overscanOpts->fitType == PM_FIT_NONE) {
@@ -255 +258 @@
     psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK,
                      comment, "");
+    psTrace ("psModules.detrend", 4, "%s\n", comment);
     psFree(comment);
 
@@ -274 +278 @@
         psFree(iter);
 
-        (void)psVectorStats(stats, pixels, NULL, NULL, 0);
+        if (!psVectorStats(stats, pixels, NULL, NULL, 0)) {
+            psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+            return false;
+        }
         psFree(pixels);
         double reduced = psStatsGetValue(stats, statistic); // Result of statistics
@@ -344 +351 @@
         }
 
+        // generate stats of overscan vector for header
+        { 
+          psString comment = NULL;    // Comment to add
+          psStats *vectorStats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
+          if (!psVectorStats (vectorStats, reduced, NULL, NULL, 0)) {
+              psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+              return false;
+          }
+          psStringAppend(&comment, "Mean Overscan value: %f", vectorStats->sampleMean);
+          psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, comment, "");
+          psFree(comment);
+
+          // write metadata header value
+          psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_VAL", PS_META_REPLACE, "Overscan mean", vectorStats->sampleMean);
+          psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_SIG", PS_META_REPLACE, "Overscan stdev", vectorStats->sampleStdev);
+          psFree (vectorStats);
+        }
+
         // Subtract row by row
         for (int i = 0; i < image->numRows; i++) {
@@ -392 +417 @@
         }
 
-        // Subtract column by column
-        for (int i = 0; i < image->numCols; i++) {
-            for (int j = 0; j < image->numRows; j++) {
+        // generate stats of overscan vector for header
+        { 
+          psString comment = NULL;    // Comment to add
+          psStats *vectorStats = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
+          if (!psVectorStats (vectorStats, reduced, NULL, NULL, 0)) {
+              psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+              return false;
+          }
+          psStringAppend(&comment, "Mean Overscan value: %f", vectorStats->sampleMean);
+          psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, comment, "");
+          psFree(comment);
+
+          // write metadata header value
+          psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_VAL", PS_META_REPLACE, "Overscan mean", vectorStats->sampleMean);
+          psMetadataAddF32(hdu->header, PS_LIST_TAIL, "OVER_SIG", PS_META_REPLACE, "Overscan stdev", vectorStats->sampleStdev);
+          psFree (vectorStats);
+        }
+
+        // Subtract column by column 
+        for (int j = 0; j < image->numRows; j++) {
+          for (int i = 0; i < image->numCols; i++) {
                 image->data.F32[j][i] -= reduced->data.F32[i];
             }