Changeset 7716

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

Files:

• ppImage/src/ppImageDetrendMask.c (modified) (2 diffs)
• ppImage/src/ppImageDetrendReadout.c (modified) (2 diffs)
• psphot/src/psphotReadout.c (modified) (4 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;
+        }
     }
 

trunk/psphot/src/psphotReadout.c

@@ -11 +11 @@
     // XXX does this need to invoke I/O?
     // XXX move this input the psphotImageLoop level?
-    if (!pmReadoutSetMaskWeight (readout)) {
-        return false;
+    if (!pmReadoutGenerateMaskWeight (readout)) {
+        return false;
     }
 
     // I have a valid mask, now mask in the analysis region of interest
-    psphotMaskReadout (readout, recipe); 
+    psphotMaskReadout (readout, recipe);
 
     // run a single-model test if desired
@@ -38 +38 @@
     // faint sources not classified?
     if (!psphotRoughClass (sources, recipe)) {
-        psFree (peaks);
-        psFree (sources);
-        psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
-        pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
-        pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
-        return false;
+        psFree (peaks);
+        psFree (sources);
+        psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
+        pmFPAfileDropInternal (config->files, "PSPHOT.BACKMDL");
+        pmFPAfileDropInternal (config->files, "PSPHOT.BACKGND");
+        return false;
     }
 
@@ -73 +73 @@
     // measure aperture photometry corrections
     if (!psphotApResid (readout, sources, recipe, psf)) {
-        psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
-        return false;
+        psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
+        return false;
     }
 
@@ -89 +89 @@
     psphotSourceFreePixels (sources);
 
-    // save the results of the analysis 
+    // save the results of the analysis
     psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY,    "psphot sources", sources);
     psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.HEADER",  PS_DATA_METADATA, "header stats", header);