Changeset 36677 for branches/eam_branches/ipp-20140402/psphot/src

Timestamp:

Apr 20, 2014, 5:52:37 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20140402

Files:

• . (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotFullForceReadout.c (modified) (2 diffs)
• psphot/src/psphotFullForceSummary.c (modified) (1 diff)
• psphot/src/psphotLensing.c (modified) (1 diff)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)

branches/eam_branches/ipp-20140402/psphot/src/psphotFullForceReadout.c

@@ -78 +78 @@
     psphotMergeSources (config, view, filerule);
 
-
     // generate a psf model for any readouts which need one
     // psphotFullForcePSF (config, view, filerule);
@@ -84 +83 @@
     // sources; we should mark with a flag bit the ones we actually want to use as PSF
     // stars (this means we need to supply this info in the load).
-    psphotChoosePSF (config, view, filerule, false);
+    if (!psphotChoosePSF (config, view, filerule, false)) {
+        // PSPHOT_ERR_DATA causes this program to exit gracefully
+        psError (PSPHOT_ERR_DATA, false, "failed to construct psf model");
+        return  psphotReadoutCleanup (config, view, filerule);
+    }
 
     // Construct an initial model for each object, set the radius to fitRadius, set circular

branches/eam_branches/ipp-20140402/psphot/src/psphotFullForceSummary.c

@@ -193 +193 @@
         if (ID >= sortedTable->n) {
             sortedTable = psArrayRealloc(sortedTable, 2*ID);
+            // Why doesn't psArrayRealloc do this?????
+            sortedTable->n = sortedTable->nalloc;
         }
         if (sortedTable->data[ID]) {

branches/eam_branches/ipp-20140402/psphot/src/psphotLensing.c

@@ -193 +193 @@
     // set the max order (0 = constant) which the number of psf stars can support:
     // we require only 3 stars for n = 0, increase stars / cell for higher order
+    if (Npsf < 3) {
+        psLogMsg ("psphot", PS_LOG_INFO, "no sources passed selection criteria, skipping lensing psf trends");
+        return true;
+    }
     int LensingTrendOrder = 0;
     if (Npsf >=  16) LensingTrendOrder = 1; // 4 cells