Changeset 33755

Timestamp:

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

Author:

watersc1

Message:

ppMergeCamera.c fix to allow me to finish generating detrends. This needs to be rolled back once these are completed.

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; \ */
+/*     } \ */
+/* } */
 #define CHECK_LEVEL(HDU, CHIP, CELL) { \
     if (HDU) { \
@@ -224 +246 @@
             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); \
-            psFree(phuView); \
-            return false; \
         } \
         continue; \