Changeset 6586

Timestamp:

Mar 14, 2006, 4:37:16 PM (20 years ago)

Author:

Paul Price

Message:

Adding back in pmCellSetWeights

Location:

branches/rel10_ifa/psModules/src/astrom

Files:

• Makefile.am (modified) (2 diffs)
• pmFPA.c (modified) (2 diffs)
• pmFPAMaskWeight.c (added)
• pmFPAMaskWeight.h (added)

branches/rel10_ifa/psModules/src/astrom/Makefile.am

@@ -6 +6 @@
         pmFPA.c \
         pmFPAConstruct.c \
+        pmFPAMaskWeight.c \
         pmFPARead.c \
         pmHDU.c \
@@ -26 +27 @@
         pmFPA.h \
         pmFPAConstruct.h \
+        pmFPAMaskWeight.h \
         pmFPARead.h \
         pmHDU.h \

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

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.1.4.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-03-09 03:08:08 $
+*  @version $Revision: 1.1.4.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-15 02:37:16 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -601 +601 @@
 }
 
-#if 0
-bool pmCellSetWeights(pmCell *cell // Cell for which to set weights
-                     )
-{
-    float gain = psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN"); // Cell gain
-    float readnoise = psMetadataLookupF32(NULL, cell->concepts, "CELL.READNOISE"); // Cell read noise
-    psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC"); // Trim section
-    float saturation = psMetadataLookupF32(NULL, cell->concepts, "CELL.SATURATION"); // Saturation level
-    float bad = psMetadataLookupF32(NULL, cell->concepts, "CELL.BAD"); // Bad level
-
-    pmHDU *hdu = cell->hdu;             // The data unit, containing the weight and mask originals
-    if (!hdu) {
-        pmChip *chip = cell->parent;    // The parent chip
-        if (chip->hdu) {
-            hdu = chip->hdu;
-        } else {
-            pmFPA *fpa = chip->parent;  // The parent FPA
-            hdu = fpa->hdu;
-            if (!hdu) {
-                psError(PS_ERR_UNKNOWN, true, "Unable to find the HDU in the hierarchy!\n");
-                return false;
-            }
-        }
-    }
-
-    psArray *pixels = hdu->images;      // Array of images
-    psArray *weights = hdu->weights;    // Array of weight images
-    psArray *masks = hdu->masks;        // Array of mask images
-    // Generate the weights and masks if required
-    if (! weights) {
-        weights = psArrayAlloc(pixels->n);
-        for (int i = 0; i < pixels->n; i++) {
-            psImage *image = pixels->data[i];
-            weights->data[i] = psImageAlloc(image->numCols, image->numRows, PS_TYPE_F32);
-            psImageInit(weights->data[i], 0.0);
-        }
-        hdu->weights = weights;
-    }
-    if (! masks) {
-        masks = psArrayAlloc(pixels->n);
-        for (int i = 0; i < pixels->n; i++) {
-            psImage *image = pixels->data[i];
-            masks->data[i] = psImageAlloc(image->numCols, image->numRows, PS_TYPE_U8);
-            psImageInit(masks->data[i], 0);
-        }
-        hdu->masks = masks;
-    }
-
-    // Set the pixels
-    psArray *readouts = cell->readouts; // Array of readouts
-    for (int i = 0; i < readouts->n; i++) {
-        pmReadout *readout = readouts->data[i]; // The readout of interest
-
-        if (! readout->weight) {
-            readout->weight = psMemIncrRefCounter(psImageSubset(weights->data[i], *trimsec));
-        }
-        if (! readout->mask) {
-            readout->mask = psMemIncrRefCounter(psImageSubset(masks->data[i], *trimsec));
-        }
-
-        // Set up the mask
-        psImage *image = readout->image;// Pixels
-        psImage *mask = readout->mask;  // Mask image
-        for (int i = 0; i < image->numRows; i++) {
-            for (int j = 0; j < image->numCols; j++) {
-                if (image->data.F32[i][j] > saturation) {
-                    mask->data.U8[i][j] = PM_MASK_SAT;
-                }
-                if (image->data.F32[i][j] < bad) {
-                    mask->data.U8[i][j] = PM_MASK_BAD;
-                }
-            }
-        }
-
-        // Set weight image to the variance = g*f + rn^2
-        psBinaryOp(readout->weight, image, "/", psScalarAlloc(gain, PS_TYPE_F32));
-        psBinaryOp(readout->weight, readout->weight, "+",
-                   psScalarAlloc(readnoise*readnoise/gain/gain, PS_TYPE_F32));
-    }
-
-    return true;
-}
-
-#endif
+