Changeset 5371 for trunk/archive/scripts/src/phase2/pmFPAConstruct.c

Timestamp:

Oct 18, 2005, 4:19:41 PM (21 years ago)

Author:

Paul Price

Message:

Current state before I go on holiday. Not sure if it works or not. Not current for pslib8.

File:

• trunk/archive/scripts/src/phase2/pmFPAConstruct.c (modified) (9 diffs)

trunk/archive/scripts/src/phase2/pmFPAConstruct.c

@@ -88 +88 @@
                 psString extName = contentItem->name; // The name of the extension
                 pmChip *chip = pmChipAlloc(fpa, extName); // The chip
-                chip->private = p_pmHDUAlloc(extName); // Prepare chip to receive FITS data
+                chip->data = pmPixelDataAlloc(extName); // Prepare chip to receive FITS data
                 if (contentItem->type != PS_META_STR) {
                     psLogMsg(__func__, PS_LOG_WARN, "Type of content item (%x) is not string: ignored\n",
@@ -146 +146 @@
                     pmCell *cell = pmCellAlloc(chip, cellData, extName); // The cell
 //                  psFree(cellData);
-                    cell->private = p_pmHDUAlloc(extName); // Prepare cell to receive FITS data
+                    cell->data = pmPixelDataAlloc(extName); // Prepare cell to receive FITS data
 
                     psFree(chip);
@@ -157 +157 @@
         } else if (strcasecmp(extType, "NONE") == 0) {
             // No extensions; Content contains metadata, each entry is a chip with its component cells
-            fpa->private = p_pmHDUAlloc("PHU"); // Prepare FPA to receive FITS data
+            fpa->data = pmPixelDataAlloc("PHU"); // Prepare FPA to receive FITS data
             while (contentItem = psMetadataGetAndIncrement(contentsIter)) {
                 psString chipName = contentItem->name; // The name of the chip
@@ -196 +196 @@
         if (strcasecmp(extType, "NONE") == 0) {
             // There are no extensions --- only the PHU
-            chip->private = p_pmHDUAlloc("PHU");
+            chip->data = pmPixelDataAlloc("PHU");
 
             const char *contents = psMetadataLookupString(&mdStatus, camera, "CONTENTS");
@@ -247 +247 @@
                 pmCell *cell = pmCellAlloc(chip, cellData, extName); // The cell
 //              psFree(cellData);
-                cell->private = p_pmHDUAlloc(extName); // Prepare cell to receive FITS data
+                cell->data = pmPixelDataAlloc(extName); // Prepare cell to receive FITS data
             } // Iterating through contents
             psFree(contentsIter);
@@ -273 +273 @@
 {
     psTrace(__func__, 0, "FPA:\n");
-    if (fpa->private) {
-        psTrace(__func__, 1, "---> FPA is extension %s.\n", fpa->private->extname);
-        if (! fpa->private->pixels) {
-            psTrace(__func__, 1, "---> NO PIXELS for extension %s\n", fpa->private->extname);
+    if (fpa->data) {
+        psTrace(__func__, 1, "---> FPA is extension %s.\n", fpa->data->extname);
+        if (! fpa->data->images) {
+            psTrace(__func__, 1, "---> NO PIXELS for extension %s\n", fpa->data->extname);
         }
     }
@@ -285 +285 @@
         psTrace(__func__, 1, "Chip: %d\n", i);
         pmChip *chip = chips->data[i]; // The chip
-        if (chip->private) {
-            psTrace(__func__, 2, "---> Chip is extension %s.\n", chip->private->extname);
-            if (! chip->private->pixels) {
-                psTrace(__func__, 2, "---> NO PIXELS for extension %s\n", chip->private->extname);
+        if (chip->data) {
+            psTrace(__func__, 2, "---> Chip is extension %s.\n", chip->data->extname);
+            if (! chip->data->images) {
+                psTrace(__func__, 2, "---> NO PIXELS for extension %s\n", chip->data->extname);
             }
         }
@@ -296 +296 @@
             psTrace(__func__, 2, "Cell: %d\n", j);
             pmCell *cell = cells->data[j]; // The cell
-            if (cell->private) {
-                psTrace(__func__, 3, "---> Cell is extension %s.\n", cell->private->extname);
-                if (! cell->private->pixels) {
-                    psTrace(__func__, 3, "---> NO PIXELS for extension %s\n", cell->private->extname);
+            if (cell->data) {
+                psTrace(__func__, 3, "---> Cell is extension %s.\n", cell->data->extname);
+                if (! cell->data->images) {
+                    psTrace(__func__, 3, "---> NO PIXELS for extension %s\n", cell->data->extname);
                 }
             }
@@ -311 +311 @@
                         image->numCols, image->row0, image->row0 + image->numRows, image->numCols,
                         image->numRows);
-                psList *overscans = readout->overscans; // The list of overscans
-                psListIterator *overscansIter = psListIteratorAlloc(overscans, PS_LIST_HEAD, false);
-                while (image = psListGetAndIncrement(overscansIter)) {
-                    psTrace(__func__, 4, "Overscan: [%d:%d,%d:%d] (%dx%d)\n", image->col0, image->col0 + 
-                            image->numCols, image->row0, image->row0 + image->numRows, image->numCols,
-                            image->numRows);
-                }
-                psFree(overscansIter);
-
             } // Iterating over cell
         } // Iterating over chip