Changeset 7716 for trunk/psphot/src/psphotReadout.c

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.

File:

• trunk/psphot/src/psphotReadout.c (modified) (4 diffs)

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);