Changeset 21364 for trunk/ppImage/src/ppImageFileCheck.c

Timestamp:

Feb 5, 2009, 4:36:52 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/ppImage/src/ppImageFileCheck.c (modified) (4 diffs)

trunk/ppImage/src/ppImageFileCheck.c

@@ -20 +20 @@
         if (fpa->hdu) {
             if (fpa->hdu->images) fprintf (stderr, "  (%d,%d) images\n", -1, -1);
-            if (fpa->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", -1, -1);
+            if (fpa->hdu->variances) fprintf (stderr, "  (%d,%d) variances\n", -1, -1);
             if (fpa->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", -1, -1);
             if (fpa->hdu->header) fprintf (stderr, "  (%d,%d) header\n", -1, -1);
@@ -30 +30 @@
             if (chip->hdu) {
                 if (chip->hdu->images) fprintf (stderr, "  (%d,%d) images\n", i, -1);
-                if (chip->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", i, -1);
+                if (chip->hdu->variances) fprintf (stderr, "  (%d,%d) variances\n", i, -1);
                 if (chip->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", i, -1);
                 if (chip->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, -1);
@@ -40 +40 @@
                 if (cell->hdu) {
                     if (cell->hdu->images) fprintf (stderr, "  (%d,%d) images\n", i, j);
-                    if (cell->hdu->weights) fprintf (stderr, "  (%d,%d) weights\n", i, j);
+                    if (cell->hdu->variances) fprintf (stderr, "  (%d,%d) variances\n", i, j);
                     if (cell->hdu->masks) fprintf (stderr, "  (%d,%d) masks\n", i, j);
                     if (cell->hdu->header) fprintf (stderr, "  (%d,%d) header\n", i, j);
@@ -50 +50 @@
                     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->variance) fprintf (stderr, "  (%d,%d,%d) variance\n", i, j, k);
                         if (readout->mask) fprintf (stderr, "  (%d,%d,%d) masks\n", i, j, k);
                     }