Changeset 6734 for branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c

Timestamp:

Mar 30, 2006, 10:08:30 AM (20 years ago)

Author:

Paul Price

Message:

pmFPACopy now working

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c (modified) (17 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c

@@ -117 +117 @@
             *xSize = MAX(trimsec->x1, *xSize);
             *ySize = MAX(trimsec->y1, *ySize);
+        } else {
+            psFree(cellsIter);
+            return false;
         }
         psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias sections
@@ -126 +129 @@
                     *xSize = MAX(biassec->x1, *xSize);
                     *ySize = MAX(biassec->y1, *ySize);
+                } else {
+                    psFree(biassecsIter);
+                    psFree(cellsIter);
+                    return false;
                 }
             }
@@ -133 +140 @@
     psFree(cellsIter);
 
-    return (*xSize == 0 || *ySize == 0);
+    return (*xSize != 0 && *ySize != 0);
 }
 
@@ -145 +152 @@
     switch (readdir) {
     case 1:                           // Read direction is rows
-        region = psRegionSet(*position, image->row0, *position + image->numCols,
+        region = psRegionSet(*position, *position + image->numCols, image->row0,
                              image->row0 + image->numRows);
         *position += image->numCols;
         break;
     case 2:                           // Read direction is columns
-        region = psRegionSet(image->col0, *position, image->col0 + image->numCols,
+        region = psRegionSet(image->col0, image->col0 + image->numCols, *position,
                              *position + image->numRows);
         *position += image->numRows;
@@ -209 +216 @@
     int numCells = targets->n;          // Number of cells
     int cellNum = 0;                    // The cell number
-    int position;                       // Position on the image
+    int position = 0;                   // Position on the image
     bool mdok = true;                   // Status of MD lookup
 
@@ -218 +225 @@
     while ((target = psListGetAndIncrement(targetsIter)) && (source = psListGetAndIncrement(sourcesIter)) &&
             !done) {
-        if (cellNum < numCells/2) {
+        if (cellNum <= numCells/2 - 1) {
             doBiasSections(&position, target, source);
+            cellNum++;
         } else {
             done = true;
@@ -249 +257 @@
 
     // A final run through to do the RHS biases
-    psListIteratorSet(targetsIter, numCells/2);
-    psListIteratorSet(sourcesIter, numCells/2);
+    psListIteratorSet(targetsIter, cellNum);
+    psListIteratorSet(sourcesIter, cellNum);
     while ((target = psListGetAndIncrement(targetsIter)) && (source = psListGetAndIncrement(sourcesIter))) {
         doBiasSections(&position, target, source);
@@ -299 +307 @@
     // Get the size of the HDU, either from existing trimsec and biassec, or generate these and try again
     int xSize = 0, ySize = 0;           // Size of HDU
-    if (!sizeHDU(&xSize, &ySize, targetCells) || !(generateTrimBias(targetCells, sourceCells) &&
+    #if 1
+
+    if (!sizeHDU(&xSize, &ySize, targetCells) && !(generateTrimBias(targetCells, sourceCells) &&
             sizeHDU(&xSize, &ySize, targetCells))) {
         psError(PS_ERR_IO, true, "Unable to determine size of HDU!\n");
         return false;
     }
+    #else
+    if (!sizeHDU(&xSize, &ySize, targetCells)) {
+        if (generateTrimBias(targetCells, sourceCells)) {
+            if (!sizeHDU(&xSize, &ySize, targetCells)) {
+                psError(PS_ERR_IO, true, "Unable to determine size of HDU!\n");
+                return false;
+            }
+        } else {
+            psError(PS_ERR_IO, true, "Unable to determine size of HDU!\n");
+            return false;
+        }
+    }
+    #endif
 
     hdu->images = psArrayAlloc(numReadouts);
@@ -314 +337 @@
     return true;
 }
-
-
-#define UPDATE_CASE(TYPENAME,TYPE) \
-case TYPENAME: targetItem->data.TYPE = sourceItem->data.TYPE; \
-break;
-
-// Update a particular "concept" for the target cell from the source cell
-static bool updateConcept(pmCell *target, // Target cell
-                          const pmCell *source, // Source cell
-                          const char *concept // Concept name
-                         )
-{
-    psMetadataItem *targetItem = psMetadataLookup(target->concepts, concept); // Concept from the target
-    psMetadataItem *sourceItem = psMetadataLookup(source->concepts, concept); // Concept from the source
-
-    switch (targetItem->type) {
-        UPDATE_CASE(PS_TYPE_S32, S32);
-        UPDATE_CASE(PS_TYPE_F32, F32);
-        UPDATE_CASE(PS_TYPE_F64, F64);
-        UPDATE_CASE(PS_DATA_STRING, V);
-    default:
-        psLogMsg(__func__, PS_LOG_WARN, "Unsupported type (%x) for concept %s --- ignored.\n",
-                 targetItem->type, concept);
-        return false;
-    }
-    return true;
-}
-
 
 // Copy pixels from a target image to a source image, with flips
@@ -386 +381 @@
         return false;
     }
+
+    #if 1
+    // Copy any headers
+    if (target->hdu && !target->hdu->phu) {
+        pmHDU *sourceHDU = pmHDUFromFPA(source);
+        target->hdu->header = psMetadataCopy(target->hdu->header, sourceHDU->header);
+    }
+    #endif
 
     int numChips = 0;                   // Number of chips copied
@@ -400 +403 @@
     }
 
+    // Update the concepts
+    psMetadataCopy(target->concepts, source->concepts);
+
     return numChips;
 }
@@ -417 +423 @@
         return false;
     }
+
+    #if 1
+    // Copy any headers
+    if (target->hdu && !target->hdu->phu) {
+        pmHDU *sourceHDU = pmHDUFromChip(source);
+        target->hdu->header = psMetadataCopy(target->hdu->header, sourceHDU->header);
+    }
+    #endif
 
     int numCells = 0;                   // Number of cells copied
@@ -431 +445 @@
     }
 
+    // Update the concepts
+    psMetadataCopy(target->concepts, source->concepts);
+
     return numCells;
 
@@ -442 +459 @@
     assert(source);
 
-    psArray *targetReadouts = target->readouts; // The target readouts
     psArray *sourceReadouts = source->readouts; // The source readouts
-    if (targetReadouts->n != sourceReadouts->n) {
-        psError(PS_ERR_IO, true, "Number of source readouts (%d) differs from the number of target readouts "
-                "(%d)\n", sourceReadouts->n, targetReadouts->n);
-        return false;
-    }
-    int numReadouts = targetReadouts->n; // Number of readouts copied
+    int numReadouts = sourceReadouts->n; // Number of readouts copied
+
+    #if 1
+    // Copy any headers
+    if (target->hdu && !target->hdu->phu) {
+        pmHDU *sourceHDU = pmHDUFromCell(source);
+        target->hdu->header = psMetadataCopy(target->hdu->header, sourceHDU->header);
+    }
+    #endif
 
     pmHDU *hdu = pmHDUFromCell(target); // The target HDU; we need to fix this up
-    if (! hdu->images) {
+    if (!hdu->images) {
         generateHDU(target, source);
     }
-
-    // Need to check CELL.X0, CELL.Y0, CELL.XBIN, CELL.YBIN should be unchanged; we can check this by
-    // setting the values and leaving it to the pmConceptWrite functions to do the checking against the
-    // camera configuration when it comes time to write them out.
-    updateConcept(target, source, "CELL.X0");
-    updateConcept(target, source, "CELL.Y0");
-    updateConcept(target, source, "CELL.XBIN");
-    updateConcept(target, source, "CELL.YBIN");
+    if (!hdu->header) {
+        hdu->header = psMetadataAlloc();
+    }
 
     // Need to check/change CELL.XPARITY and CELL.YPARITY
     bool xFlip = (psMetadataLookupS32(NULL, target->concepts, "CELL.XPARITY") !=
-                  psMetadataLookupS32(NULL, target->concepts, "CELL.XPARITY")); // Switch parity in x?
+                  psMetadataLookupS32(NULL, source->concepts, "CELL.XPARITY")); // Switch parity in x?
     bool yFlip = (psMetadataLookupS32(NULL, target->concepts, "CELL.YPARITY") !=
-                  psMetadataLookupS32(NULL, target->concepts, "CELL.YPARITY")); // Switch parity in y?
+                  psMetadataLookupS32(NULL, source->concepts, "CELL.YPARITY")); // Switch parity in y?
 
     bool mdok = true;                   // Status of MD lookup
@@ -482 +496 @@
     }
 
-    for (int i = 0; i < targetReadouts->n; i++) {
+    for (int i = 0; i < numReadouts; i++) {
         pmReadout *sourceReadout = sourceReadouts->data[i]; // The source readout
         psImage *sourceImage = sourceReadout->image; // The source image
-        pmReadout *targetReadout = targetReadouts->data[i]; // The target readout
+        pmReadout *targetReadout = pmReadoutAlloc(target); // The target readout; this adds it to the cell
         if (sourceImage->numCols != trimsec->x1 - trimsec->x0 ||
                 sourceImage->numRows != trimsec->y1 - trimsec->y0) {
@@ -500 +514 @@
         psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator
         psRegion *biassec = NULL;       // Bias section from iteration
-        while ((biassec = psListGetAndIncrement(biassecsIter))) {
+        psListIterator *biasIter = psListIteratorAlloc(sourceReadout->bias, PS_LIST_HEAD, false); // Iterator
+        psImage *bias = NULL;           // Bias image from iteration
+        while ((biassec = psListGetAndIncrement(biassecsIter)) && (bias = psListGetAndIncrement(biasIter))) {
             if (psRegionIsBad(*biassec)) {
                 psString biassecString = psRegionToString(*biassec); // String for bias section
@@ -507 +523 @@
                 continue;
             }
-            if (sourceImage->numCols != biassec->x1 - biassec->x0 ||
-                    sourceImage->numRows != biassec->y1 - biassec->y0) {
+            if (bias->numCols != biassec->x1 - biassec->x0 ||
+                    bias->numRows != biassec->y1 - biassec->y0) {
                 psString biassecString = psRegionToString(*biassec); // String with the bias section
                 psLogMsg(__func__, PS_LOG_WARN, "Source image size (%dx%d) for readout %d doesn't match "
-                         "CELL.BIASSEC for target (%s) -- ignored.\n", sourceImage->numCols,
-                         sourceImage->numRows, i, biassecString);
+                         "CELL.BIASSEC for target (%s) -- ignored.\n", bias->numCols, bias->numRows, i,
+                         biassecString);
                 psFree(biassecString);
             } else {
-                copyPixels(hdu->images->data[i], sourceImage, *biassec, xFlip, yFlip);
-                psImage *bias = psMemIncrRefCounter(psImageSubset(hdu->images->data[i], *biassec));
-                psListAdd(targetReadout->bias, PS_LIST_TAIL, bias);
-                psFree(bias);           // Drop reference
+                copyPixels(hdu->images->data[i], bias, *biassec, xFlip, yFlip);
+                psImage *newBias = psMemIncrRefCounter(psImageSubset(hdu->images->data[i], *biassec));
+                psListAdd(targetReadout->bias, PS_LIST_TAIL, newBias);
+                psFree(newBias);        // Drop reference
             }
         }
         psFree(biassecsIter);
-
+        psFree(biasIter);
+    }
+
+    // Copy the remaining "concepts" over
+    psMetadataIterator *conceptsIter = psMetadataIteratorAlloc(source->concepts, PS_LIST_HEAD, NULL);
+    psMetadataItem *conceptItem = NULL; // Item from iteration
+    while ((conceptItem = psMetadataGetAndIncrement(conceptsIter))) {
+        psString name = conceptItem->name; // Name of concept
+        if (strcmp(name, "CELL.TRIMSEC") != 0 && strcmp(name, "CELL.BIASSEC") != 0 &&
+                strcmp(name, "CELL.XPARITY") != 0 && strcmp(name, "CELL.YPARITY") != 0) {
+            psMetadataAddItem(target->concepts, conceptItem, PS_LIST_TAIL, PS_META_REPLACE);
+        }
+    }
+
+    // Need to update CELL.X0 and CELL.Y0 if we flipped
+    if (xFlip) {
+        psMetadataItem *xZero = psMetadataLookup(target->concepts, "CELL.X0"); // CELL.X0
+        pmReadout *readout = target->readouts->data[0]; // A representative readout
+        xZero->data.S32 -= readout->image->numCols - 1;
+    }
+    if (yFlip) {
+        psMetadataItem *yZero = psMetadataLookup(target->concepts, "CELL.Y0"); // CELL.Y0
+        pmReadout *readout = target->readouts->data[0]; // A representative readout
+        yZero->data.S32 -= readout->image->numRows - 1;
     }