Changeset 20180 for trunk/dvoTools/src/dvoApplyCorrReadout.c

Timestamp:

Oct 15, 2008, 5:51:49 PM (18 years ago)

Author:

eugene

Message:

extensive fixes to make these two programs actually work

File:

• trunk/dvoTools/src/dvoApplyCorrReadout.c (modified) (1 diff)

trunk/dvoTools/src/dvoApplyCorrReadout.c

@@ -5 +5 @@
 #include "dvoApplyCorr.h"
 
-// this function is operating on each readout, assuming there is a correspondence between
-// readouts in the input (raw) flat-field image and the correction frame.  this is not really
-// true
+// this function is operating on each cell (well, readout) of the flat to be corrected.  The
+// input chip is supplied, but may be in a different format (eg, chip-mosaic vs single cell)
 
-bool dvoApplyCorrReadout (pmConfig *config, pmFPAview *view, char *inName, char *corrName) {
+bool dvoApplyCorrReadout (pmCell *inCell, pmChip *corrChip) {
     
+    // XXX for now, let's just assume the input is per-cell, and the correction is per-chip
+    // Also, let's assume they are both binned 1x1
+
     bool status;
 
-    pmFPAfile *inFile = psMetadataLookupPtr (&status, config->files, inName);
-    pmFPAfile *corrFile = psMetadataLookupPtr (&status, config->files, corrName);
-    assert (inFile);
-    assert (corrFile);
+    pmCell *corrCell = corrChip->cells->data[0];
+    pmReadout *corrRO = corrCell->readouts->data[0];
+    psImage *corrImage = corrRO->image;
 
-    pmReadout *inData = pmFPAviewThisReadout (view, inFile->fpa);
-    pmReadout *corrData = pmFPAviewThisReadout (view, corrFile->fpa);
-    assert (inData);
-    assert (corrData);
+    pmReadout *inRO = inCell->readouts->data[0];
+    psImage *inImage = inRO->image;
 
-    // dimensions of input image:
-    assert (inData->image->numCols == corrData->image->numCols);
-    assert (inData->image->numRows == corrData->image->numRows);
+    int x0 = psMetadataLookupS32(&status, inCell->concepts, "CELL.X0"); // Position of (0,0) on chip
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "CELL.X0 hasn't been set for cell.\n");
+        return false;
+    }
+    int y0 = psMetadataLookupS32(&status, inCell->concepts, "CELL.Y0"); // Position of (0,0) on chip
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "CELL.Y0 hasn't been set for cell.\n");
+        return false;
+    }
 
-    // NOTE : the output pmFPA points at the same pixels as the input pmFPA
+    int xParity = psMetadataLookupS32(&status, inCell->concepts, "CELL.XPARITY"); // Parity in x
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "CELL.XPARITY hasn't been set for cell.\n");
+        return false;
+    }
+    int yParity = psMetadataLookupS32(&status, inCell->concepts, "CELL.YPARITY"); // Parity in y
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, true, "CELL.YPARITY hasn't been set for cell.\n");
+        return false;
+    }
 
-    // the corr image is a multiplicative factor
-    for (int j = 0; j < inData->image->numRows; j++) {
-        for (int i = 0; i < inData->image->numCols; i++) {
-            inData->image->data.F32[j][i] *= corrData->image->data.F32[j][i]; 
+    // The corr image is a multiplicative factor.  Need to convert the input flat pixel
+    // coordinates to the correction cell/pixel coords.
+    for (int j = 0; j < inImage->numRows; j++) {
+        int jC = (yParity < 0) ? y0 + j*yParity : y0 + j*yParity + 1;
+        for (int i = 0; i < inImage->numCols; i++) {
+            int iC = (xParity < 0) ? x0 + i*xParity : x0 + i*xParity + 1;
+            inImage->data.F32[j][i] *= corrImage->data.F32[jC][iC]; 
         }
     }
-
-    // psFits *fits = psFitsOpen ("tmp.fits", "w");
-    // psFitsWriteImage (fits, NULL, inData->image, 0, NULL);
-    // psFitsClose (fits);
-    // exit (0);
-
     return true;
 }