Changeset 27096 for trunk/pswarp/src/pswarpTransformSources.c

Timestamp:

Feb 25, 2010, 4:26:50 PM (16 years ago)

Author:

Paul Price

Message:

Reworking error codes to get consistent exit codes.

File:

• trunk/pswarp/src/pswarpTransformSources.c (modified) (4 diffs)

trunk/pswarp/src/pswarpTransformSources.c

@@ -45 +45 @@
     psArray *outSources = outDetections->allSources;
     if (!outSources) {
-        outDetections->allSources = psArrayAllocEmpty(SOURCE_ARRAY_BUFFER);
-        outSources = outDetections->allSources;
+        outDetections->allSources = psArrayAllocEmpty(SOURCE_ARRAY_BUFFER);
+        outSources = outDetections->allSources;
     }
 
@@ -61 +61 @@
         int xGrid, yGrid;           ///< Grid coordinates for local map
         if (!pswarpMapGridSetGrid(sourceGrid, xIn + 0.5, yIn + 0.5, &xGrid, &yGrid)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to get grid coordinates for source at %f,%f\n",
+            psError(psErrorCodeLast(), false, "Unable to get grid coordinates for source at %f,%f\n",
                     xIn, yIn);
             psFree(outDetections);
@@ -76 +76 @@
         double xOut, yOut;          ///< Output coordinates
         if (!pswarpMapApply(&xOut, &yOut, map, xIn + 0.5, yIn + 0.5)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to transform coordinates for source at %f,%f\n",
+            psError(psErrorCodeLast(), false, "Unable to transform coordinates for source at %f,%f\n",
                     xIn, yIn);
             psFree(outDetections);
@@ -111 +111 @@
 
         new->modelPSF = pmModelAlloc(source->modelPSF->type);
-        new->modelPSF->params->data.F32[PM_PAR_I0]=
-          (isfinite(new->psfMag) ? pow(10.0, -0.4*new->psfMag) : NAN);
-        new->modelPSF->dparams->data.F32[PM_PAR_I0]=
-          (isfinite(new->psfMag) ? new->errMag*pow(10.0, -0.4*new->psfMag) : NAN);
+        new->modelPSF->params->data.F32[PM_PAR_I0]=
+          (isfinite(new->psfMag) ? pow(10.0, -0.4*new->psfMag) : NAN);
+        new->modelPSF->dparams->data.F32[PM_PAR_I0]=
+          (isfinite(new->psfMag) ? new->errMag*pow(10.0, -0.4*new->psfMag) : NAN);
 
 #if 0