Changeset 7629

Timestamp:

Jun 21, 2006, 6:25:28 PM (20 years ago)

Author:

Paul Price

Message:

Fixing mosaicking of binned images: cell concepts (CELL.XBIN and CELL.YBIN) weren't being set for the input and output images.

Location:

trunk/ppImage/src

Files:

• ppImageParseCamera.c (modified) (1 diff)
• ppImageRebinReadout.c (modified) (2 diffs)

trunk/ppImage/src/ppImageParseCamera.c

@@ -72 +72 @@
     pmFPAfile *bin2 = pmFPAfileDefineFromFPA (config, byChip->fpa, options->xBin2, options->yBin2, "PPIMAGE.BIN2");
 
-    // set the CELL.XBIN and CELL.YBIN for the output mosaiced FPAs
-    for (int i = 0; i < byFPA1->fpa->chips->n; i++) {
-        pmChip *chip = byFPA1->fpa->chips->data[i];
-        for (int j = 0; j < chip->cells->n; j++) {
-            pmCell *cell = chip->cells->data[j];
-            psMetadataAddF32 (cell->concepts, PS_LIST_TAIL, "CELL.XBIN", PS_META_REPLACE, "", options->xBin1);
-            psMetadataAddF32 (cell->concepts, PS_LIST_TAIL, "CELL.YBIN", PS_META_REPLACE, "", options->yBin1);
-        }
-    }
-    for (int i = 0; i < byFPA2->fpa->chips->n; i++) {
-        pmChip *chip = byFPA2->fpa->chips->data[i];
-        for (int j = 0; j < chip->cells->n; j++) {
-            pmCell *cell = chip->cells->data[j];
-            psMetadataAddF32 (cell->concepts, PS_LIST_TAIL, "CELL.XBIN", PS_META_REPLACE, "", options->xBin2);
-            psMetadataAddF32 (cell->concepts, PS_LIST_TAIL, "CELL.YBIN", PS_META_REPLACE, "", options->yBin2);
-        }
-    }
-
     // bin1 and bin2 are used as carriers: input for byFPA1, byFPA2
     bin1->freeLevel = PM_FPA_LEVEL_FPA;

trunk/ppImage/src/ppImageRebinReadout.c

@@ -19 +19 @@
 
     while ((cell = pmFPAviewNextCell (view, inFile->fpa, 1)) != NULL) {
-        psLogMsg ("ppImageRebinChip", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
-        if (! cell->process || ! cell->file_exists) { continue; }
+        psLogMsg ("ppImageRebinChip", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
+        if (! cell->process || ! cell->file_exists) { continue; }
 
-        // process each of the readouts
-        while ((inReadout = pmFPAviewNextReadout (view, inFile->fpa, 1)) != NULL) {
-            if (! inReadout->data_exists) { continue; }
+        // process each of the readouts
+        while ((inReadout = pmFPAviewNextReadout (view, inFile->fpa, 1)) != NULL) {
+            if (! inReadout->data_exists) { continue; }
 
-            outReadout = pmFPAviewThisReadout (view, outFile->fpa);
+            outReadout = pmFPAviewThisReadout (view, outFile->fpa);
 
-            // run the rebin code
-            ppImageRebinReadout (outReadout, inReadout, outFile);
-        }
+            // run the rebin code
+            ppImageRebinReadout (outReadout, inReadout, outFile);
+        }
+
+        // Get the original values for the binning
+        bool mdok = true;               // Status of MD lookup
+        int xBin = psMetadataLookupS32(&mdok, cell->concepts, "CELL.XBIN"); // The binning in x
+        if (!mdok || xBin <= 0) {
+            psLogMsg(__func__, PS_LOG_WARN, "CELL.XBIN is not set --- assuming 1.\n");
+            xBin = 1;
+        }
+        int yBin = psMetadataLookupS32(&mdok, cell->concepts, "CELL.YBIN"); // The binning in y
+        if (!mdok || yBin <= 0) {
+            psLogMsg(__func__, PS_LOG_WARN, "CELL.YBIN is not set --- assuming 1.\n");
+            yBin = 1;
+        }
+
+        // Update the concepts with the new values for the binning
+        pmCell *outCell = pmFPAviewThisCell(view, outFile->fpa); // The output cell
+        psMetadataItem *binItem = psMetadataLookup(outCell->concepts, "CELL.XBIN");
+        binItem->data.S32 = xBin * outFile->xBin;
+        binItem = psMetadataLookup(outCell->concepts, "CELL.YBIN");
+        binItem->data.S32 = yBin * outFile->yBin;
     }
     return true;
@@ -53 +73 @@
     // do the rebinning by hand, mean only for test
     for (int yOut = 0; yOut < output->image->numRows; yOut++) {
-        for (int xOut = 0; xOut < output->image->numCols; xOut++) {
-            value = 0;
-            nPix = 0;
-            for (int yIn = yOut * dY; (yIn < yOut * dY + dY) && (yIn < nY); yIn ++) {
-                for (int xIn = xOut * dX; (xIn < xOut * dX + dX) && (xIn < nX); xIn ++) {
-                    value += input->image->data.F32[yIn][xIn];
-                    nPix ++;
-                }
-            }
-            output->image->data.F32[yOut][xOut] = value / nPix;
-        }
+        for (int xOut = 0; xOut < output->image->numCols; xOut++) {
+            value = 0;
+            nPix = 0;
+            for (int yIn = yOut * dY; (yIn < yOut * dY + dY) && (yIn < nY); yIn ++) {
+                for (int xIn = xOut * dX; (xIn < xOut * dX + dX) && (xIn < nX); xIn ++) {
+                    value += input->image->data.F32[yIn][xIn];
+                    nPix ++;
+                }
+            }
+            output->image->data.F32[yOut][xOut] = value / nPix;
+        }
     }