Changeset 21363 for trunk/psModules/src/camera/pmHDUUtils.c

Timestamp:

Feb 5, 2009, 4:31:25 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/psModules/src/camera/pmHDUUtils.c (modified) (2 diffs)

trunk/psModules/src/camera/pmHDUUtils.c

@@ -18 +18 @@
 
     for (int i = 0; i < fpa->chips->n; i++) {
-        pmChip *chip = fpa->chips->data[i];
-        if (!chip) continue;
-        if (chip->hdu) return chip->hdu;
-        if (!chip->cells) continue;
-        for (int j = 0; j < chip->cells->n; j++) {
-            pmCell *cell = chip->cells->data[j];
-            if (!cell) continue;
-            if (cell->hdu) return cell->hdu;
-        }
+        pmChip *chip = fpa->chips->data[i];
+        if (!chip) continue;
+        if (chip->hdu) return chip->hdu;
+        if (!chip->cells) continue;
+        for (int j = 0; j < chip->cells->n; j++) {
+            pmCell *cell = chip->cells->data[j];
+            if (!cell) continue;
+            if (cell->hdu) return cell->hdu;
+        }
     }
     return NULL;
@@ -158 +158 @@
 
     INDENT(fd, level + 1);
-    if (hdu->weights) {
-        fprintf(fd, "Weights:\n");
-        for (long i = 0; i < hdu->weights->n; i++) {
-            psImage *weight = hdu->weights->data[i]; // Weight image of interest
+    if (hdu->variances) {
+        fprintf(fd, "Variances:\n");
+        for (long i = 0; i < hdu->variances->n; i++) {
+            psImage *variance = hdu->variances->data[i]; // Variance image of interest
             INDENT(fd, level + 2);
-            fprintf(fd, "%ld: %dx%d\n", i, weight->numCols, weight->numRows);
+            fprintf(fd, "%ld: %dx%d\n", i, variance->numCols, variance->numRows);
         }
     } else {
-        fprintf(fd, "NO weights.\n");
+        fprintf(fd, "NO variances.\n");
     }