Changeset 37825 for branches/eam_branches/ipp-pv3-20140717-merge/psphot/src/psphotMagnitudes.c

Timestamp:

Jan 12, 2015, 12:34:04 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk (adds galaxy bumpiness/asym parameters; fixes full-force bugs)

File:

• branches/eam_branches/ipp-pv3-20140717-merge/psphot/src/psphotMagnitudes.c (modified) (3 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/psphot/src/psphotMagnitudes.c

@@ -38 +38 @@
         psAssert (psf, "missing psf?");
 
-        if (!psphotMagnitudesReadout (config, recipe, view, readout, sources, psf)) {
+        if (!psphotMagnitudesReadout (config, recipe, view, readout, sources, psf, i)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to measure magnitudes for %s entry %d", filerule, i);
             return false;
@@ -46 +46 @@
 }
 
-bool psphotMagnitudesReadout(pmConfig *config, psMetadata *recipe, const pmFPAview *view, pmReadout *readout, psArray *sources, pmPSF *psf) {
+bool psphotMagnitudesReadout(pmConfig *config, psMetadata *recipe, const pmFPAview *view, pmReadout *readout, psArray *sources, pmPSF *psf, int index) {
 
     bool status = false;
@@ -65 +65 @@
 
     // if backModel or backStdev are missing, the values of sky and/or skyErr will be set to NAN
-    pmReadout *backModel = psphotSelectBackground (config, view);
-    pmReadout *backStdev = psphotSelectBackgroundStdev (config, view);
+    pmReadout *backModel = psphotSelectBackground (config, view, index);
+    pmReadout *backStdev = psphotSelectBackgroundStdev (config, view, index);
 
     // bit-masks to test for good/bad pixels