IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 3, 2006, 8:48:10 AM (20 years ago)
Author:
magnier
Message:

defined pmConfigConvertFilename, added to all I/O functions

Location:
trunk/psModules/src/objects
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/objects/pmPSF_IO.c

    r9770 r10421  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-10-28 20:23:51 $
     8 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-12-03 18:48:10 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    117117}
    118118
    119 bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file)
     119bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    120120{
    121121
    … …  
    123123
    124124    if (view->chip == -1) {
    125         pmFPAWritePSFmodel (fpa, view, file);
     125        pmFPAWritePSFmodel (fpa, view, file, config);
    126126        return true;
    127127    }
    … …  
    133133
    134134    if (view->cell == -1) {
    135         pmChipWritePSFmodel (chip, view, file);
     135        pmChipWritePSFmodel (chip, view, file, config);
    136136        return true;
    137137    }
    … …  
    143143
    144144    if (view->readout == -1) {
    145         pmCellWritePSFmodel (cell, view, file);
     145        pmCellWritePSFmodel (cell, view, file, config);
    146146        return true;
    147147    }
    … …  
    152152    pmReadout *readout = cell->readouts->data[view->readout];
    153153
    154     pmReadoutWritePSFmodel (readout, view, file);
     154    pmReadoutWritePSFmodel (readout, view, file, config);
    155155    return true;
    156156}
    157157
    158158// read in all chip-level PSFmodel files for this FPA
    159 bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file)
     159bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    160160{
    161161
    … …  
    163163
    164164        pmChip *chip = fpa->chips->data[i];
    165         pmChipWritePSFmodel (chip, view, file);
     165        pmChipWritePSFmodel (chip, view, file, config);
    166166    }
    167167    return true;
    … …  
    169169
    170170// read in all cell-level PSFmodel files for this chip
    171 bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file)
     171bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    172172{
    173173
    … …  
    175175
    176176        pmCell *cell = chip->cells->data[i];
    177         pmCellWritePSFmodel (cell, view, file);
     177        pmCellWritePSFmodel (cell, view, file, config);
    178178    }
    179179    return true;
    … …  
    181181
    182182// read in all readout-level PSFmodel files for this cell
    183 bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file)
     183bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    184184{
    185185
    … …  
    187187
    188188        pmReadout *readout = cell->readouts->data[i];
    189         pmReadoutWritePSFmodel (readout, view, file);
     189        pmReadoutWritePSFmodel (readout, view, file, config);
    190190    }
    191191    return true;
    … …  
    193193
    194194// read in all readout-level Objects files for this cell
    195 bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file)
     195bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    196196{
    197197    bool status;
    198198    char *filename;
     199    char *realname;
    199200
    200201    pmPSF *psf = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF");
    … …  
    203204    case PM_FPA_FILE_PSF:
    204205        filename = pmFPAfileNameFromRule (file->filerule, file, view);
     206        realname = pmConfigConvertFilename (filename, config);
     207
    205208        psMetadata *psfData = pmPSFtoMetadata (NULL, psf);
    206         psMetadataConfigWrite (psfData, filename);
     209        psMetadataConfigWrite (psfData, realname);
    207210        psFree (psfData);
     211        psFree (realname);
    208212        psFree (filename);
    209213        return true;
    … …  
    218222
    219223
    220 bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file)
     224bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    221225{
    222226
    … …  
    224228
    225229    if (view->chip == -1) {
    226         pmFPAReadPSFmodel (fpa, view, file);
     230        pmFPAReadPSFmodel (fpa, view, file, config);
    227231        return true;
    228232    }
    … …  
    234238
    235239    if (view->cell == -1) {
    236         pmChipReadPSFmodel (chip, view, file);
     240        pmChipReadPSFmodel (chip, view, file, config);
    237241        return true;
    238242    }
    … …  
    244248
    245249    if (view->readout == -1) {
    246         pmCellReadPSFmodel (cell, view, file);
     250        pmCellReadPSFmodel (cell, view, file, config);
    247251        return true;
    248252    }
    … …  
    253257    pmReadout *readout = cell->readouts->data[view->readout];
    254258
    255     pmReadoutReadPSFmodel (readout, view, file);
     259    pmReadoutReadPSFmodel (readout, view, file, config);
    256260    return true;
    257261}
    258262
    259263// read in all chip-level PSFmodel files for this FPA
    260 bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file)
     264bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    261265{
    262266
    … …  
    264268
    265269        pmChip *chip = fpa->chips->data[i];
    266         pmChipReadPSFmodel (chip, view, file);
     270        pmChipReadPSFmodel (chip, view, file, config);
    267271    }
    268272    return true;
    … …  
    270274
    271275// read in all cell-level PSFmodel files for this chip
    272 bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file)
     276bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    273277{
    274278
    … …  
    276280
    277281        pmCell *cell = chip->cells->data[i];
    278         pmCellReadPSFmodel (cell, view, file);
     282        pmCellReadPSFmodel (cell, view, file, config);
    279283    }
    280284    return true;
    … …  
    282286
    283287// read in all readout-level PSFmodel files for this cell
    284 bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file)
     288bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    285289{
    286290
    … …  
    288292
    289293        pmReadout *readout = cell->readouts->data[i];
    290         pmReadoutReadPSFmodel (readout, view, file);
     294        pmReadoutReadPSFmodel (readout, view, file, config);
    291295    }
    292296    return true;
    … …  
    294298
    295299// read in all readout-level Objects files for this cell
    296 bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file)
     300bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    297301{
    298302
    299303    unsigned int Nfail;
    300304    char *filename;
     305    char *realname;
    301306
    302307    switch (file->type) {
    303308    case PM_FPA_FILE_PSF:
    304309        filename = pmFPAfileNameFromRule (file->filerule, file, view);
    305 
    306         psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, filename, FALSE);
     310        realname = pmConfigConvertFilename (filename, config);
     311
     312        psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, realname, FALSE);
    307313        pmPSF *psf = pmPSFfromMetadata (psfData);
    308314        psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN, "psphot psf", psf);
    … …  
    310316        psFree (psf);
    311317        psFree (psfData);
     318        psFree (realname);
    312319        psFree (filename);
    313320

  • trunk/psModules/src/objects/pmPSF_IO.h

    r9539 r10421  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-10-13 21:15:45 $
     8 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-12-03 18:48:10 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1818psMetadata *pmPSFtoMetadata (psMetadata *metadata, pmPSF *psf);
    1919pmPSF *pmPSFfromMetadata (psMetadata *metadata);
    20 bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file);
    21 bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file);
    22 bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file);
    23 bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file);
    24 bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file);
     20bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     21bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     22bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     23bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     24bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    2525
    26 bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file);
    27 bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file);
    28 bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file);
    29 bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file);
    30 bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file);
     26bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     27bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     28bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     29bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     30bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    3131
    3232# endif

  • trunk/psModules/src/objects/pmSourceIO.c

    r9560 r10421  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-10-14 00:53:56 $
     5 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-12-03 18:48:10 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6060
    6161// Given a FITS file pointer, write the table of object data
    62 bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file)
     62bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    6363{
    6464
    … …  
    6666
    6767    if (view->chip == -1) {
    68         if (!pmFPAWriteObjects (fpa, view, file)) {
     68        if (!pmFPAWriteObjects (fpa, view, file, config)) {
    6969            psError(PS_ERR_IO, false, "Failed to write objects from fpa");
    7070            return false;
    … …  
    8080
    8181    if (view->cell == -1) {
    82         if (!pmChipWriteObjects (chip, view, file)) {
     82        if (!pmChipWriteObjects (chip, view, file, config)) {
    8383            psError(PS_ERR_IO, false, "Failed to write objects from chip");
    8484            return false;
    … …  
    9595
    9696    if (view->readout == -1) {
    97         if (!pmCellWriteObjects (cell, view, file)) {
     97        if (!pmCellWriteObjects (cell, view, file, config)) {
    9898            psError(PS_ERR_IO, false, "Failed to write objects from cell");
    9999            return false;
    … …  
    110110    pmReadout *readout = cell->readouts->data[view->readout];
    111111
    112     if (!pmReadoutWriteObjects (readout, view, file)) {
     112    if (!pmReadoutWriteObjects (readout, view, file, config)) {
    113113        psError(PS_ERR_IO, false, "Failed to write objects from readout %d", view->readout);
    114114        return false;
    … …  
    119119
    120120// read in all chip-level Objects files for this FPA
    121 bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file)
     121bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    122122{
    123123
    … …  
    125125
    126126        pmChip *chip = fpa->chips->data[i];
    127         if (!pmChipWriteObjects (chip, view, file)) {
     127        if (!pmChipWriteObjects (chip, view, file, config)) {
    128128            psError(PS_ERR_IO, false, "Failed to write %dth chip", i);
    129129            return false;
    … …  
    134134
    135135// read in all cell-level Objects files for this chip
    136 bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file)
     136bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    137137{
    138138
    … …  
    140140
    141141        pmCell *cell = chip->cells->data[i];
    142         if (!pmCellWriteObjects (cell, view, file)) {
     142        if (!pmCellWriteObjects (cell, view, file, config)) {
    143143            psError(PS_ERR_IO, false, "Failed to write %dth cell", i);
    144144            return false;
    … …  
    149149
    150150// read in all readout-level Objects files for this cell
    151 bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file)
     151bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    152152{
    153153
    … …  
    155155
    156156        pmReadout *readout = cell->readouts->data[i];
    157         if (!pmReadoutWriteObjects (readout, view, file)) {
     157        if (!pmReadoutWriteObjects (readout, view, file, config)) {
    158158            psError(PS_ERR_IO, false, "Failed to write %dth readout", i);
    159159            return false;
    … …  
    164164
    165165// read in all readout-level Objects files for this cell
    166 bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file)
     166bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    167167{
    168168
    169169    bool status;
     170    char *realname;
    170171    char *filename;
    171172    char *dataname;
    … …  
    183184    case PM_FPA_FILE_RAW:
    184185        filename = pmFPAfileNameFromRule (file->filerule, file, view);
    185         pmSourcesWriteRAW (sources, filename);
     186        realname = pmConfigConvertFilename (filename, config);
     187        pmSourcesWriteRAW (sources, realname);
     188        psFree (realname);
    186189        psFree (filename);
    187190        break;
    … …  
    189192    case PM_FPA_FILE_OBJ:
    190193        filename = pmFPAfileNameFromRule (file->filerule, file, view);
    191         pmSourcesWriteOBJ (sources, filename);
     194        realname = pmConfigConvertFilename (filename, config);
     195        pmSourcesWriteOBJ (sources, realname);
     196        psFree (realname);
    192197        psFree (filename);
    193198        break;
    … …  
    195200    case PM_FPA_FILE_SX:
    196201        filename = pmFPAfileNameFromRule (file->filerule, file, view);
    197         pmSourcesWriteSX (sources, filename);
     202        realname = pmConfigConvertFilename (filename, config);
     203        pmSourcesWriteSX (sources, realname);
     204        psFree (realname);
    198205        psFree (filename);
    199206        break;
    … …  
    203210        hdu = pmFPAviewThisHDU (view, file->fpa);
    204211        filename = pmFPAfileNameFromRule (file->filerule, file, view);
     212        realname = pmConfigConvertFilename (filename, config);
    205213
    206214        // copy the header to an output header, add the output header data
    … …  
    219227        }
    220228
    221         bool status = pmSourcesWriteCMP (sources, filename, outhead);
     229        bool status = pmSourcesWriteCMP (sources, realname, outhead);
    222230        psFree (outhead);
     231        psFree (realname);
    223232        psFree (filename);
    224233
    … …  
    310319
    311320// Given a FITS file pointer, read the table of object data
    312 bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file)
     321bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    313322{
    314323    pmFPA *fpa = file->fpa;
    315324
    316325    if (view->chip == -1) {
    317         pmFPAReadObjects (fpa, view, file);
     326        pmFPAReadObjects (fpa, view, file, config);
    318327        return true;
    319328    }
    … …  
    325334
    326335    if (view->cell == -1) {
    327         pmChipReadObjects (chip, view, file);
     336        pmChipReadObjects (chip, view, file, config);
    328337        return true;
    329338    }
    … …  
    335344
    336345    if (view->readout == -1) {
    337         pmCellReadObjects (cell, view, file);
     346        pmCellReadObjects (cell, view, file, config);
    338347        return true;
    339348    }
    … …  
    344353    pmReadout *readout = cell->readouts->data[view->readout];
    345354
    346     pmReadoutReadObjects (readout, view, file);
     355    pmReadoutReadObjects (readout, view, file, config);
    347356    return true;
    348357}
    349358
    350359// read in all chip-level Objects files for this FPA
    351 bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file)
     360bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    352361{
    353362    for (int i = 0; i < fpa->chips->n; i++) {
    354363        pmChip *chip = fpa->chips->data[i];
    355         pmChipReadObjects (chip, view, file);
     364        pmChipReadObjects (chip, view, file, config);
    356365    }
    357366    return true;
    … …  
    359368
    360369// read in all cell-level Objects files for this chip
    361 bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file)
     370bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    362371{
    363372    for (int i = 0; i < chip->cells->n; i++) {
    364373        pmCell *cell = chip->cells->data[i];
    365         pmCellReadObjects (cell, view, file);
     374        pmCellReadObjects (cell, view, file, config);
    366375    }
    367376    return true;
    … …  
    369378
    370379// read in all readout-level Objects files for this cell
    371 bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file)
     380bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    372381{
    373382    // determine the number of readouts:
    … …  
    384393    for (int i = 0; i < cell->readouts->n; i++) {
    385394        pmReadout *readout = cell->readouts->data[i];
    386         pmReadoutReadObjects (readout, view, file);
     395        pmReadoutReadObjects (readout, view, file, config);
    387396        cell->data_exists = true;
    388397    }
    … …  
    391400
    392401// read in all readout-level Objects files for this cell
    393 bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file)
     402bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
    394403{
    395404
    … …  
    427436            psMemIncrRefCounter (file->filename);
    428437        }
    429         file->fits = psFitsOpen (file->filename, "r");
     438
     439        psString realname = pmConfigConvertFilename (file->filename, config);
     440
     441        file->fits = psFitsOpen (realname, "r");
    430442        if (hdu->header != NULL) {
    431443            psFree (hdu->header);
    … …  
    435447        file->fits = NULL;
    436448
    437         sources = pmSourcesReadCMP (file->filename, hdu->header);
     449        sources = pmSourcesReadCMP (realname, hdu->header);
     450        psFree (realname);
    438451        break;
    439452

  • trunk/psModules/src/objects/pmSourceIO.h

    r10182 r10421  
    33 *  @author EAM, IfA; GLG, MHPCC
    44 *
    5  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-11-24 20:57:26 $
     5 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-12-03 18:48:10 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3030bool pmPeaksWriteText (psArray *peaks, char *filename);
    3131
    32 bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file);
    33 bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file);
    34 bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file);
    35 bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file);
    36 bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file);
     32bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     33bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     34bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     35bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     36bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    3737
    38 bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file);
    39 bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file);
    40 bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file);
    41 bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file);
    42 bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file);
     38bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     39bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     40bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     41bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     42bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    4343
    4444# endif /* PM_SOURCE_IO_H */

  • trunk/psModules/src/objects/pmSourceIO_RAW.c

    r10182 r10421  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-11-24 20:57:26 $
     5 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-12-03 18:48:10 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767    f = fopen (filename, "w");
    6868    if (f == NULL) {
    69         psLogMsg (__func__, 3, "can't open output file for PSFs: %s\n", filename);
     69        psLogMsg (__func__, 3, "can't open output file for PSF sources: %s\n", filename);
    7070        return false;
    7171    }
    … …  
    126126    f = fopen (filename, "w");
    127127    if (f == NULL) {
    128         psLogMsg ("pmModelWriteEXTs", 3, "can't open output file for moments%s\n", filename);
     128        psLogMsg ("pmModelWriteEXTs", 3, "can't open output file for EXT sources: %s\n", filename);
    129129        return false;
    130130    }
    … …  
    185185    f = fopen (filename, "w");
    186186    if (f == NULL) {
    187         psLogMsg ("DumpObjects", 3, "can't open output file for moments%s\n", filename);
     187        psLogMsg ("DumpObjects", 3, "can't open output file for NULL sources: %s\n", filename);
    188188        return false;
    189189    }
    … …  
    230230    f = fopen (filename, "w");
    231231    if (f == NULL) {
    232         psLogMsg ("pmMomentsWriteText", 3, "can't open output file for moments%s\n", filename);
     232        psLogMsg ("pmMomentsWriteText", 3, "can't open output file for moments: %s\n", filename);
    233233        return false;
    234234    }
Note: See TracChangeset for help on using the changeset viewer.