Changeset 18382 for trunk/ppStack/src/ppStackLoop.c

Timestamp:

Jun 30, 2008, 12:09:14 PM (18 years ago)

Author:

Paul Price

Message:

Figured that we don't want a set of unique sources, since that includes all the cosmic rays from all the inputs. Rather, we want for each image the list of sources in that image, but corrected to be on a common magnitude system (matching zero points across the images) and use that for our target PSF image.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (10 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -213 +213 @@
     // Preparation iteration: Load the sources, and get a target PSF model
     psTrace("ppStack", 1, "Determining target PSF....\n");
-    psArray *sources = NULL;            // Sources to use for PSF matching
+    psArray *globalSources = NULL;      // Global list of sources for matching (haveSources = TRUE)
+    psArray *indSources = psArrayAlloc(num); // Individual lists of sources for matching (haveSources = FALSE)
     pmPSF *targetPSF = NULL;            // Target PSF
     bool haveSources = psMetadataLookupBool(NULL, config->arguments, "HAVE.SOURCES"); // Global sources?
@@ -240 +241 @@
                 psError(PS_ERR_UNKNOWN, false, "Unable to find PSF.");
                 psFree(view);
-                psFree(sources);
+                psFree(globalSources);
+                psFree(indSources);
                 psFree(sourceLists);
                 psFree(fileIter);
@@ -257 +259 @@
                 psError(PS_ERR_UNKNOWN, false, "Unable to determine size of image from PSF.");
                 psFree(view);
-                psFree(sources);
+                psFree(globalSources);
+                psFree(indSources);
                 psFree(sourceLists);
                 psFree(fileIter);
@@ -270 +273 @@
             if (!haveSources) {
                 pmReadout *ro = pmFPAviewThisReadout(view, inputFile->fpa); // Readout with sources
-                sourceLists = ppStackSourceListAdd(sourceLists, ro, config);
+                psArray *sources = psMetadataLookupPtr(NULL, ro->analysis, "PSPHOT.SOURCES"); // Sources
+                if (!sources) {
+                    psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find sources in readout.");
+                    return NULL;
+                }
+                sources->data[index] = psMemIncrRefCounter(sources);
+                sourceLists = ppStackSourceListAdd(sourceLists, sources, config);
                 if (!sourceLists) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to add sources to list.");
                     psFree(view);
-                    psFree(sources);
+                    psFree(globalSources);
+                    psFree(indSources);
                     psFree(fileIter);
                     psFree(psfs);
@@ -288 +298 @@
         if (!targetPSF) {
             psError(PS_ERR_UNKNOWN, false, "Unable to determine output PSF.");
-            psFree(sources);
+            psFree(globalSources);
+            psFree(indSources);
             return false;
         }
@@ -294 +305 @@
         if (haveSources) {
             // We want to hang on to the 'sources' even when its host FPA is blown away
-            sources = psMemIncrRefCounter(pmFPAfileThisReadout(config->files, view, "PPSTACK.INPUT.SOURCES"));
-            if (!sources) {
+            globalSources = psMemIncrRefCounter(pmFPAfileThisReadout(config->files, view,
+                                                                     "PPSTACK.INPUT.SOURCES"));
+            if (!globalSources) {
                 psError(PS_ERR_UNKNOWN, true, "Unable to find sources.");
                 psFree(view);
@@ -301 +313 @@
             }
         } else {
-            sources = ppStackSourceListCombine(sourceLists, config);
+            globalSources = ppStackSourceListCombine(sourceLists, config);
             psFree(sourceLists);
-            if (!sources) {
+            if (!globalSources) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to add sources to list.");
                 psFree(view);
@@ -343 +355 @@
         pmFPAview *view = filesIterateDown(config);
         if (!view) {
-            psFree(sources);
+            psFree(globalSources);
+            psFree(indSources);
             psFree(targetPSF);
             psFree(rng);
@@ -354 +367 @@
         // Background subtraction, scaling and normalisation is performed automatically by the image matching
         psArray *regions = NULL, *kernels = NULL; // Regions and kernels used in subtraction
+        psArray *sources = haveSources ? globalSources : indSources->data[i]; // Sources for matching
         if (!ppStackMatch(readout, &regions, &kernels, sources, targetPSF, rng, config)) {
             psErrorStackPrint(stderr, "Unable to match image %d --- ignoring.", i);
@@ -374 +388 @@
         numGood++;
     }
-    psFree(sources);
+    psFree(globalSources);
+    psFree(indSources);
     psFree(targetPSF);
     psFree(rng);