Changeset 7168 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

May 22, 2006, 2:23:08 PM (20 years ago)

Author:

Paul Price

Message:

Adding pmHDUGenerate to make an HDU (image) from the cells contained below. Altered pmFPACopy to use pmHDUGenerate functions. The motivation for pmHDUGenerate is that when we go through an FPA bit by bit, creating an output FPA, we don't know the size of the resultant output images until we're done with the whole lot. So we simply create the cells, and call pmHDUGenerateFromFPA (etc) to generate the HDU image which is then written out. It takes care of the TRIMSEC, BIASSEC, etc.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (6 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -10 +10 @@
 #include "pmFPAview.h"
 #include "pmFPAUtils.h"
+#include "pmHDUUtils.h"
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -690 +691 @@
     psTrace(__func__, 1, "FPA:\n");
     if (fpa->hdu) {
-        psTrace(__func__, 2, "---> FPA is extension %s.\n", fpa->hdu->extname);
-        if (! fpa->hdu->images) {
-            psTrace(__func__, 2, "---> NO PIXELS read in for extension %s\n", fpa->hdu->extname);
-        }
-        if (header) {
-            if (fpa->hdu->header) {
-                psTrace(__func__, 2, "---> Header:\n");
-                psMetadataPrint(fpa->hdu->header, 8);
-            } else {
-                psTrace(__func__, 2, "---> NO HEADER read in for extension %s\n", fpa->hdu->extname);
-            }
-        }
+        pmHDUPrint(fpa->hdu, 2, header);
     }
     if (concepts) {
@@ -713 +703 @@
         pmChip *chip = chips->data[i]; // The chip
         if (chip->hdu) {
-            psTrace(__func__, 4, "---> Chip is extension %s.\n", chip->hdu->extname);
-            if (header) {
-                if (chip->hdu->header) {
-                    psTrace(__func__, 4, "---> Header:\n");
-                    psMetadataPrint(chip->hdu->header, 8);
-                } else {
-                    psTrace(__func__, 4, "---> NO HEADER read in for extension %s\n", chip->hdu->extname);
-                }
-            }
-            if (! chip->hdu->images) {
-                psTrace(__func__, 4, "---> NO PIXELS read in for extension %s\n", chip->hdu->extname);
-            }
+            pmHDUPrint(chip->hdu, 4, header);
         }
         if (concepts) {
@@ -736 +715 @@
             pmCell *cell = cells->data[j]; // The cell
             if (cell->hdu) {
-                psTrace(__func__, 6, "---> Cell is extension %s.\n", cell->hdu->extname);
-                if (header) {
-                    if (cell->hdu->header) {
-                        psTrace(__func__, 6, "---> Header:\n");
-                        psMetadataPrint(cell->hdu->header, 8);
-                    } else {
-                        psTrace(__func__, 6, "---> NO HEADER read in for extension %s\n", cell->hdu->extname);
-                    }
-                }
-                if (! cell->hdu->images) {
-                    psTrace(__func__, 6, "---> NO PIXELS read in for extension %s\n", cell->hdu->extname);
-                }
+                pmHDUPrint(cell->hdu, 6, header);
             }
             if (concepts) {
@@ -753 +721 @@
             }
 
-            psTrace(__func__, 7, "Readouts:\n");
             psArray *readouts = cell->readouts; // Array of readouts
             for (int k = 0; k < readouts->n; k++) {
                 pmReadout *readout = readouts->data[k]; // The readout
-                psTrace(__func__, 8, "row0: %d\n", readout->row0);
+                psTrace(__func__, 6, "Readout %d:\n", k);
+                psTrace(__func__, 7, "row0: %d\n", readout->row0);
+                psTrace(__func__, 7, "col0: %d\n", readout->col0);
                 psImage *image = readout->image; // The image
                 psList *bias = readout->bias; // The list of bias images
                 if (image) {
-                    psTrace(__func__, 8, "Image: [%d:%d,%d:%d] (%dx%d)\n", image->col0, image->col0 +
+                    psTrace(__func__, 7, "Image: [%d:%d,%d:%d] (%dx%d)\n", image->col0, image->col0 +
                             image->numCols, image->row0, image->row0 + image->numRows, image->numCols,
                             image->numRows);
@@ -769 +738 @@
                     psImage *biasImage = NULL; // Bias image from iteration
                     while ((biasImage = psListGetAndIncrement(biasIter))) {
-                        psTrace(__func__, 8, "Bias:  [%d:%d,%d:%d] (%dx%d)\n", biasImage->col0,
+                        psTrace(__func__, 7, "Bias:  [%d:%d,%d:%d] (%dx%d)\n", biasImage->col0,
                                 biasImage->col0 + biasImage->numCols, biasImage->row0,
                                 biasImage->row0 + biasImage->numRows, biasImage->numCols, biasImage->numRows);