Changeset 20995 for trunk/ppStack/src/ppStackCamera.c

Timestamp:

Dec 15, 2008, 1:18:30 PM (17 years ago)

Author:

Paul Price

Message:

Using new pmSourceMatch and pmSourceMatchRelphot to do the source matching and relative photometry. This should be more accurate than measuring the magnitude difference image by image.

File:

• trunk/ppStack/src/ppStackCamera.c (modified) (3 diffs)

trunk/ppStack/src/ppStackCamera.c

@@ -73 +73 @@
     bool haveWeights = false;           // Do we have weight maps?
     bool havePSFs = false;              // Do we have PSFs?
-    bool haveSources = (bool)psMetadataLookup(config->arguments, "PPSTACK.SOURCES"); // Have global sources?
 
     psMetadata *inputs = psMetadataLookupMetadata(NULL, config->arguments, "INPUTS"); // The inputs info
@@ -195 +194 @@
 
         // Add the sources file
-        if (!haveSources) {
-            if (!sources || strlen(sources) == 0) {
-                if (havePSFs) {
-                    psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find SOURCES %d", i);
-                    return false;
-                }
-            } else {
-                if (!havePSFs) {
-                    psWarning("SOURCES provided without PSF --- ignoring.");
-                } else {
-                    psArray *sourcesFiles = psArrayAlloc(1); // Array of filenames for this FPA
-                    sourcesFiles->data[0] = psMemIncrRefCounter(sources);
-                    psMetadataAddArray(config->arguments, PS_LIST_TAIL, "SOURCES.FILENAMES", PS_META_REPLACE,
-                                       "Filenames of SOURCES files", sourcesFiles);
-                    psFree(sourcesFiles);
-
-                    bool status;
-                    pmFPAfile *sourcesFile = pmFPAfileBindFromArgs(&status, imageFile, config,
-                                                                   "PPSTACK.INPUT.SOURCES",
-                                                                   "SOURCES.FILENAMES");
-                    if (!status) {
-                        psError(PS_ERR_UNKNOWN, false, "Unable to define file from sources %d (%s)",
-                                i, sources);
-                        return false;
-                    }
-                    if (sourcesFile->type != PM_FPA_FILE_CMF) {
-                        psError(PS_ERR_IO, true, "PPSTACK.INPUT.SOURCES is not of type CMF");
-                        return false;
-                    }
-                }
+        {
+            psArray *sourcesFiles = psArrayAlloc(1); // Array of filenames for this FPA
+            sourcesFiles->data[0] = psMemIncrRefCounter(sources);
+            psMetadataAddArray(config->arguments, PS_LIST_TAIL, "SOURCES.FILENAMES", PS_META_REPLACE,
+                               "Filenames of SOURCES files", sourcesFiles);
+            psFree(sourcesFiles);
+
+            bool status;
+            pmFPAfile *sourcesFile = pmFPAfileBindFromArgs(&status, imageFile, config,
+                                                           "PPSTACK.INPUT.SOURCES", "SOURCES.FILENAMES");
+            if (!status) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to define file from sources %d (%s)",
+                        i, sources);
+                return false;
+            }
+            if (sourcesFile->type != PM_FPA_FILE_CMF) {
+                psError(PS_ERR_IO, true, "PPSTACK.INPUT.SOURCES is not of type CMF");
+                return false;
             }
         }
@@ -269 +256 @@
     }
 
-    if (haveSources) {
-        // Global list of sources for use as stamps
-        bool status = false;            // Found the file?
-        if (havePSFs) {
-            pmFPAfile *sources = pmFPAfileDefineFromArgs(&status, config, "PPSTACK.INPUT.SOURCES",
-                                                         "PPSTACK.SOURCES");
-            if (!status) {
-                psError(PS_ERR_IO, false, "Failed to load file definition PPSTACK.INPUT.SOURCES");
-                return false;
-            }
-            if (sources && sources->type != PM_FPA_FILE_CMF) {
-                psError(PS_ERR_IO, true, "PPSTACK.SOURCES is not of type CMF");
-                return false;
-            }
-        }
-    }
-
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "INPUTS.NUM", 0, "Number of input files", i);
     psMetadataAddBool(config->arguments, PS_LIST_TAIL, "HAVE.PSF", 0, "Have PSFs available?", havePSFs);
-    psMetadataAddBool(config->arguments, PS_LIST_TAIL, "HAVE.SOURCES", 0, "Have global sources?",
-                      haveSources);
 
     // Output image