Changeset 6858

Timestamp:

Apr 13, 2006, 5:21:10 PM (20 years ago)

Author:

Paul Price

Message:

Updating withy pmReadoutReadNext.

File:

• trunk/ppImage/src/ppTest.c (modified) (2 diffs)

trunk/ppImage/src/ppTest.c

@@ -96 +96 @@
 
     // Read the FPA
+    psArray *chips = fpa->chips;
+    for (int i = 0; i < chips->n; i++) {
+        pmChip *chip = chips->data[i];
+        psArray *cells = chip->cells;
+        for (int j = 0; j < cells->n; j++) {
+            pmCell *cell = cells->data[j];
+#if 0
+            pmReadout *readout = pmReadoutAlloc(cell);
+            for (int z = 0; pmReadoutReadNext(readout, inFile, z, 100); z++) {
+                do {
+//                    printf("Chip %d, Cell %d, Plane %d, row0 = %d\n", i, j, z, readout->row0);
+                    //pmFPAPrint(fpa, false, false);
+                } while (pmReadoutReadNext(readout, inFile, z, 2048));
+            }
+            psFree(readout);
+#else
+            pmCellRead(cell, inFile, NULL);
+#endif
+            psFree(cell);
+        }
+        psFree(chip);
+    }
+
+#if 0
     pmFPARead(fpa, inFile, NULL);
     // Copy to new camera format
@@ -101 +125 @@
     psMetadata *newFormat = psMetadataConfigParse(NULL, NULL, "mcshort_splice.config", true);
     pmConfigConformHeader(phu, newFormat);
-    pmFPAview *newView = pmFPAAddSourceFromHeader(newFPA, phu, newFormat);
-    printf("View chip: %d\n", newView->chip);
-    printf("View cell: %d\n", newView->cell);
-    pmFPACopy(newFPA, fpa);
+    pmFPAAddSourceFromView(newFPA, view, newFormat);
+    pmFPAPrint(newFPA, true, true);
+    pmFPACopyStructure(newFPA, fpa, 5, 5);
     pmFPAWrite(newFPA, outFile, NULL);
-    pmFPAPrint(newFPA, false, true);
+    exit(EXIT_SUCCESS);
 
-    psFree(newView);
+    pmFPAPrint(newFPA, true, true);
     psFree(newFormat);
     psFree(newFPA);
+#endif
+
     psFree(view);
     psFree(fpa);
     psFree(config);
+    psFitsClose(outFile);
     psFitsClose(inFile);
-    psFitsClose(outFile);
     psFree(phu);
     psFree(cameraFormat);