Changeset 6080 for branches/eam_rel9_p0/psModules/src/astrom/pmFPARead.c

Timestamp:

Jan 19, 2006, 11:47:06 PM (21 years ago)

Author:

Paul Price

Message:

Readouts now contain a subimage

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmFPARead.c (modified) (8 diffs)

branches/eam_rel9_p0/psModules/src/astrom/pmFPARead.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <strings.h>
+#include <assert.h>
 #include "pslib.h"
 
@@ -105 +106 @@
 {
     psArray *images = hdu->images;      // Array of images (each of which is a readout)
-    psArray *masks = hdu->masks;        // Array of masks (one for each readout)
+
+    psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC");
+    psList *biassecs = psMetadataLookupPtr(NULL, cell->concepts, "CELL.BIASSEC");
+
     // Iterate over each of the image planes
     for (int i = 0; i < images->n; i++) {
         psImage *image = images->data[i]; // The i-th plane
-        psImage *mask = NULL;           // The mask
-        if (masks) {
-            mask = masks->data[i];
-        }
-
         pmReadout *readout = pmReadoutAlloc(cell);
-        readout->image = image;
-        readout->mask = mask;
-        psFree(readout);
+
+        readout->image = psImageSubset(image, *trimsec); // The image corresponding to the trim region
+
+        // Get the list of overscans
+        psListIterator *iter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator
+        psRegion *biassec = NULL;       // A BIASSEC region from the list
+        while ((biassec = psListGetAndIncrement(iter))) {
+            psImage *overscan = psImageSubset(image, *biassec);
+            psListAdd(readout->bias, PS_LIST_TAIL, overscan);
+            psFree(overscan);
+        }
+        psFree(iter);
+
+        readout->mask = NULL;
+        readout->weight = NULL;
+
+        psFree(readout);                // Drop reference
     }
 
@@ -164 +177 @@
         pmChip *chip = chips->data[i]; // The chip
 
-        // Only read chips marked to "process"
-        if (! chip->process) {
+        // Only read chips marked to "read"
+        if (! chip->process || chip->exists) {
             psTrace(__func__, 2, "Ignoring chip %d...\n", i);
             continue;
@@ -187 +200 @@
             pmCell *cell = cells->data[j]; // The cell
 
-            // Only read cells marked to "process"
-            if (! cell->process) {
+            // Only read cells marked to "read"
+            if (! cell->process || cell->exists) {
                 psTrace(__func__, 3, "Ignoring chip %d...\n", i);
                 continue;
@@ -400 +413 @@
     for (int chipNum = 0; chipNum < chips->n; chipNum++) {
         pmChip *chip = chips->data[chipNum]; // The current chip of interest
-        if (chip->process) {
+        if (chip->process && !chip->exists) {
             if (chip->hdu) {
                 hdu = chip->hdu;
@@ -407 +420 @@
             for (int cellNum = 0; cellNum < cells->n; cellNum++) {
                 pmCell *cell = cells->data[cellNum]; // The current cell of interest
-                if (cell->process) {
+                if (cell->process && !cell->exists) {
                     if (cell->hdu) {
                         hdu = cell->hdu;
@@ -538 +551 @@
     for (int chipNum = 0; chipNum < chips->n; chipNum++) {
         pmChip *chip = chips->data[chipNum]; // The current chip of interest
-        if (chip->process) {
+        if (chip->process && !chip->exists) {
             if (chip->hdu) {
                 hdu = chip->hdu;
@@ -545 +558 @@
             for (int cellNum = 0; cellNum < cells->n; cellNum++) {
                 pmCell *cell = cells->data[cellNum]; // The current cell of interest
-                if (cell->process) {
+                if (cell->process && !cell->exists) {
                     if (cell->hdu) {
                         hdu = cell->hdu;