Changeset 20180 for trunk/dvoTools/src/dvoMakeCorrUnbin.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/dvoMakeCorrUnbin.c (modified) (3 diffs)

trunk/dvoTools/src/dvoMakeCorrUnbin.c

@@ -5 +5 @@
 #include "dvoMakeCorr.h"
 
-bool dvoMakeCorrUnbin (pmConfig *config, pmFPAview *view, char *outName, char *inName, char *refName) {
+bool dvoMakeCorrUnbin (pmConfig *config, pmFPAview *view, char *outName, psImage *inImage, pmChip *inChip, char *refName) {
     
     bool status;
 
-    pmFPAfile *inFile = psMetadataLookupPtr (&status, config->files, inName);
     pmFPAfile *refFile = psMetadataLookupPtr (&status, config->files, refName);
     pmFPAfile *outFile = psMetadataLookupPtr (&status, config->files, outName);
-    assert (inFile);
     assert (refFile);
     assert (outFile);
@@ -19 +17 @@
     assert (refCell);
 
-    pmReadout *inData = pmFPAviewThisReadout (view, inFile->fpa);
-    assert (inData);
+    pmChip *refChip = pmFPAviewThisChip (view, refFile->fpa);
+    assert (refChip);
 
     // determine the output array size based on the reference TRIMSEC values
@@ -28 +26 @@
     // I have the fine and ruff image sizes, determine the binning factor
     psImageBinning *binning = psImageBinningAlloc();
-    binning->nXruff = inData->image->numCols;
-    binning->nYruff = inData->image->numRows;
+    binning->nXruff = inImage->numCols;
+    binning->nYruff = inImage->numRows;
     binning->nXfine = trimsec->x1 - trimsec->x0;
     binning->nYfine = trimsec->y1 - trimsec->y0;
     psImageBinningSetScale (binning, PS_IMAGE_BINNING_CENTER);
-    psImageBinningSetSkip(binning, inData->image);
+    psImageBinningSetSkip(binning, inImage);
+
+    // generate a local view of the 0th readout
+    pmFPAview *myView = pmFPAviewAlloc (0);
+    *myView = *view;
+    myView->readout = 0;
 
     // construct the supporing pmFPA/pmChip/pmCell structures
-    pmReadout *outData = pmFPAviewThisReadout (view, outFile->fpa);
+    pmReadout *outData = pmFPAviewThisReadout (myView, outFile->fpa);
     if (outData == NULL) {
-        pmChip *inChip = pmFPAviewThisChip (view, inFile->fpa);
-        pmChip *outChip = pmFPAviewThisChip (view, outFile->fpa);
+        pmChip *outChip = pmFPAviewThisChip (myView, outFile->fpa);
+        pmCell *outCell = pmFPAviewThisCell (myView, outFile->fpa);
 
-        pmChipCopyStructure (outChip, inChip, binning->nXbin, binning->nYbin);
-        outData = pmFPAviewThisReadout (view, outFile->fpa);
+        pmChipCopyStructure (outChip, refChip, 1, 1);
+
+        outData = pmReadoutAlloc (outCell);
         assert (outData != NULL);
+
+        // outData = pmFPAviewThisReadout (myView, outFile->fpa);
+        // assert (outData != NULL);
     }
 
     // generate the output (fine-scale) image array
-    psImageRecycle (outData->image, binning->nXfine, binning->nYfine, PS_TYPE_F32);
+    outData->image = psImageRecycle (outData->image, binning->nXfine, binning->nYfine, PS_TYPE_F32);
 
     // linear interpolation to full fine scale
-    if (!psImageUnbin (outData->image, inData->image, binning)) {
+    if (!psImageUnbin (outData->image, inImage, binning)) {
         psError (PS_ERR_UNKNOWN, true, "failed to unbin image");
         psFree (binning);