Changeset 21366 for trunk/psphot/src/psphotReadoutKnownSources.c

Timestamp:

Feb 5, 2009, 5:03:33 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psphot/src/psphotReadoutKnownSources.c (modified) (3 diffs)

trunk/psphot/src/psphotReadoutKnownSources.c

@@ -19 +19 @@
 
     // Generate the mask and weight images, including the user-defined analysis region of interest
-    psphotSetMaskAndWeight (config, readout, recipe);
+    psphotSetMaskAndVariance (config, readout, recipe);
 
     // display the image, weight, mask (ch 1,2,3)
@@ -41 +41 @@
     // use the peak measured in the moments analysis:
     for (int i = 0; i < sources->n; i++) {
-        pmSource *source = sources->data[i];
-        source->peak->flux = source->moments->Peak;
+        pmSource *source = sources->data[i];
+        source->peak->flux = source->moments->Peak;
     }
-    
+
     // classify sources based on moments, brightness (psf is not known)
     if (!psphotRoughClass (readout, sources, recipe, false)) {
@@ -53 +53 @@
     pmPSF *psf = psphotChoosePSF (readout, sources, recipe);
     if (!psf) {
-        psLogMsg ("psphot", 3, "failure to construct a psf model");
-        return psphotReadoutCleanup (config, readout, recipe, detections, psf, sources);
+        psLogMsg ("psphot", 3, "failure to construct a psf model");
+        return psphotReadoutCleanup (config, readout, recipe, detections, psf, sources);
     }
     psphotVisualShowPSFModel (readout, psf);