Changeset 34041 for branches/meh_branches/ppstack_test/ppStack/src/ppStackPrepare.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackPrepare.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackPrepare.c

@@ -289 +289 @@
 
         psStringAppend(&log, "Input %d: %f\n", i, options->inputSeeing->data.F32[i]);
+        //MEH - add other params to output - better to just add in pmPSFtoFWHM called for psf?
+
     }
     if (havePSFs) {
@@ -315 +317 @@
         }
     }
+
+    //MEH - try runnning every thing that can reject images before target psf and conv - 
+    // Zero point calibration
+    if (!ppStackSourcesTransparency(options, view, config)) {
+        psError(PPSTACK_ERR_DATA, false, "Unable to calculate transparency differences");
+        psFree(view);
+        return false;
+    }
+
 
     // Generate target PSF
@@ -352 +363 @@
     }
 
+    // MEH - move up since may exclude additional images that transparency calc fail for inputs to target psf?
     // Zero point calibration
-    if (!ppStackSourcesTransparency(options, view, config)) {
-        psError(PPSTACK_ERR_DATA, false, "Unable to calculate transparency differences");
-        psFree(view);
-        return false;
-    }
+//    if (!ppStackSourcesTransparency(options, view, config)) {
+//        psError(PPSTACK_ERR_DATA, false, "Unable to calculate transparency differences");
+//        psFree(view);
+//        return false;
+//    }
+
     psFree(view);