IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7492


Ignore:
Timestamp:
Jun 9, 2006, 5:42:10 PM (20 years ago)
Author:
Paul Price
Message:

Fixing after API change to psMetadataPrint; added FILE *fd to pmFPAPrint and pmHDUPrint, which is passed along to psMetadataPrint.

Location:
trunk/psModules/src/camera
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/camera/pmFPAConstruct.c

    r7474 r7492  
    773773
    774774// Print out the focal plane structure
    775 void pmFPAPrint(pmFPA *fpa,             // FPA to print
     775void pmFPAPrint(FILE *fd,               // File descriptor to which to print
     776                pmFPA *fpa,             // FPA to print
    776777                bool header,            // Print headers?
    777778                bool concepts           // Print concepts?
    … …  
    782783    psTrace(__func__, 1, "FPA:\n");
    783784    if (fpa->hdu) {
    784         pmHDUPrint(fpa->hdu, 2, header);
     785        pmHDUPrint(fd, fpa->hdu, 2, header);
    785786    }
    786787    if (concepts) {
    787         psMetadataPrint(fpa->concepts, 2);
     788        psMetadataPrint(fd, fpa->concepts, 2);
    788789    }
    789790
    … …  
    794795        pmChip *chip = chips->data[i]; // The chip
    795796        if (chip->hdu) {
    796             pmHDUPrint(chip->hdu, 4, header);
     797            pmHDUPrint(fd, chip->hdu, 4, header);
    797798        }
    798799        if (concepts) {
    799             psMetadataPrint(chip->concepts, 4);
     800            psMetadataPrint(fd, chip->concepts, 4);
    800801        }
    801802
    … …  
    806807            pmCell *cell = cells->data[j]; // The cell
    807808            if (cell->hdu) {
    808                 pmHDUPrint(cell->hdu, 6, header);
     809                pmHDUPrint(fd, cell->hdu, 6, header);
    809810            }
    810811            if (concepts) {
    811                 psMetadataPrint(cell->concepts, 6);
     812                psMetadataPrint(fd, cell->concepts, 6);
    812813            }
    813814

  • trunk/psModules/src/camera/pmFPAConstruct.h

    r7017 r7492  
    2121
    2222// Print out the FPA
    23 void pmFPAPrint(pmFPA *fpa,             // FPA to print
     23void pmFPAPrint(FILE *fd,               // File descriptor to which to print
     24                pmFPA *fpa,             // FPA to print
    2425                bool header,            // Print headers?
    2526                bool concepts           // Print concepts?

  • trunk/psModules/src/camera/pmHDUUtils.c

    r7459 r7492  
    6666}
    6767
    68 void pmHDUPrint(const pmHDU *hdu,       // HDU to print
     68void pmHDUPrint(FILE *fd,               // File descriptor to which to print
     69                const pmHDU *hdu,       // HDU to print
    6970                int level,              // Level at which to print
    7071                bool header             // Print header?
    … …  
    8384        if (hdu->header) {
    8485            psTrace(__func__, level + 1, "Header:\n");
    85             psMetadataPrint(hdu->header, level + 2);
     86            psMetadataPrint(fd, hdu->header, level + 2);
    8687        } else {
    8788            psTrace(__func__, level + 1, "No header.\n");

  • trunk/psModules/src/camera/pmHDUUtils.h

    r7459 r7492  
    2222
    2323// Print details about an HDU
    24 void pmHDUPrint(const pmHDU *hdu,       // HDU to print
     24void pmHDUPrint(FILE *fd,               // File descriptor to which to print
     25                const pmHDU *hdu,       // HDU to print
    2526                int level,              // Level at which to print
    2627                bool header             // Print header?
Note: See TracChangeset for help on using the changeset viewer.