Changeset 34041 for branches/meh_branches/ppstack_test/ppMerge/src/ppMergeCamera.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)
• ppMerge/src/ppMergeCamera.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/ppMerge/src/ppMergeCamera.c

@@ -224 +224 @@
             format = (HDU)->format; \
         } else if (format != (HDU)->format) { \
-            psError(PS_ERR_UNKNOWN, true, "Camera format %d doesn't match: %p vs %p", \
-                    i, format, (HDU)->format); \
+          psError(PS_ERR_UNKNOWN, true, "Camera format %d doesn't match: %p vs %p on %s %s", \
+                  i, format, (HDU)->format, (HDU)->extname, psMetadataLookupStr(NULL,(HDU)->header,"FILENAME")); \
             psFree(phuView); \
             return false; \
@@ -232 +232 @@
     } \
 }
+    // CZW: 2012-04-10 Version of above to allow different camera formats to be processed together.
+/* #define CHECK_LEVEL(HDU, CHIP, CELL) { \ */
+/*     if (HDU) { \ */
+/*         if (!phuView) { \ */
+/*             phuView = pmFPAviewAlloc(0); \ */
+/*             phuView->chip = CHIP; \ */
+/*             phuView->cell = CELL; \ */
+/*         } else if ((phuView->chip != (CHIP)) && (phuView->cell != (CELL))) { \ */
+/*             psError(PS_ERR_UNKNOWN, true, "Differing PHU for input %d", i); \ */
+/*             psFree(phuView); \ */
+/*             return false; \ */
+/*         } \ */
+/*         if (!format) { \ */
+/*             format = (HDU)->format; \ */
+/*         } else if (format != (HDU)->format) { \ */
+/*         } \ */
+/*         continue; \ */
+/*     } \ */
+/* } */
 
     psMetadata *format = NULL;          ///< Camera format
@@ -334 +353 @@
         fileType = PM_FPA_FILE_IMAGE;
         break;
+      case PPMERGE_TYPE_NOISEMAP:
+        fileType = PM_FPA_FILE_IMAGE;
+        break;
       case PPMERGE_TYPE_FRINGE:
         fileType = PM_FPA_FILE_FRINGE;