Changeset 27838 for branches/tap_branches/pswarp/src/pswarpTransformSources.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

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

branches/tap_branches/pswarp/src/pswarpTransformSources.c

@@ -31 +31 @@
 
     // Transform sources
-    psArray *inSources = psMetadataLookupPtr(&mdok, input->analysis, "PSPHOT.SOURCES"); // Sources in source
+    pmDetections *inDetections = psMetadataLookupPtr(&mdok, input->analysis, "PSPHOT.DETECTIONS"); // Sources in source
+    if (!inDetections) return true;
+    psArray *inSources = inDetections->allSources;
     if (!inSources) return true;
 
     pswarpMapGrid *sourceGrid = pswarpMapGridFromImage(output, input, nGridX, nGridY); // Grid for sources
 
-    psArray *outSources = psMemIncrRefCounter(psMetadataLookupPtr(&mdok, output->analysis, "PSPHOT.SOURCES")); // Target sources
+    pmDetections *outDetections = psMemIncrRefCounter(psMetadataLookupPtr(&mdok, output->analysis, "PSPHOT.DETECTIONS")); // Target sources
+    if (!outDetections) {
+        outDetections = pmDetectionsAlloc();
+        psMetadataAddPtr(output->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_ARRAY, "Warped sources", outDetections);
+    }
+    psArray *outSources = outDetections->allSources;
     if (!outSources) {
-        outSources = psArrayAllocEmpty(SOURCE_ARRAY_BUFFER);
-        psMetadataAddPtr(output->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY,
-                         "Warped sources", outSources);
+        outDetections->allSources = psArrayAllocEmpty(SOURCE_ARRAY_BUFFER);
+        outSources = outDetections->allSources;
     }
 
@@ -54 +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(outSources);
+            psFree(outDetections);
             psFree(sourceGrid);
             return false;
@@ -69 +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(outSources);
+            psFree(outDetections);
             psFree(sourceGrid);
             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
@@ -105 +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
@@ -142 +148 @@
     }
     psFree(sourceGrid);
-    psFree(outSources);             // Drop reference
+    psFree(outDetections);             // Drop reference
     return true;
 }