IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12832


Ignore:
Timestamp:
Apr 13, 2007, 5:22:48 PM (19 years ago)
Author:
Paul Price
Message:

Adding const to pmConfig parameter, where possible.

Location:
trunk/psModules/src
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r12696 r12832  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-03-30 21:12:56 $
     7 *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-04-14 03:22:47 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3535
    3636
    37 bool pmFPAviewWriteJPEG(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     37bool pmFPAviewWriteJPEG(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    3838{
    3939    PS_ASSERT_PTR_NON_NULL(view, false);
    … …  
    7777
    7878// read in all chip-level JPEG files for this FPA
    79 bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     79bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    8080{
    8181    PS_ASSERT_PTR_NON_NULL(fpa, false);
    … …  
    9292
    9393// read in all cell-level JPEG files for this chip
    94 bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     94bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    9595{
    9696    PS_ASSERT_PTR_NON_NULL(chip, false);
    … …  
    107107
    108108// read in all readout-level JPEG files for this cell
    109 bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     109bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    110110{
    111111    PS_ASSERT_PTR_NON_NULL(cell, false);
    … …  
    125125// just because the values are in a poor range.  it is more convenient to know you are getting
    126126// a jpeg which is weird than to fail to get the file at all.
    127 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     127bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    128128{
    129129    bool status;

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

    r11253 r12832  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:14 $
     6 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-04-14 03:22:47 $
    88 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    1515/// @{
    1616
    17 bool pmFPAviewWriteJPEG (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    18 bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    19 bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    20 bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    21 bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     17bool pmFPAviewWriteJPEG (const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     18bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     19bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     20bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     21bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
    2222
    2323/// @}

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

    r12696 r12832  
    322322}
    323323
    324 bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     324bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    325325{
    326326    PS_ASSERT_PTR_NON_NULL(view, false);
    … …  
    329329}
    330330
    331 bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     331bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    332332{
    333333    PS_ASSERT_PTR_NON_NULL(view, false);
    … …  
    336336}
    337337
    338 bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     338bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    339339{
    340340    PS_ASSERT_PTR_NON_NULL(view, false);

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

    r11793 r12832  
    55 * @author PAP, IfA
    66 *
    7  * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    8  * @date $Date: 2007-02-15 00:34:00 $
     7 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     8 * @date $Date: 2007-04-14 03:22:47 $
    99 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    1010 */
    … …  
    3232/// Read an image header into the current view
    3333bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view,  ///< View specifying level of interest
    34                                 pmFPAfile *file ///< FPA file into which to read
     34                                pmFPAfile *file ///< FPA file into which to read
    3535    );
    3636
    … …  
    3838bool pmFPAviewWriteFitsImage(const pmFPAview *view, ///< View specifying level of interest
    3939                             pmFPAfile *file, ///< FPA file to write
    40                              pmConfig *config ///< Configuration
     40                             const pmConfig *config ///< Configuration
    4141                            );
    4242
    … …  
    4444bool pmFPAviewWriteFitsMask(const pmFPAview *view, ///< View specifying level of interest
    4545                            pmFPAfile *file, ///< FPA file to write
    46                             pmConfig *config ///< Configuration
     46                            const pmConfig *config ///< Configuration
    4747                           );
    4848
    … …  
    5050bool pmFPAviewWriteFitsWeight(const pmFPAview *view, ///< View specifying level of interest
    5151                              pmFPAfile *file, ///< FPA file to write
    52                               pmConfig *config ///< Configuration
     52                              const pmConfig *config ///< Configuration
    5353                             );
    5454

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

    r12810 r12832  
    498498      case PM_FPA_FILE_CMF:
    499499        psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
    500         return true;
     500        return true;
    501501      case PM_FPA_FILE_PSF:
    502502      case PM_FPA_FILE_JPEG:
    503503      case PM_FPA_FILE_KAPA:
    504504        psTrace ("psModules.camera", 5, "nothing to free for %s (%s)\n", file->filename, file->name);
    505         return true;
     505        return true;
    506506      default:
    507507        psError(PS_ERR_IO, true, "warning: type mismatch; saw type %d", file->type);
    … …  
    719719    psMetadata *phu = psFitsReadHeader (NULL, file->fits);
    720720    if (!file->format) {
    721         // XXX do we need to read the recipe here?  these files are supplemental, and probably
    722         // do not need to re-load the recipes
     721        // XXX do we need to read the recipe here?  these files are supplemental, and probably
     722        // do not need to re-load the recipes
    723723        file->format = pmConfigCameraFormatFromHeader (config, phu, false);
    724724        if (!file->format) {
    … …  
    748748
    749749// XXX this function is only called from pmFPAfileWrite
    750 bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, pmConfig *config)
     750bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, const pmConfig *config)
    751751{
    752752    PS_ASSERT_PTR_NON_NULL(file, false);

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

    r12585 r12832  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-24 17:53:55 $
     6 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-04-14 03:22:47 $
    88 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    3939bool pmFPAfileIOChecks (pmConfig *config, const pmFPAview *view, pmFPAfilePlace place);
    4040
    41 bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, pmConfig *config);
     41bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, const pmConfig *config);
    4242bool pmFPAfileReadPHU (pmFPAfile *file, const pmFPAview *view, pmConfig *config);
    4343

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

    r12696 r12832  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2007-03-30 21:12:56 $
     8 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2007-04-14 03:22:48 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    123123}
    124124
    125 bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     125bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    126126{
    127127
    … …  
    163163
    164164// read in all chip-level PSFmodel files for this FPA
    165 bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     165bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    166166{
    167167
    … …  
    175175
    176176// read in all cell-level PSFmodel files for this chip
    177 bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     177bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    178178{
    179179
    … …  
    187187
    188188// read in all readout-level PSFmodel files for this cell
    189 bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     189bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    190190{
    191191
    … …  
    199199
    200200// read in all readout-level Objects files for this cell
    201 bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     201bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    202202{
    203203    bool status;
    … …  
    229229
    230230
    231 bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     231bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    232232{
    233233
    … …  
    269269
    270270// read in all chip-level PSFmodel files for this FPA
    271 bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     271bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    272272{
    273273
    … …  
    281281
    282282// read in all cell-level PSFmodel files for this chip
    283 bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     283bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    284284{
    285285
    … …  
    293293
    294294// read in all readout-level PSFmodel files for this cell
    295 bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     295bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    296296{
    297297
    … …  
    305305
    306306// read in all readout-level Objects files for this cell
    307 bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     307bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    308308{
    309309

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

    r11253 r12832  
    66 * @author EAM, IfA
    77 *
    8  * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    9  * @date $Date: 2007-01-24 02:54:15 $
     8 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     9 * @date $Date: 2007-04-14 03:22:48 $
    1010 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    1111 */
    … …  
    1919psMetadata *pmPSFtoMetadata (psMetadata *metadata, pmPSF *psf);
    2020pmPSF *pmPSFfromMetadata (psMetadata *metadata);
    21 bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    22 bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    23 bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    24 bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    25 bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     21bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     22bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     23bool pmChipWritePSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     24bool pmCellWritePSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     25bool pmReadoutWritePSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
    2626
    27 bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    28 bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    29 bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    30 bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    31 bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     27bool pmFPAviewReadPSFmodel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     28bool pmFPAReadPSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     29bool pmChipReadPSFmodel (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     30bool pmCellReadPSFmodel (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     31bool pmReadoutReadPSFmodel (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
    3232
    3333/// @}

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

    r12706 r12832  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-03-31 04:18:04 $
     5 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-04-14 03:22:48 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6666
    6767// Given a FITS file pointer, write the table of object data
    68 bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     68bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    6969{
    7070
    … …  
    125125
    126126// read in all chip-level Objects files for this FPA
    127 bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     127bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    128128{
    129129
    … …  
    140140
    141141// read in all cell-level Objects files for this chip
    142 bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     142bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    143143{
    144144
    … …  
    155155
    156156// read in all readout-level Objects files for this cell
    157 bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     157bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    158158{
    159159
    … …  
    170170
    171171// write out all readout-level Objects files for this cell
    172 bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     172bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    173173{
    174174
    … …  
    260260        // we only need a PHU if chips->n > 1 and file->fileLevel == FPA
    261261        // otherwise, the chip header fills the PHU location
    262         // XXX this code could be placed in a 'pmSource_CMF_WritePHU' function and called
    263         // from pmFPAfileIO.c.
     262        // XXX this code could be placed in a 'pmSource_CMF_WritePHU' function and called
     263        // from pmFPAfileIO.c.
    264264        if ((file->fileLevel == PM_FPA_LEVEL_FPA) && (file->fpa->chips->n > 1) && !file->phu) {
    265265
    … …  
    275275                pmConfigConformHeader (outhead, file->format);
    276276
    277                 psMetadata *fileData = psMetadataLookupMetadata(NULL, file->format, "FILE"); // File information
    278                 const char *fpaNameHdr = psMetadataLookupStr(NULL, fileData, "FPA.NAME");
    279                 if (fpaNameHdr && strlen(fpaNameHdr) > 0) {
    280                     const char *fpaName = psMetadataLookupStr(NULL, file->fpa->concepts, "FPA.NAME");
    281                     psMetadataAddStr(outhead, PS_LIST_TAIL, fpaNameHdr, PS_META_REPLACE, "FPA name", fpaName);
    282                 }
     277                psMetadata *fileData = psMetadataLookupMetadata(NULL, file->format, "FILE"); // File information
     278                const char *fpaNameHdr = psMetadataLookupStr(NULL, fileData, "FPA.NAME");
     279                if (fpaNameHdr && strlen(fpaNameHdr) > 0) {
     280                    const char *fpaName = psMetadataLookupStr(NULL, file->fpa->concepts, "FPA.NAME");
     281                    psMetadataAddStr(outhead, PS_LIST_TAIL, fpaNameHdr, PS_META_REPLACE, "FPA name", fpaName);
     282                }
    283283            }
    284284
    … …  
    298298        // lookup the EXTNAME values used for table data and image header segments
    299299        char *rule = NULL;
    300         // Menu of EXTNAME rules
    301         psMetadata *menu = psMetadataLookupMetadata(&status, file->camera, "EXTNAME.RULES"); 
    302         if (!menu) {
    303             psError(PS_ERR_UNKNOWN, true, "missing EXTNAME.RULES in camera.config");
    304             return false;
    305         }
    306         // EXTNAME for image header
    307         rule = psMetadataLookupStr(&status, menu, "CMF.HEAD");
    308         if (!rule) {
    309             psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.HEAD in EXTNAME.RULES in camera.config");
    310             return false;
    311         }
     300        // Menu of EXTNAME rules
     301        psMetadata *menu = psMetadataLookupMetadata(&status, file->camera, "EXTNAME.RULES");
     302        if (!menu) {
     303            psError(PS_ERR_UNKNOWN, true, "missing EXTNAME.RULES in camera.config");
     304            return false;
     305        }
     306        // EXTNAME for image header
     307        rule = psMetadataLookupStr(&status, menu, "CMF.HEAD");
     308        if (!rule) {
     309            psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.HEAD in EXTNAME.RULES in camera.config");
     310            return false;
     311        }
    312312        headname = pmFPAfileNameFromRule (rule, file, view);
    313         // EXTNAME for table data
    314         rule = psMetadataLookupStr(&status, menu, "CMF.DATA"); 
    315         if (!rule) {
    316             psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.DATA in EXTNAME.RULES in camera.config");
    317             return false;
    318         }
     313        // EXTNAME for table data
     314        rule = psMetadataLookupStr(&status, menu, "CMF.DATA");
     315        if (!rule) {
     316            psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.DATA in EXTNAME.RULES in camera.config");
     317            return false;
     318        }
    319319        dataname = pmFPAfileNameFromRule (rule, file, view);
    320320
    … …  
    348348        }
    349349
    350         // create a header to hold the output data
    351         outhead = psMetadataAlloc ();
    352 
    353         // determine the output table format
    354         psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSPHOT");
    355         if (!status) {
    356             psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
    357             return false;
    358         }
    359         exttype = psMemIncrRefCounter (psMetadataLookupStr(&status, recipe, "OUTPUT.FORMAT"));
    360         if (!exttype) {
    361             exttype = psStringCopy ("SMPDATA");
    362         }
    363 
    364         // write the links to the image header
     350        // create a header to hold the output data
     351        outhead = psMetadataAlloc ();
     352
     353        // determine the output table format
     354        psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PSPHOT");
     355        if (!status) {
     356            psError(PS_ERR_UNKNOWN, true, "missing recipe PSPHOT in config data");
     357            return false;
     358        }
     359        exttype = psMemIncrRefCounter (psMetadataLookupStr(&status, recipe, "OUTPUT.FORMAT"));
     360        if (!exttype) {
     361            exttype = psStringCopy ("SMPDATA");
     362        }
     363
     364        // write the links to the image header
    365365        psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTHEAD", PS_META_REPLACE, "name of image extension w/", headname);
    366366        psMetadataAddStr (outhead, PS_LIST_TAIL, "EXTTYPE", PS_META_REPLACE, "extension type", exttype);
    367367        psFree (exttype);
    368368
    369         // XXX these are case-sensitive since the EXTYPE is case-sensitive
    370         status = false;
    371         if (!strcmp (exttype, "SMPDATA")) {
    372             status = pmSourcesWrite_SMPDATA (file->fits, sources, file->header, outhead, dataname);
    373         }
    374         if (!strcmp (exttype, "PS1_DEV_0")) {
    375             status = pmSourcesWrite_PS1_DEV_0 (file->fits, sources, file->header, outhead, dataname);
    376         }
     369        // XXX these are case-sensitive since the EXTYPE is case-sensitive
     370        status = false;
     371        if (!strcmp (exttype, "SMPDATA")) {
     372            status = pmSourcesWrite_SMPDATA (file->fits, sources, file->header, outhead, dataname);
     373        }
     374        if (!strcmp (exttype, "PS1_DEV_0")) {
     375            status = pmSourcesWrite_PS1_DEV_0 (file->fits, sources, file->header, outhead, dataname);
     376        }
    377377
    378378        if (!status) {
    … …  
    400400
    401401// Given a FITS file pointer, read the table of object data
    402 bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     402bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    403403{
    404404    pmFPA *fpa = file->fpa;
    … …  
    439439
    440440// read in all chip-level Objects files for this FPA
    441 bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     441bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    442442{
    443443    for (int i = 0; i < fpa->chips->n; i++) {
    … …  
    449449
    450450// read in all cell-level Objects files for this chip
    451 bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     451bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    452452{
    453453    chip->data_exists = false;
    … …  
    455455        pmCell *cell = chip->cells->data[i];
    456456        pmCellReadObjects (cell, view, file, config);
    457         if (!cell->data_exists) continue;
    458         chip->data_exists = true;
     457        if (!cell->data_exists) continue;
     458        chip->data_exists = true;
    459459    }
    460460    return true;
    … …  
    462462
    463463// read in all readout-level Objects files for this cell
    464 bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     464bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    465465{
    466466    // multiple readout mode is not yet defined for CMP or CMF files
    … …  
    475475        pmReadout *readout = cell->readouts->data[i];
    476476        pmReadoutReadObjects (readout, view, file, config);
    477         if (!readout->data_exists) {
    478             continue;
    479         }
    480 
    481         // load in the concept information for this cell
    482         if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
    483             //psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell");
    484             //return false;
    485             psWarning("Difficulty reading concepts for cell; attempting to proceed.");
    486         }
     477        if (!readout->data_exists) {
     478            continue;
     479        }
     480
     481        // load in the concept information for this cell
     482        if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
     483            //psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell");
     484            //return false;
     485            psWarning("Difficulty reading concepts for cell; attempting to proceed.");
     486        }
    487487        cell->data_exists = true;
    488488    }
    … …  
    491491
    492492// read in all readout-level Objects files for this cell
    493 bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     493bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    494494{
    495495
    … …  
    500500    switch (file->type) {
    501501      case PM_FPA_FILE_OBJ:
    502         psError(PS_ERR_UNKNOWN, true, "OBJ is not supported as an input object format");
    503         return false;
     502        psError(PS_ERR_UNKNOWN, true, "OBJ is not supported as an input object format");
     503        return false;
    504504
    505505      case PM_FPA_FILE_SX:
    506         psError(PS_ERR_UNKNOWN, true, "SX is not supported as an input object format");
    507         return false;
     506        psError(PS_ERR_UNKNOWN, true, "SX is not supported as an input object format");
     507        return false;
    508508
    509509      case PM_FPA_FILE_CMP:
    … …  
    530530        psString realname = pmConfigConvertFilename (file->filename, config, create);
    531531
    532         // read the PHU from this file
     532        // read the PHU from this file
    533533        file->fits = psFitsOpen (realname, "r");
    534534        if (hdu->header != NULL) {
    … …  
    549549        // lookup the EXTNAME values used for table data and image header segments
    550550        char *rule = NULL;
    551         // Menu of EXTNAME rules
     551        // Menu of EXTNAME rules
    552552        psMetadata *menu = psMetadataLookupMetadata(&status, file->camera, "EXTNAME.RULES");
    553         if (!menu) {
    554             psError(PS_ERR_UNKNOWN, true, "missing EXTNAME.RULES in camera.config");
    555             return false;
    556         }
    557         // EXTNAME for image header
    558         rule = psMetadataLookupStr(&status, menu, "CMF.HEAD");
    559         if (!rule) {
    560             psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.HEAD in EXTNAME.RULES in camera.config");
    561             return false;
    562         }
     553        if (!menu) {
     554            psError(PS_ERR_UNKNOWN, true, "missing EXTNAME.RULES in camera.config");
     555            return false;
     556        }
     557        // EXTNAME for image header
     558        rule = psMetadataLookupStr(&status, menu, "CMF.HEAD");
     559        if (!rule) {
     560            psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.HEAD in EXTNAME.RULES in camera.config");
     561            return false;
     562        }
    563563        char *headname = pmFPAfileNameFromRule (rule, file, view);
    564         // EXTNAME for table data
     564        // EXTNAME for table data
    565565        rule = psMetadataLookupStr(&status, menu, "CMF.DATA");
    566         if (!rule) {
    567             psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.DATA in EXTNAME.RULES in camera.config");
    568             return false;
    569         }
     566        if (!rule) {
     567            psError(PS_ERR_UNKNOWN, true, "missing entry for CMF.DATA in EXTNAME.RULES in camera.config");
     568            return false;
     569        }
    570570        char *dataname = pmFPAfileNameFromRule (rule, file, view);
    571571
    572         // advance to the IMAGE HEADER extension
     572        // advance to the IMAGE HEADER extension
    573573        if (hdu->header == NULL) {
    574             // if the IMAGE header does not exist, we have no data for this view
     574            // if the IMAGE header does not exist, we have no data for this view
    575575            if (!psFitsMoveExtName (file->fits, headname)) {
    576                 readout->data_exists = false;
    577                 psFree (headname);
    578                 psFree (dataname);
    579                 return true;
    580             }
     576                readout->data_exists = false;
     577                psFree (headname);
     578                psFree (dataname);
     579                return true;
     580            }
    581581            hdu->header = psFitsReadHeader (NULL, file->fits);
    582582        }
    … …  
    587587        if (extdata) {
    588588            // if EXTDATA is defined in the header, use that value for 'dataname'
    589             psFree (dataname);
    590             dataname = psMemIncrRefCounter (extdata);
    591         }
    592        
    593         // advance to the table data extension
    594         // since we have read the IMAGE header, the TABLE header should exist
     589            psFree (dataname);
     590            dataname = psMemIncrRefCounter (extdata);
     591        }
     592
     593        // advance to the table data extension
     594        // since we have read the IMAGE header, the TABLE header should exist
    595595        if (!psFitsMoveExtName (file->fits, dataname)) {
    596596            psAbort("cannot find data extension %s in %s", dataname, file->filename);
    597597        }
    598598
    599         psMetadata *tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
    600         if (!tableHeader) psAbort("cannot read table header");
     599        psMetadata *tableHeader = psFitsReadHeader(NULL, file->fits); // The FITS header
     600        if (!tableHeader) psAbort("cannot read table header");
    601601
    602602        char *exttype = psMetadataLookupStr (NULL, tableHeader, "EXTTYPE");
    603         if (!exttype) psAbort("cannot read table type");
    604 
    605         // XXX these are case-sensitive since the EXTYPE is case-sensitive
    606         if (!strcmp (exttype, "SMPDATA")) {
    607             sources = pmSourcesRead_SMPDATA (file->fits, hdu->header);
    608         }
    609         if (!strcmp (exttype, "PS1_DEV_0")) {
    610             sources = pmSourcesRead_PS1_DEV_0 (file->fits, hdu->header);
    611         }
     603        if (!exttype) psAbort("cannot read table type");
     604
     605        // XXX these are case-sensitive since the EXTYPE is case-sensitive
     606        if (!strcmp (exttype, "SMPDATA")) {
     607            sources = pmSourcesRead_SMPDATA (file->fits, hdu->header);
     608        }
     609        if (!strcmp (exttype, "PS1_DEV_0")) {
     610            sources = pmSourcesRead_PS1_DEV_0 (file->fits, hdu->header);
     611        }
    612612
    613613        psTrace("psModules.objects", 6, "read CMF table from %s : %s : %s", file->filename, headname, dataname);
    614         psFree (headname);
     614        psFree (headname);
    615615        psFree (dataname);
    616         psFree (tableHeader);
     616        psFree (tableHeader);
    617617        break;
    618618

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

    r12481 r12832  
    44 * @author EAM, IfA; GLG, MHPCC
    55 *
    6  * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-03-18 22:03:21 $
     6 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-04-14 03:22:48 $
    88 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    99 *
    … …  
    3737bool pmPeaksWriteText (psArray *peaks, char *filename);
    3838
    39 bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    40 bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    41 bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    42 bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    43 bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     39bool pmFPAviewReadObjects (const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     40bool pmFPAReadObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     41bool pmChipReadObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     42bool pmCellReadObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     43bool pmReadoutReadObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
    4444
    45 bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    46 bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    47 bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    48 bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    49 bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config);
     45bool pmFPAviewWriteObjects (const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     46bool pmFPAWriteObjects (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     47bool pmChipWriteObjects (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     48bool pmCellWriteObjects (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     49bool pmReadoutWriteObjects (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
    5050
    5151/// @}

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

    r12696 r12832  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-03-30 21:12:56 $
     7 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-04-14 03:22:48 $
    99 *
    1010 *  Copyright 2006 IfA, University of Hawaii
    … …  
    4242
    4343    // plot the sx, sy moments plane (faint and bright sources)
    44     bool pmSourcePlotMoments (const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout)
     44    bool pmSourcePlotMoments (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout)
    4545{
    4646
    … …  
    159159# else
    160160
    161     bool pmSourcePlotMoments (const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout)
     161    bool pmSourcePlotMoments (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout)
    162162{
    163163    psLogMsg ("psphot", 3, "skipping moments plot");

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

    r12696 r12832  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-03-30 21:12:56 $
     7 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-04-14 03:22:48 $
    99 *
    1010 *  Copyright 2006 IfA, University of Hawaii
    … …  
    4444    // plot the PSF measured sx, sy, sxy as vector field
    4545    // pull the sources from the config / file?
    46     bool pmSourcePlotPSFModel (const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout)
     46    bool pmSourcePlotPSFModel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout)
    4747{
    4848
    … …  
    225225# else
    226226
    227     bool pmSourcePlotPSFModel (const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout)
     227    bool pmSourcePlotPSFModel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout)
    228228{
    229229    psLogMsg ("psphot", 3, "skipping psf model plot");

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

    r12696 r12832  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-03-30 21:12:56 $
     7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-04-14 03:22:48 $
    99 *
    1010 *  Copyright 2006 IfA, University of Hawaii
    … …  
    3232// this function is called for the specific plotting program at the fileLevel
    3333// fileLevel must be >= chip
    34 bool pmFPAviewWriteSourcePlot(const pmFPAview *view, pmFPAfile *file, pmConfig *config)
     34bool pmFPAviewWriteSourcePlot(const pmFPAview *view, pmFPAfile *file, const pmConfig *config)
    3535{
    3636    PS_ASSERT_PTR_NON_NULL(view, false);
    … …  
    5454
    5555// read in all chip-level SourcePlot files for this FPA
    56 bool pmFPAWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout)
     56bool pmFPAWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout)
    5757{
    5858    PS_ASSERT_PTR_NON_NULL(fpa, false);
    … …  
    9494
    9595// read in all cell-level SourcePlot files for this chip
    96 bool pmChipWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout)
     96bool pmChipWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout)
    9797{
    9898    PS_ASSERT_PTR_NON_NULL(view, false);
    … …  
    149149 *     - what are the dimensions of this element?
    150150 *     - create a new page for this element?
    151  
     151
    152152 * the answers to these questions come from slightly different locations
    153153 * for the different types of plots:
    154  
    155  *  1) focal-plane layout based plots: 
     154
     155 *  1) focal-plane layout based plots:
    156156 *     - dimensions depend on fileLevel
    157  
    158  *  2) multi-row plots: 
     157
     158 *  2) multi-row plots:
    159159 *     - dimensions depend on total number of rows
    160  
    161  *  2) multi-page plots: 
     160
     161 *  2) multi-page plots:
    162162 *     - dimensions depend on total number of rows
    163163 */

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

    r11253 r12832  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-01-24 02:54:15 $
     6 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-04-14 03:22:48 $
    88 * Copyright 2006 Institute for Astronomy, University of Hawaii
    99 */
    … …  
    3131pmSourcePlotLayout *pmSourcePlotLayoutAlloc();
    3232
    33 bool pmFPAviewWriteSourcePlot(const pmFPAview *view, pmFPAfile *file, pmConfig *config);
    34 bool pmFPAWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout);
    35 bool pmChipWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout);
    36 bool pmSourcePlotPSFModel (const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout);
    37 bool pmSourcePlotMoments (const pmFPAview *view, pmFPAfile *file, pmConfig *config, pmSourcePlotLayout *layout);
     33bool pmFPAviewWriteSourcePlot(const pmFPAview *view, pmFPAfile *file, const pmConfig *config);
     34bool pmFPAWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout);
     35bool pmChipWriteSourcePlot (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout);
     36bool pmSourcePlotPSFModel (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout);
     37bool pmSourcePlotMoments (const pmFPAview *view, pmFPAfile *file, const pmConfig *config, pmSourcePlotLayout *layout);
    3838
    3939/// @}
Note: See TracChangeset for help on using the changeset viewer.