Changeset 25624 for branches/eam_branches/20090715/ppStack/src/ppStackCamera.c

Timestamp:

Sep 27, 2009, 11:34:07 AM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/20090715/ppStack/src/ppStackCamera.c (modified) (2 diffs)

branches/eam_branches/20090715/ppStack/src/ppStackCamera.c

@@ -85 +85 @@
         psFree(runVars);
 
-        psArray *runPSF = pmFPAfileDefineMultipleFromRun(&status, runImages, config,
-                                                         "PPSTACK.INPUT.PSF"); // Input PSFs
-        if (!status) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to define input PSFs from RUN metadata.");
-            psFree(runImages);
-            return false;
-        }
-        if (runPSF) {
-            havePSFs = true;
-        }
-        psFree(runPSF);
-
         psArray *runSrc = pmFPAfileDefineMultipleFromRun(&status, runImages, config,
                                                          "PPSTACK.INPUT.SOURCES"); // Input sources
@@ -112 +100 @@
 
         if (convolve) {
-            psArray *runKernel = pmFPAfileDefineMultipleFromRun(&status, runImages, config,
-                                                                "PPSTACK.CONV.KERNEL"); // Convolution kernels
-            if (!status) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to define convolution kernels from RUN metadata.");
-                psFree(runImages);
-                return false;
-            }
-            if (!runKernel) {
-                psError(PS_ERR_UNEXPECTED_NULL, true,
-                        "Unable to define convolution kernels from RUN metadata.");
-                psFree(runImages);
-                return false;
-            }
-            psFree(runKernel);
+            {
+                psArray *runPSF = pmFPAfileDefineMultipleFromRun(&status, runImages, config,
+                                                         "PPSTACK.INPUT.PSF"); // Input PSFs
+                if (!status) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to define input PSFs from RUN metadata.");
+                    psFree(runImages);
+                    return false;
+                }
+                if (runPSF) {
+                    havePSFs = true;
+                }
+                psFree(runPSF);
+            }
+            {
+
+                psArray *runKernel = pmFPAfileDefineMultipleFromRun(&status, runImages, config,
+                                                                    "PPSTACK.CONV.KERNEL"); // Conv'n kernels
+                if (!status) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to define convolution kernels from RUN metadata.");
+                    psFree(runImages);
+                    return false;
+                }
+                if (!runKernel) {
+                    psError(PS_ERR_UNEXPECTED_NULL, true,
+                            "Unable to define convolution kernels from RUN metadata.");
+                    psFree(runImages);
+                    return false;
+                }
+                psFree(runKernel);
+            }
         }