Changeset 37825 for branches/eam_branches/ipp-pv3-20140717-merge/psphot/src/psphotFullForceReadout.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/psphotFullForceReadout.c (modified) (2 diffs)

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

@@ -106 +106 @@
     psphotKronFlux (config, view, filerule);
 
+    psphotChipParams (config, view, filerule);
+
     // measure petro fluxes
     psphotPetroFlux (config, view, filerule);
@@ -114 +116 @@
     // measure galaxy shapes
     psphotGalaxyShape (config, view, filerule);
+
+    // measure aperture photometry corrections
+    if (!psphotApResid (config, view, filerule)) {
+        psLogMsg ("psphot", 3, "failed on psphotApResid");
+        return psphotReadoutCleanup (config, view, filerule);
+    }
 
     // calculate source magnitudes (psf mag and ap mag)