Changeset 7432

Timestamp:

Jun 8, 2006, 10:40:36 AM (20 years ago)

Author:

magnier

Message:

mask type (was F32), parent reference in finding readout, mask and weight pointed to image in loop

File:

• trunk/psModules/src/camera/pmFPAMaskWeight.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -34 +34 @@
             continue;
         }
-        masks->data[i] = psImageAlloc(image->numCols, image->numRows, PS_TYPE_F32);
+        masks->data[i] = psImageAlloc(image->numCols, image->numRows, PS_TYPE_U8);
     }
 
@@ -78 +78 @@
     long index = -1;                    // Index of the readout
     for (long i = 0; i < hdu->images->n && index == -1; i++) {
-        if (hdu->images->data[i] == readout->image) {
+        if (hdu->images->data[i] == readout->image->parent) {
             index = i;
         }
@@ -135 +135 @@
         }
 
-        psImage *mask = psImageSubset(hdu->images->data[index], *trimsec); // The mask pixels
+        psImage *mask = psImageSubset(hdu->masks->data[index], *trimsec); // The mask pixels
         if (!mask) {
             psString trimsecString = psRegionToString(*trimsec);
@@ -207 +207 @@
         }
 
-        psImage *weight = psImageSubset(hdu->images->data[index], *trimsec); // The weight pixels
+        psImage *weight = psImageSubset(hdu->weights->data[index], *trimsec); // The weight pixels
         if (!weight) {
             psString trimsecString = psRegionToString(*trimsec);