Changeset 7716 for trunk/ppImage/src

Timestamp:

Jun 27, 2006, 6:12:57 PM (20 years ago)

Author:

Paul Price

Message:

Renaming pmReadoutSet{Mask,Weight} as pmReadoutGenerate{Mask,Weight} following change in psModules.

Location:

trunk/ppImage/src

Files:

• ppImageDetrendMask.c (modified) (2 diffs)
• ppImageDetrendReadout.c (modified) (2 diffs)

trunk/ppImage/src/ppImageDetrendMask.c

@@ -16 +16 @@
 
     if (mask->image->type.type != PS_TYPE_MASK) {
-        image = psImageCopy (NULL, mask->image, PS_TYPE_MASK);
+        image = psImageCopy (NULL, mask->image, PS_TYPE_MASK);
     } else {
-        image = psMemIncrRefCounter (mask->image);
+        image = psMemIncrRefCounter (mask->image);
     }
 
@@ -34 +34 @@
 
 
-// XXX this function needs to use pmReadoutSetMask to construct the initial mask
+// XXX this function needs to use pmReadoutGenerateMask to construct the initial mask
 // then the pixels will correspond and pmMaskBadPixels can be correctly applied.
-// this function should not have to lookup the value of CELL.SATURATION, nor should it have to 
-// apply it.  
+// this function should not have to lookup the value of CELL.SATURATION, nor should it have to
+// apply it.

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -12 +12 @@
 
     // create the target mask and weight images
-    pmReadoutSetMaskWeight (input);
+    pmReadoutGenerateMaskWeight (input);
 
     // apply the externally supplied mask to the input->mask pixels
     if (options->doMask) {
         pmReadout *mask = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.MASK");
-        pmMaskBadPixels (input, mask, options->maskValue);
+        pmMaskBadPixels (input, mask, options->maskValue);
         // ppImageDetrendMask(input, mask);
     }
@@ -40 +40 @@
     // Bias, dark and overscan subtraction are all merged.
     if (options->doBias || options->doDark || options->doOverscan) {
-        if (!ppImageDetrendBias(input, bias, dark, options)) {
-            return false;
-        }
+        if (!ppImageDetrendBias(input, bias, dark, options)) {
+            return false;
+        }
     }
 
     // Flat-field correction (no options used?)
     if (options->doFlat) {
-        pmReadout *flat = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.FLAT");
+        pmReadout *flat = pmFPAfileThisReadout (config->files, detview, "PPIMAGE.FLAT");
         if (!pmFlatField(input, flat)) {
-            return false;
-        }
+            return false;
+        }
     }