Index: trunk/ppMerge/src/ppMergeCamera.c
===================================================================
--- trunk/ppMerge/src/ppMergeCamera.c	(revision 33755)
+++ trunk/ppMerge/src/ppMergeCamera.c	(revision 33757)
@@ -210,4 +210,27 @@
 
 // Check an FPA level to ensure the camera format and PHU are consistent across all input files
+#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) { \
+	  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; \
+        } \
+        continue; \
+    } \
+}
+    // CZW: 2012-04-10 Version of above to allow different camera formats to be processed together.
 /* #define CHECK_LEVEL(HDU, CHIP, CELL) { \ */
 /*     if (HDU) { \ */
@@ -224,30 +247,8 @@
 /*             format = (HDU)->format; \ */
 /*         } else if (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; \ */
 /*         } \ */
 /*         continue; \ */
 /*     } \ */
 /* } */
-#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