IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16008


Ignore:
Timestamp:
Jan 4, 2008, 1:46:15 PM (18 years ago)
Author:
gusciora
Message:

This change will only add to the fpa->camera metadata if the fpa was allocated
with a non-NULL camera.

Location:
trunk/psModules/test
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/camera/Makefile.am

    r15995 r16008  
    2626        tap_pmFPACellSquish \
    2727        tap_pmReadoutStack \
    28         tap_pmReadoutFake
    29 
     28        tap_pmReadoutFake \
     29        tap_pmFPACopy
    3030
    3131if BUILD_TESTS

  • trunk/psModules/test/camera/tap_pmFPA.c

    r15987 r16008  
    104104    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    105105    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    106     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     106    if (camera != NULL) {
     107        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     108    }
    107109    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    108110    fpa->hdu = pmHDUAlloc(NULL);

  • trunk/psModules/test/camera/tap_pmFPACellSquish.c

    r15987 r16008  
    146146    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    147147    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    148     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     148    if (camera != NULL) {
     149        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     150    }
    149151    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    150152    psArrayRealloc(fpa->chips, NUM_CHIPS);

  • trunk/psModules/test/camera/tap_pmFPAExtent.c

    r15987 r16008  
    145145    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    146146    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    147     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     147    if (camera != NULL) {
     148        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     149    }
    148150    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    149151

  • trunk/psModules/test/camera/tap_pmFPAFlags.c

    r15987 r16008  
    168168    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    169169    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    170     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     170    if (camera != NULL) {
     171        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     172    }
    171173    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    172174    psArrayRealloc(fpa->chips, NUM_CHIPS);

  • trunk/psModules/test/camera/tap_pmFPAHeader.c

    r15987 r16008  
    147147    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    148148    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    149     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     149    if (camera != NULL) {
     150        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     151    }
    150152    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    151153

  • trunk/psModules/test/camera/tap_pmFPAMaskW.c

    r15987 r16008  
    157157    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    158158    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    159     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     159    if (camera != NULL) {
     160        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     161    }
    160162    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    161163

  • trunk/psModules/test/camera/tap_pmFPAReadWrite.c

    r15987 r16008  
    147147    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    148148    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    149     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     149    if (camera != NULL) {
     150        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     151    }
    150152    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    151153

  • trunk/psModules/test/camera/tap_pmFPAUtils.c

    r15987 r16008  
    139139    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    140140    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    141     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     141    if (camera != NULL) {
     142        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     143    }
    142144    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    143145

  • trunk/psModules/test/camera/tap_pmFPAView.c

    r15987 r16008  
    99*/
    1010
    11 #define ERR_TRACE_LEVEL         0
    1211#define CHIP_ALLOC_NAME        "ChipName"
    1312#define CELL_ALLOC_NAME        "CellName"
    … …  
    152151    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    153152    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    154     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     153    if (camera != NULL) {
     154        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     155    }
    155156    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    156157    fpa->hdu = pmHDUAlloc("fpaExtName");

  • trunk/psModules/test/camera/tap_pmHDUUtils.c

    r15987 r16008  
    148148    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    149149    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    150     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     150    if (camera != NULL) {
     151        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     152    }
    151153    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    152154    fpa->hdu = pmHDUAlloc("fpaExtName");

  • trunk/psModules/test/concepts/tap_pmConceptsAverage.c

    r15986 r16008  
    145145    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    146146    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    147     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     147    if (camera != NULL) {
     148        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     149    }
    148150    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    149151    psArrayRealloc(fpa->chips, NUM_CHIPS);

  • trunk/psModules/test/concepts/tap_pmConceptsUpdate.c

    r15650 r16008  
    8181    cell->hdu = pmHDUAlloc("cellExtName");
    8282    for (int i = 0 ; i < NUM_READOUTS ; i++) {
    83         cell->readouts->data[i] = generateSimpleReadout(cell);
     83        cell->readouts->data[i] = psMemDecrRefCounter((psPtr) generateSimpleReadout(cell));
    8484    }
    8585
    … …  
    105105    }
    106106
    107     //XXX: Should the region be set some other way?  Like through the various config files?
    108 //    psRegion *region = psRegionAlloc(0.0, TEST_NUM_COLS-1, 0.0, TEST_NUM_ROWS-1);
    109107    psRegion *region = psRegionAlloc(0.0, 0.0, 0.0, 0.0);
    110     // You shouldn't have to remove the key from the metadata.  Find out how to simply change the key value.
     108    // You shouldn't have to remove the key from the metadata.
    111109    psMetadataRemoveKey(cell->concepts, "CELL.TRIMSEC");
    112110    psMetadataAddPtr(cell->concepts, PS_LIST_TAIL|PS_META_REPLACE, "CELL.TRIMSEC", PS_DATA_REGION, "I am a region", region);
    … …  
    128126    psArrayRealloc(chip->cells, NUM_CELLS);
    129127    for (int i = 0 ; i < NUM_CELLS ; i++) {
    130         chip->cells->data[i] = generateSimpleCell(chip);
     128        chip->cells->data[i] = psMemDecrRefCounter((psPtr) generateSimpleCell(chip));
    131129    }
    132130
    … …  
    148146    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    149147    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    150     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     148    if (camera != NULL) {
     149        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     150    }
    151151    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    152152
    153153    psArrayRealloc(fpa->chips, NUM_CHIPS);
    154154    for (int i = 0 ; i < NUM_CHIPS ; i++) {
    155         fpa->chips->data[i] = generateSimpleChip(fpa);
    156     }
    157 
    158     // XXX: Eventually, when you finish the pmConcepts tests, add full concept
    159     // reading code from wherever.
     155        fpa->chips->data[i] = psMemDecrRefCounter((psPtr) generateSimpleChip(fpa));
     156    }
    160157    pmConceptsBlankFPA(fpa);
    161 //    bool mdok;
    162 //    psMetadata *fileData = psMetadataLookupMetadata(&mdok, fpa->hdu->format, "FILE");
    163 //    char *fpaNameHdr = psMetadataLookupStr(&mdok, fileData, "FPA.NAME");
    164 //    psMetadataAddStr(fpa->concepts, PS_LIST_TAIL, "FPA.NAME", PS_META_REPLACE, NULL, fpaNameHdr);
    165 
    166158    return(fpa);
    167 }
    168 
    169 // XXX: This should only be necessary until the psFree() functions for
    170 // FPA/chip/cell/readout correctly free all child chips/cells/readouts
    171 void myFreeCell(pmCell *cell)
    172 {
    173     for (int k = 0 ; k < cell->readouts->n ; k++) {
    174         psFree(cell->readouts->data[k]);
    175     }
    176     psFree(cell);
    177 }
    178 
    179 void myFreeChip(pmChip *chip) {
    180     for (int j = 0 ; j < chip->cells->n ; j++) {
    181         myFreeCell(chip->cells->data[j]);
    182     }
    183     psFree(chip);
    184 }
    185 
    186 void myFreeFPA(pmFPA *fpa)
    187 {
    188     for (int i = 0 ; i < fpa->chips->n ; i++) {
    189         myFreeChip(fpa->chips->data[i]);
    190     }
    191     psFree(fpa);
    192159}
    193160
    … …  
    273240        }
    274241
    275         myFreeFPA(fpa);
     242        psFree(fpa);
    276243        psFree(camera);
    277244        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");

  • trunk/psModules/test/objects/tap_pmPSF_IO.c

    r15985 r16008  
    147147    fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
    148148    psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    149     psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     149    if (camera != NULL) {
     150        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     151    }
    150152    psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
    151153    psArrayRealloc(fpa->chips, NUM_CHIPS);
Note: See TracChangeset for help on using the changeset viewer.