Changeset 13901 for trunk/ppImage/src/ppImage.c

Timestamp:

Jun 19, 2007, 4:49:08 PM (19 years ago)

Author:

Paul Price

Message:

Adding chip and mask output for chip-mosaicked files. Was going to make this the default output, but we only have to have it selected in the recipe. Reduced the name of the filerule down, so that it's not excessively long (e.g., PPIMAGE.OUTPUT.CHIP.MASK --> PPIMAGE.CHIP.MASK).

File:

• trunk/ppImage/src/ppImage.c (modified) (6 diffs)

trunk/ppImage/src/ppImage.c

@@ -18 +18 @@
     if (config == NULL) {
         psErrorStackPrint(stderr, "Unable to parse command-line arguments.");
+        ppImageCleanup(config, NULL);
         exit(PS_EXIT_CONFIG_ERROR);
     }
@@ -26 +27 @@
     if (options == NULL) {
         psErrorStackPrint(stderr, "Unable to parse camera.");
+        ppImageCleanup(config, options);
         exit(PS_EXIT_CONFIG_ERROR);
     }
@@ -32 +34 @@
     if (!ppImageLoop(config, options)) {
         psErrorStackPrint(stderr, "Unable to loop over input");
+        ppImageCleanup(config, options);
         exit(PS_EXIT_SYS_ERROR);
     }
@@ -62 +65 @@
             if (fpa->hdu->header) fprintf (stderr, "  (%d,%d) header\n", -1, -1);
         } else {
-            // fprintf (stderr, "  has no fpa data (%d,%d)\n", -1, -1);
-        }
+            // fprintf (stderr, "  has no fpa data (%d,%d)\n", -1, -1);
+        }
         for (int i = 0; i < fpa->chips->n; i++) {
             pmChip *chip = fpa->chips->data[i];
@@ -72 +75 @@
                 if (chip->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, -1);
             } else {
-                // fprintf (stderr, "  has no chip data (%d,%d)\n", i, -1);
-            }
+                // fprintf (stderr, "  has no chip data (%d,%d)\n", i, -1);
+            }
             for (int j = 0; j < chip->cells->n; j++) {
                 pmCell *cell = chip->cells->data[j];
@@ -82 +85 @@
                     if (cell->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, j);
                 } else {
-                    // fprintf (stderr, "  has no cell data (%d,%d)\n", i, j);
-                }
-                for (int k = 0; k < cell->readouts->n; k++) {
-                    pmReadout *readout = cell->readouts->data[k];
-                    if (readout) {
-                        if (readout->image) fprintf (stderr, "  (%d,%d,%d) image\n", i, j, k);
-                        if (readout->weight) fprintf (stderr, "  (%d,%d,%d) weight\n", i, j, k);
-                        if (readout->mask) fprintf (stderr, "  (%d,%d,%d) masks\n", i, j, k);
-                    }
-                }
+                    // fprintf (stderr, "  has no cell data (%d,%d)\n", i, j);
+                }
+                for (int k = 0; k < cell->readouts->n; k++) {
+                    pmReadout *readout = cell->readouts->data[k];
+                    if (readout) {
+                        if (readout->image) fprintf (stderr, "  (%d,%d,%d) image\n", i, j, k);
+                        if (readout->weight) fprintf (stderr, "  (%d,%d,%d) weight\n", i, j, k);
+                        if (readout->mask) fprintf (stderr, "  (%d,%d,%d) masks\n", i, j, k);
+                    }
+                }
             }
         }