Changeset 7715

Timestamp:

Jun 27, 2006, 6:03:35 PM (20 years ago)

Author:

Paul Price

Message:

Renaming pmReadoutSet{Mask,Weight} as pmReadoutGenerate{Mask,Weight}; adding pmReadoutSet{Mask,Weight}. These changes are in order to generate 'throwaway' masks and weights, in the case where we're using pmReadoutReadNext (which doesn't use the HDU).

Location:

trunk/psModules/src/camera

Files:

• pmFPAMaskWeight.c (modified) (9 diffs)
• pmFPAMaskWeight.h (modified) (1 diff)
• pmFPARead.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -90 +90 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutSetMask(pmReadout *readout // Readout for which to set mask
+bool pmReadoutSetMask(pmReadout *readout// Readout for which to set mask
                      )
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
+    PS_ASSERT_IMAGE_NON_NULL(readout->image, false);
 
     pmCell *cell = readout->parent;     // The parent cell
@@ -111 +112 @@
     psTrace(__func__, 5, "Saturation: %f, bad: %f\n", saturation, bad);
 
-    // Create the mask image if required
-    if (!readout->mask) {
-        psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
-        if (!mdok || psRegionIsNaN(*trimsec)) {
-            psError(PS_ERR_IO, true, "CELL.TRIMSEC is not set --- unable to set mask.\n");
-            return false;
-        }
-
-        pmHDU *hdu = pmHDUFromCell(cell);   // The HDU containing the cell's pixels
-        PS_ASSERT_PTR_NON_NULL(hdu, false);
-        if (!hdu->images && !pmHDUGenerateForCell(cell)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to generate HDU for cell.\n");
-            return false;
-        }
-
-        createParentMasks(hdu);
-
-        // Need to identify which readout we're working with....
-        long index = identifyReadout(hdu, readout); // Index of the readout
-        if (index == -1) {
-            psError(PS_ERR_UNKNOWN, true, "Unable to identify readout image in HDU.\n");
-            return false;
-        }
-
-        psImage *mask = psImageSubset(hdu->masks->data[index], *trimsec); // The mask pixels
-        if (!mask) {
-            psString trimsecString = psRegionToString(*trimsec);
-            psError(PS_ERR_UNKNOWN, false, "Unable to set mask from HDU with trimsec: %s.\n", trimsecString);
-            psFree(trimsecString);
-            return NULL;
-        }
-        psImageInit(mask, 0);
-        readout->mask = mask;
-    }
 
     // Set up the mask
     psImage *image = readout->image;    // The image pixels
+    if (!readout->mask) {
+        // Generate a (throwaway) mask image, if required
+        readout->mask = psImageAlloc(image->numCols, image->numRows, PS_TYPE_U8);
+    }
     psImage *mask = readout->mask;      // The mask pixels
     for (long i = 0; i < image->numRows; i++) {
@@ -163 +134 @@
 }
 
+bool pmReadoutGenerateMask(pmReadout *readout // Readout for which to generate mask
+                          )
+{
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+
+    pmCell *cell = readout->parent;     // The parent cell
+    bool mdok = true;                   // Status of MD lookup
+
+    // Create the mask image if required
+    if (!readout->mask) {
+        psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
+        if (!mdok || psRegionIsNaN(*trimsec)) {
+            psError(PS_ERR_IO, true, "CELL.TRIMSEC is not set --- unable to set mask.\n");
+            return false;
+        }
+
+        pmHDU *hdu = pmHDUFromCell(cell);   // The HDU containing the cell's pixels
+        PS_ASSERT_PTR_NON_NULL(hdu, false);
+        if (!hdu->images && !pmHDUGenerateForCell(cell)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to generate HDU for cell.\n");
+            return false;
+        }
+
+        createParentMasks(hdu);
+
+        // Need to identify which readout we're working with....
+        long index = identifyReadout(hdu, readout); // Index of the readout
+        if (index == -1) {
+            psError(PS_ERR_UNKNOWN, true, "Unable to identify readout image in HDU.\n");
+            return false;
+        }
+
+        psImage *mask = psImageSubset(hdu->masks->data[index], *trimsec); // The mask pixels
+        if (!mask) {
+            psString trimsecString = psRegionToString(*trimsec);
+            psError(PS_ERR_UNKNOWN, false, "Unable to set mask from HDU with trimsec: %s.\n", trimsecString);
+            psFree(trimsecString);
+            return false;
+        }
+        psImageInit(mask, 0);
+        readout->mask = mask;
+    }
+
+    return pmReadoutSetMask(readout);
+}
+
 bool pmReadoutSetWeight(pmReadout *readout // Readout for which to set weight
                        )
@@ -182 +199 @@
         return false;
     }
