Changeset 10271

Timestamp:

Nov 28, 2006, 5:08:57 PM (20 years ago)

Author:

Paul Price

Message:

Propagating API change to pmReadoutSetWeights

File:

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

trunk/psphot/src/psphotReadout.c

@@ -14 +14 @@
     // XXX does this need to invoke I/O?
     // XXX move this input the psphotImageLoop level?
-    if (!pmReadoutGenerateMaskWeight (readout)) {
+    if (!pmReadoutGenerateMaskWeight (readout, true)) {
         return false;
     }
@@ -25 +25 @@
 
     if (psTraceGetLevel("psphot") > 5) {
-        psphotSaveImage (NULL, readout->image,  "image.fits");
-        psphotSaveImage (NULL, readout->mask,   "mask.fits");
-        psphotSaveImage (NULL, readout->weight, "weight.fits");
+        psphotSaveImage (NULL, readout->image,  "image.fits");
+        psphotSaveImage (NULL, readout->mask,   "mask.fits");
+        psphotSaveImage (NULL, readout->weight, "weight.fits");
     }
 
@@ -54 +54 @@
 
     if (!strcasecmp (breakPt, "PEAKS")) {
-        if (!psphotReadoutCleanup (config, readout, recipe, NULL, sources)) return false;
-        return true;
+        if (!psphotReadoutCleanup (config, readout, recipe, NULL, sources)) return false;
+        return true;
     }
 
@@ -71 +71 @@
     }
     if (!strcasecmp (breakPt, "MOMENTS")) {
-        if (!psphotReadoutCleanup (config, readout, recipe, NULL, sources)) return false;
-        return true;
+        if (!psphotReadoutCleanup (config, readout, recipe, NULL, sources)) return false;
+        return true;
     }
 
@@ -86 +86 @@
 
     if (!strcasecmp (breakPt, "PSFMODEL")) {
-        if (!psphotReadoutCleanup (config, readout, recipe, psf, sources)) return false;
-        return true;
+        if (!psphotReadoutCleanup (config, readout, recipe, psf, sources)) return false;
+        return true;
     }
 
@@ -95 +95 @@
     psphotEnsemblePSF (readout, sources, recipe, psf, FALSE);
     if (!strcasecmp (breakPt, "ENSEMBLE")) {
-        goto finish;
+        goto finish;
     }
 
@@ -122 +122 @@
     // measure aperture photometry corrections
     if (!psphotApResid (readout, sources, recipe, psf)) {
-        psTrace ("psphot", 4, "failure on psphotApResid"); 
+        psTrace ("psphot", 4, "failure on psphotApResid");
         psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
         return false;
@@ -146 +146 @@
     // use the psf-model to measure FWHM stats
     if (psf) {
-        if (!psphotPSFstats (readout, recipe, psf)) {
-            psError(PS_ERR_IO, true, "Failed to measure PSF shape parameters");
-            return false;
-        }
+        if (!psphotPSFstats (readout, recipe, psf)) {
+            psError(PS_ERR_IO, true, "Failed to measure PSF shape parameters");
+            return false;
+        }
     } else if (sources) {
-        if (!psphotMomentsStats (readout, recipe, sources)) {
-            psError(PS_ERR_IO, true, "Failed to measure Moment shape parameters");
-            return false;
-        }
+        if (!psphotMomentsStats (readout, recipe, sources)) {
+            psError(PS_ERR_IO, true, "Failed to measure Moment shape parameters");
+            return false;
+        }
     }