Changeset 26781

Timestamp:

Feb 5, 2010, 1:19:36 PM (16 years ago)

Author:

eugene

Message:

updates to psphot APIs to enable stack photometry

Location:

branches/eam_branches/20091201/pswarp/src

Files:

• pswarpLoop.c (modified) (1 diff)
• pswarpTransformSources.c (modified) (4 diffs)

branches/eam_branches/20091201/pswarp/src/pswarpLoop.c

@@ -254 +254 @@
                 }
 
-                // Copy the sources from the astrometry carrier to the input, so they can be accessed by
+                // Copy the detections from the astrometry carrier to the input, so they can be accessed by
                 // pswarpTransformReadout
                 pmReadout *astromRO = pmFPAviewThisReadout(view, astrom->fpa); // Readout for astrometry
-                psArray *sources = psMetadataLookupPtr(&mdok, astromRO->analysis,
-                                                       "PSPHOT.SOURCES"); // Sources from astrometry
-                if (sources) {
-                    psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, "PSPHOT.SOURCES", PS_DATA_ARRAY,
-                                     "Sources from input astrometry", sources);
+                pmDetections *detections = psMetadataLookupPtr(&mdok, astromRO->analysis, "PSPHOT.DETECTIONS"); // Sources from astrometry
+                if (detections) {
+                    psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_ARRAY, "Sources from input astrometry", detections);
                 }
 

branches/eam_branches/20091201/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;
     }
 
@@ -57 +63 @@
             psError(PS_ERR_UNKNOWN, false, "Unable to get grid coordinates for source at %f,%f\n",
                     xIn, yIn);
-            psFree(outSources);
+            psFree(outDetections);
             psFree(sourceGrid);
             return false;
@@ -72 +78 @@
             psError(PS_ERR_UNKNOWN, false, "Unable to transform coordinates for source at %f,%f\n",
                     xIn, yIn);
-            psFree(outSources);
+            psFree(outDetections);
             psFree(sourceGrid);
             return false;
@@ -142 +148 @@
     }
     psFree(sourceGrid);
-    psFree(outSources);             // Drop reference
+    psFree(outDetections);             // Drop reference
     return true;
 }