Changeset 28013 for trunk/psphot/src/psphotRadialBins.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotRadialBins.c (modified) (3 diffs)

trunk/psphot/src/psphotRadialBins.c

@@ -44 +44 @@
     psVector *radMin = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.LOWER");
     psVector *radMax = psMetadataLookupPtr (&status, recipe, "RADIAL.ANNULAR.BINS.UPPER");
-    if (!radMin || !radMin->n) return false;
-    if (!radMax || !radMax->n) return false;
+    if (!radMin || !radMin->n) {
+        psError (PSPHOT_ERR_CONFIG, true, "error in definition of annular bins (radMin missing or empty)");
+        return false;
+    }
+    if (!radMax || !radMax->n) {
+        psError (PSPHOT_ERR_CONFIG, true, "error in definition of annular bins (radMax missing or empty)");
+        return false;
+    }
 
     psVector *binSB      = psVectorAllocEmpty(radMin->n, PS_TYPE_F32); // surface brightness of radial bin
@@ -139 +145 @@
         }
     }
-    binSB->n = binSBstdev->n = binRad->n = binArea->n = nOut;
+    binSB->n = binSBstdev->n = binSum->n = binRad->n = binArea->n = nOut;
 
     // interpolate any bins that were empty (extrapolate to center if needed)
@@ -155 +161 @@
         psFree(values);
         psFree(stats);
-        return false;
+        return true;
     }