Changeset 23406

Timestamp:

Mar 18, 2009, 3:51:09 PM (17 years ago)

Author:

eugene

Message:

re-work CTE map I/O: replace values in input image rather than creating esoteric output file

Location:

branches/eam_branches/eam_branch_20090312/ppImage/src

Files:

• ppImageCheckCTE.c (modified) (4 diffs)
• ppImageCheckCTE.v1.c (added)
• ppImageParseCamera.c (modified) (1 diff)

branches/eam_branches/eam_branch_20090312/ppImage/src/ppImageCheckCTE.c

@@ -5 +5 @@
 #include "ppImage.h"
 
+// XXX I originally coded this to create a new pmFPAfile, but in retrospect it makes more sense
+// to treat this function as an operation on the input image
+
+// XXX make the choice of stats optional
 bool ppImageCheckCTE(pmConfig *config, ppImageOptions *options, pmFPAview *view)
 {
@@ -34 +38 @@
     psImageBinningSetSkip(binning, image);
 
-    pmCell *inCell  = pmFPAfileThisCell (config->files, view, "PPIMAGE.INPUT");
-    pmCell *outCell = pmFPAfileThisCell (config->files, view, "PPIMAGE.CTEMAP");
-    if (!pmCellCopyStructure(outCell, inCell, binning->nXbin, binning->nYbin)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to copy cell structure.");
-        return false;
-    }
+    psStats *stats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN);
+    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS);
+    psImageBackground (stats, NULL, image, mask, 0xffff, rng);
+    float cellMedian = stats->robustMedian;
+    psFree (stats);
 
-    pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPIMAGE.CTEMAP");
-    psImage *output = outRO->image;
+    // stats = psStatsAlloc (PS_STAT_SAMPLE_STDEV);
+    // psStats *statsDefaults = psStatsAlloc (PS_STAT_SAMPLE_STDEV);
 
-    // Don't care about the bias: get rid of it, if present
-    psFree(outRO->bias);
-    outRO->bias = psListAlloc(NULL);
-    psMetadataItem *biassec = psMetadataLookup(outCell->concepts, "CELL.BIASSEC");
-    psFree(biassec->data.V);
-    biassec->data.V = psListAlloc(NULL);
-
-    psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
-    psStats *statsDefaults = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
+    stats = psStatsAlloc (PS_STAT_ROBUST_STDEV);
+    psStats *statsDefaults = psStatsAlloc (PS_STAT_ROBUST_STDEV);
 
     // measure median and variance for subimages
     psRegion ruffRegion = {0,0,0,0};
     psRegion fineRegion = {0,0,0,0};
-    for (int iy = 0; iy < output->numRows; iy++) {
-        for (int ix = 0; ix < output->numCols; ix++) {
+    for (int iy = 0; iy < binning->nYruff; iy++) {
+        for (int ix = 0; ix < binning->nXruff; ix++) {
 
             // convert the ruff grid cell to the equivalent fine grid cell
@@ -84 +80 @@
             statsDefaults->tmpData = NULL;
 
-            psImageStats (stats, subset, submask, 0);
+            psImageStats (stats, subset, submask, 0xffff);
 
-            // XXX need to apply the gain as well
-            output->data.F32[iy][ix] = PS_SQR(stats->sampleStdev) / stats->sampleMedian;
+            // XXX need to apply the gain as well
+            float normVariance = PS_SQR(stats->robustStdev) / cellMedian;
+            // float normVariance = PS_SQR(stats->sampleStdev) / cellMedian;
+
+            // apply resulting value to the input pixels
+            for (int jy = fineRegion.y0; jy < fineRegion.y1; jy++) {
+              for (int jx = fineRegion.x0; jx < fineRegion.x1; jx++) {
+                image->data.F32[jy][jx] = normVariance;
+              }
+            }
 
             psFree (subset);
@@ -94 +98 @@
     }
 
+    psFree (rng);
     psFree (binning);
     psFree (stats);

branches/eam_branches/eam_branch_20090312/ppImage/src/ppImageParseCamera.c

@@ -154 +154 @@
     }
 
-    if (options->checkCTE) {
+    if (options->checkCTE && false) {
         int DX = psMetadataLookupS32 (&status, recipe, "CTE.XBIN");
         int DY = psMetadataLookupS32 (&status, recipe, "CTE.YBIN");