+
+    // Set weight image to the variance in ADU = f/g + rn^2
+    psImage *image = readout->image;    // The image pixels
+    readout->weight = (psImage*)psBinaryOp(readout->weight, image, "/", psScalarAlloc(gain, PS_TYPE_F32));
+    readout->weight = (psImage*)psBinaryOp(readout->weight, readout->weight, "+",
+                                           psScalarAlloc(readnoise*readnoise/gain/gain, PS_TYPE_F32));
+
+    return true;
+}
+
+bool pmReadoutGenerateWeight(pmReadout *readout // Readout for which to generate weight
+                            )
+{
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+
+    pmCell *cell = readout->parent;     // The parent cell
+    bool mdok = true;                   // Status of MD lookup
 
     // Create the weight image if required
@@ -213 +247 @@
                     trimsecString);
             psFree(trimsecString);
-            return NULL;
+            return false;
         }
         psImageInit(weight, 0);
@@ -219 +253 @@
     }
 
-    // Set weight image to the variance in ADU = f/g + rn^2
-    psImage *image = readout->image;    // The image pixels
-    psBinaryOp(readout->weight, image, "/", psScalarAlloc(gain, PS_TYPE_F32));
-    psBinaryOp(readout->weight, readout->weight, "+",
-               psScalarAlloc(readnoise*readnoise/gain/gain, PS_TYPE_F32));
-
-    return true;
-}
-
-bool pmCellSetMaskWeight(pmCell *cell // Cell for which to set weights
-                        )
+    return pmReadoutSetWeight(readout);
+}
+
+bool pmCellGenerateMaskWeight(pmCell *cell // Cell for which to set weights
+                             )
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -237 +265 @@
     for (int i = 0; i < readouts->n; i++) {
         pmReadout *readout = readouts->data[i]; // The readout
-        success |= pmReadoutSetMask(readout);
-        success |= pmReadoutSetWeight(readout);
+        success |= pmReadoutGenerateMask(readout);
+        success |= pmReadoutGenerateWeight(readout);
     }
 
@@ -244 +272 @@
 }
 
-bool pmReadoutSetMaskWeight(pmReadout *readout // Readout for which to set mask and weights
-                           )
+bool pmReadoutGenerateMaskWeight(pmReadout *readout // Readout for which to set mask and weights
+                                )
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -251 +279 @@
     bool success;
 
-    success |= pmReadoutSetMask(readout);
-    success |= pmReadoutSetWeight(readout);
+    success |= pmReadoutGenerateMask(readout);
+    success |= pmReadoutGenerateWeight(readout);
 
     return success;

trunk/psModules/src/camera/pmFPAMaskWeight.h

@@ -21 +21 @@
 } pmMaskValue;
 
+// These functions set an extant mask/weight (or create a throwaway one).
+// The throwaway case is intended for when the user is iterating using pmReadoutReadNext, in which case
+// the HDU can't be generated
 bool pmReadoutSetMask(pmReadout *readout // Readout for which to set mask
                      );
 bool pmReadoutSetWeight(pmReadout *readout // Readout for which to set weight
                        );
-bool pmCellSetMaskWeight(pmCell *cell // Cell for which to set weights
-                        );
-bool pmReadoutSetMaskWeight(pmReadout *readout // Readout for which to set weights
-                           );
+
+// These functions generate a mask/weight suitable for output (complete with HDU entry) and then set them.
+bool pmReadoutGenerateMask(pmReadout *readout // Readout for which to generate mask
+                          );
+bool pmReadoutGenerateWeight(pmReadout *readout // Readout for which to generate weight
+                            );
+
+// These functions are conveniences for pmReadoutGenerateMask and pmReadoutGenerateWeight.
+bool pmCellGenerateMaskWeight(pmCell *cell // Cell for which to generate mask and weights
+                             );
+bool pmReadoutGenerateMaskWeight(pmReadout *readout // Readout for which to generate mask and weights
+                                );
 
 

trunk/psModules/src/camera/pmFPARead.c

@@ -159 +159 @@
 //
 // Note that this doesn't put pixels in the HDU.  It is therefore NOT COMPATIBLE with pmCellWrite,
-// pmChipWrite, and pmFPAWrite.  Use pmReadoutWriteNext to write the data that's read by this function.
+// pmChipWrite, and pmFPAWrite (or any function that uses or creates an HDU for that matter).
+// Use pmReadoutWriteNext to write the data that's read by this function.
 bool pmReadoutReadNext(pmReadout *readout, // Readout into which to read
                        psFits *fits,    // FITS file from which to read