Changeset 27517 for branches/eam_branches/20100225/pswarp/src/pswarpTransformSources.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpTransformSources.c (modified) (5 diffs)

branches/eam_branches/20100225/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;
     }
 
@@ -60 +60 @@
 
         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",
+        if (!pswarpMapGridSetGrid(sourceGrid, xIn, yIn, &xGrid, &yGrid)) {
+            psError(psErrorCodeLast(), false, "Unable to get grid coordinates for source at %f,%f\n",
                     xIn, yIn);
             psFree(outDetections);
@@ -75 +75 @@
         pswarpMap *map = sourceGrid->maps[xGrid][yGrid]; ///< Locally linear transformation
         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",
+        if (!pswarpMapApply(&xOut, &yOut, map, xIn, yIn)) {
+            psError(psErrorCodeLast(), false, "Unable to transform coordinates for source at %f,%f\n",
                     xIn, yIn);
             psFree(outDetections);
@@ -82 +82 @@
             return false;
         }
-        xOut += output->image->col0 - 0.5;
-        yOut += output->image->row0 - 0.5;
+        xOut += output->image->col0;
+        yOut += output->image->row0;
         if (xOut < minX || xOut > maxX || yOut < minY || yOut > maxY) {
             // It's not in the output image
@@ -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