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

Timestamp:

Apr 10, 2008, 10:54:53 AM (18 years ago)

Author:

Paul Price

Message:

Turn off convolution if PSFs not provided.

File:

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

trunk/ppStack/src/ppStackCamera.c

@@ -72 +72 @@
 {
     bool haveWeights = false;           // Do we have weight maps?
+    bool havePSF = false;               // Do we have PSFs?
 
     psMetadata *inputs = psMetadataLookupMetadata(NULL, config->arguments, "INPUTS"); // The inputs info
@@ -169 +170 @@
         // Add the psf file
         if (!psf || strlen(psf) == 0) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find PSF %d", i);
-            return false;
+            if (havePSFs) {
+                psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find PSF %d", i);
+                return false;
+            }
         } else {
-            psArray *psfFiles = psArrayAlloc(1); // Array of filenames for this FPA
-            psfFiles->data[0] = psMemIncrRefCounter(psf);
-            psMetadataAddArray(config->arguments, PS_LIST_TAIL, "PSF.FILENAMES", PS_META_REPLACE,
-                               "Filenames of PSF files", psfFiles);
-            psFree(psfFiles);
-
-            bool status;
-            pmFPAfile *psfFile = pmFPAfileBindFromArgs(&status, imageFile, config, "PPSTACK.INPUT.PSF",
-                                                       "PSF.FILENAMES");
-            if (!status) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to define file from psf %d (%s)", i, psf);
-                return false;
-            }
-            if (psfFile->type != PM_FPA_FILE_PSF) {
-                psError(PS_ERR_IO, true, "PPSTACK.INPUT.PSF is not of type PSF");
-                return false;
+            if (!havePSFs && i != 0) {
+                psWarning("PSF not provided for all inputs --- ignoring.");
+            } else {
+                psArray *psfFiles = psArrayAlloc(1); // Array of filenames for this FPA
+                psfFiles->data[0] = psMemIncrRefCounter(psf);
+                psMetadataAddArray(config->arguments, PS_LIST_TAIL, "PSF.FILENAMES", PS_META_REPLACE,
+                                   "Filenames of PSF files", psfFiles);
+                psFree(psfFiles);
+
+                bool status;
+                pmFPAfile *psfFile = pmFPAfileBindFromArgs(&status, imageFile, config, "PPSTACK.INPUT.PSF",
+                                                           "PSF.FILENAMES");
+                if (!status) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to define file from psf %d (%s)", i, psf);
+                    return false;
+                }
+                if (psfFile->type != PM_FPA_FILE_PSF) {
+                    psError(PS_ERR_IO, true, "PPSTACK.INPUT.PSF is not of type PSF");
+                    return false;
+                }
+                havePSFs = true;
             }
         }
@@ -233 +241 @@
 
     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);
 
     // Output image