Changeset 33757

Timestamp:

Apr 10, 2012, 4:35:23 PM (14 years ago)

Author:

watersc1

Message:

Backing out my ppMerge change on the trunk, in case I forget about this later. It's still active on the working tag, which is where I need it at the moment.

File:

• trunk/ppMerge/src/ppMergeCamera.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeCamera.c

@@ -210 +210 @@
 
 // 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 +247 @@
 /*             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