IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 21323


Ignore:
Timestamp:
Feb 5, 2009, 10:44:04 AM (17 years ago)
Author:
eugene
Message:

merging Doxygen comments by Bill G from eam_branch_20081230

Location:
trunk/pswarp/src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/pswarp/src/pswarp.c

    r20410 r21323  
     1/** @file pswarp.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214

  • trunk/pswarp/src/pswarp.h

    r20307 r21323  
     1/** @file pswarp.h
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#ifdef HAVE_CONFIG_H
    214#include <config.h>
    … …  
    1426
    1527#include "pswarpErrorCodes.h"
    16 #define PSWARP_RECIPE  "PSWARP" // Name of the recipe to use
    17 #define PSASTRO_RECIPE "PSASTRO" // Name of the recipe to use
     28#define PSWARP_RECIPE  "PSWARP" ///< Name of the recipe to use
     29#define PSASTRO_RECIPE "PSASTRO" ///< Name of the recipe to use
    1830
    19 #define PSWARP_ANALYSIS_VARFACTOR "PSWARP.VARFACTOR" // Name for variance factor in analysis metadata
    20 #define PSWARP_ANALYSIS_GOODPIX   "PSWARP.GOODPIX" // Name for number of good pixels in analysis metadata
     31#define PSWARP_ANALYSIS_VARFACTOR "PSWARP.VARFACTOR" ///< Name for variance factor in analysis metadata
     32#define PSWARP_ANALYSIS_GOODPIX   "PSWARP.GOODPIX" ///< Name for number of good pixels in analysis metadata
    2133
    22 // a single pswarpMap converts coordinates from one image to a second image
    23 // the linear model is only valid over a limited range of pixels
     34/**
     35 * a single pswarpMap converts coordinates from one image to a second image
     36 * the linear model is only valid over a limited range of pixels
     37 */
    2438typedef struct {
    2539    double Xo, Xx, Xy;
    … …  
    2943} pswarpMap;
    3044
    31 // the pswarpMapGrid carries a collection of pswarpMag structures representing the
    32 // local value of the pswarpMap at different locations in the image.
     45/* the pswarpMapGrid carries a collection of pswarpMag structures representing
     46 * the local value of the pswarpMap at different locations in the image.
     47 */
    3348typedef struct {
    3449    pswarpMap ***maps;
    35     int nXpts, nYpts;                   // number of x,y samples in the grid
    36     int nXpix, nYpix;                   // x,y spacing in src image pixels of grid samples
    37     double xMin,  yMin;                 // coordinate of first grid sample
     50    int nXpts, nYpts;                   ///< number of x,y samples in the grid
     51    int nXpix, nYpix;                   ///< x,y spacing in src image pixels of grid samples
     52    double xMin,  yMin;                 ///< coordinate of first grid sample
    3853} pswarpMapGrid;
    3954
    4055typedef struct {
    41     // values which are common to all tiles
     56    /** values which are common to all tilesa */
    4257    pmReadout *input;
    4358    pmReadout *output;
    … …  
    4661    psImage *region;
    4762
    48     // input values for this tile
     63    /** input values for this tile */
    4964    int gridX;
    5065    int gridY;
    5166
    52     // output values for this tile
    53     long goodPixels;                    // Number of good pixels
    54     int xMin, xMax, yMin, yMax;         // Bounds of tile
     67    /** output values for this tile */
     68    long goodPixels;                    //< Number of good pixels
     69    int xMin, xMax, yMin, yMax;         //< Bounds of tile
    5570} pswarpTransformTileArgs;
    5671
    … …  
    91106    );
    92107
    93 // define threads for this program
     108/**
     109 * define threads for this program
     110 */
    94111bool pswarpSetThreads ();

  • trunk/pswarp/src/pswarpArguments.c

    r20347 r21323  
     1/** @file pswarpArguments.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214# include <glob.h>
    … …  
    2638
    2739    {
    28         int arg;                        // Argument Number
     40        int arg;                        ///< Argument Number
    2941        if ((arg = psArgumentGet(argc, argv, "-psphot-visual"))) {
    3042            psArgumentRemove(arg, &argc, argv);
    … …  
    105117}
    106118
    107 // Parse the recipe and format into the arguments
     119/**
     120 * Parse the recipe and format into the arguments
     121 */
    108122bool pswarpOptions(pmConfig *config)
    109123{
    … …  
    116130
    117131    // Get grid size
    118     bool status;                        // Status of MD lookup
     132    bool status;                        ///< Status of MD lookup
    119133    int nGridX = psMetadataLookupS32(&status, recipe, "GRID.NX");
    120134    if (!status || nGridX <= 0) {
    … …  
    129143
    130144    // Get interpolation mode
    131     const char *name = psMetadataLookupStr (&status, recipe, "INTERPOLATION.MODE"); // Name of interp mode
     145    const char *name = psMetadataLookupStr (&status, recipe, "INTERPOLATION.MODE"); ///< Name of interp mode
    132146    if (!name) {
    133147        name = "BILINEAR";
    134148        psLogMsg("pswarp", 3, "defaulting to %s interpolation", name);
    135149    }
    136     psImageInterpolateMode interpolationMode = psImageInterpolateModeFromString(name); // Mode for interp.
     150    psImageInterpolateMode interpolationMode = psImageInterpolateModeFromString(name); ///< Mode for interp.
    137151    if (interpolationMode == PS_INTERPOLATE_NONE) {
    138152        interpolationMode = PS_INTERPOLATE_BILINEAR;
    … …  
    148162    }
    149163
    150     float poorFrac = psMetadataLookupF32(&status, recipe, "POOR.FRAC"); // Frac of bad flux for a "poor"
     164    float poorFrac = psMetadataLookupF32(&status, recipe, "POOR.FRAC"); ///< Frac of bad flux for a "poor"
    151165    if (!status) {
    152166        poorFrac = 0.0;
    … …  
    154168    }
    155169
    156     float acceptFrac = psMetadataLookupF32(&status, recipe, "ACCEPT.FRAC"); // Min fraction of good pixels
     170    float acceptFrac = psMetadataLookupF32(&status, recipe, "ACCEPT.FRAC"); ///< Min fraction of good pixels
    157171    if (!status) {
    158172        acceptFrac = 0.0;
    … …  
    194208    if (dump_file) {
    195209        const char *skyCamera = psMetadataLookupStr(NULL, config->arguments,
    196                                                     "SKYCELL.CAMERA");  // Name of camera for skycell
     210                                                    "SKYCELL.CAMERA");  ///< Name of camera for skycell
    197211        pmConfigCamerasCull(config, skyCamera);
    198212        pmConfigRecipesCull(config, "PSWARP,PPSTATS,PSPHOT,MASKS");

  • trunk/pswarp/src/pswarpCleanup.c

    r18839 r21323  
     1/** @file pswarpCleanup.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214

  • trunk/pswarp/src/pswarpDefine.c

    r18712 r21323  
     1/** @file pswarpDefine.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    2 // this function loads the skycell metadata
    314
     15/**
     16 * loads the skycell metadata
     17 */
    418bool pswarpDefine (pmConfig *config) {
    519
    … …  
    4256        view->cell = 0;
    4357        view->readout = 0;
    44         pmCell *source = pmFPAfileThisCell(config->files, view, "PSWARP.SKYCELL"); // Source cell
    45         pmHDU *hdu = pmHDUFromCell(source); // HDU for source
     58        pmCell *source = pmFPAfileThisCell(config->files, view, "PSWARP.SKYCELL"); ///< Source cell
     59        pmHDU *hdu = pmHDUFromCell(source); ///< HDU for source
    4660        if (!hdu || !hdu->header) {
    4761            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find header for sky cell.");
    … …  
    4963            return false;
    5064        }
    51         int numCols = psMetadataLookupS32(NULL, hdu->header, "NAXIS1"); // Number of columns
    52         int numRows = psMetadataLookupS32(NULL, hdu->header, "NAXIS2"); // Number of rows
     65        int numCols = psMetadataLookupS32(NULL, hdu->header, "NAXIS1"); ///< Number of columns
     66        int numRows = psMetadataLookupS32(NULL, hdu->header, "NAXIS2"); ///< Number of rows
    5367
    54         pmCell *target = pmFPAviewThisCell(view, output->fpa); // Target cell
    55         pmReadout *readout = pmReadoutAlloc(target); // Target readout
     68        pmCell *target = pmFPAviewThisCell(view, output->fpa); ///< Target cell
     69        pmReadout *readout = pmReadoutAlloc(target); ///< Target readout
    5670        readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
    5771        psImageInit(readout->image, NAN);
    … …  
    7286    view->cell = 0;
    7387    view->readout = -1;
    74     pmHDU *phu = pmFPAviewThisPHU(view, skycell->fpa); // Skycell PHU
    75     pmHDU *hdu = pmFPAviewThisHDU(view, skycell->fpa); // Skycell header
     88    pmHDU *phu = pmFPAviewThisPHU(view, skycell->fpa); ///< Skycell PHU
     89    pmHDU *hdu = pmFPAviewThisHDU(view, skycell->fpa); ///< Skycell header
    7690    bool bilevelAstrometry = false;
    7791    if (phu) {
    … …  
    8397
    8498    // We read from the skycell into the output.  i.e., the output receives the desired astrometry.
    85     pmChip *outputChip = pmFPAviewThisChip(view, output->fpa); // Chip in the output
     99    pmChip *outputChip = pmFPAviewThisChip(view, output->fpa); ///< Chip in the output
    86100    if (bilevelAstrometry) {
    87101        if (!pmAstromReadBilevelMosaic(output->fpa, phu->header)) {
    … …  
    104118    }
    105119
    106     const char *name = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.OBS"); // Name of FPA
     120    const char *name = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.OBS"); ///< Name of FPA
    107121    view->chip = view->cell = view->readout = -1;
    108122    pmFPAAddSourceFromView(output->fpa, name, view, output->format);

  • trunk/pswarp/src/pswarpDefineSkycell.c

    r21168 r21323  
     1/** @file pswarpDefineSkycell.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    3 // XXX this function is based on pmFPAfileDefineFromArgs
    4 // a skycell consists of only one file
     15/**
     16 * \brief XXX this function is based on pmFPAfileDefineFromArgs
     17 * a skycell consists of only one file
    518
    6 // search for argname on the config->argument list
    7 // construct an FPA based on the files in this list (must represent a single FPA)
    8 // built the association between the FPA elements (CHIP/CELL) and the files
    9 // define the pmFPAfile filename and bind it to this FPA
    10 // save the pmFPAfile on config->files
    11 // return the pmFPAfile (a view to the one saved on config->files)
     19 * search for argname on the config->argument list and construct
     20 * an FPA based on the files in this list (must represent a single FPA)
     21 * built the association between the FPA elements (CHIP/CELL) and the files
     22 * define the pmFPAfile filename and bind it to this FPA
     23 * save the pmFPAfile on config->files
     24 * @return the pmFPAfile (a view to the one saved on config->files)
     25 */
    1226bool pswarpDefineSkycell (pmFPAfile **outFile, pmConfig **outConfig, pmConfig *config, const char *filename, const char *argname)
    1327{

  • trunk/pswarp/src/pswarpErrorCodes.c.in

    r11282 r21323  
     1/** @file pswarpErrorCodes.c.in
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
     13#include "pslib.h"
     14#include "pswarpErrorCodes.h"
     15
    116/*
    217 * The line
    … …  
    520 * will be replaced by values from errorCodes.dat
    621 */
    7 #include "pslib.h"
    8 #include "pswarpErrorCodes.h"
    9 
    1022void pswarpErrorRegister(void)
    1123{
    … …  
    1426       { PSWARP_ERR_${ErrorCode}, "${ErrorDescription}"},
    1527    };
    16     static int nerror = PSWARP_ERR_NERROR - PSWARP_ERR_BASE; // number of values in enum
     28    static int nerror = PSWARP_ERR_NERROR - PSWARP_ERR_BASE; ///< number of values in enum
    1729
    1830    for (int i = 0; i < nerror; i++) {

  • trunk/pswarp/src/pswarpErrorCodes.h.in

    r10946 r21323  
     1/** @file pswarpErrorCodes.h.in
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#if !defined(PSWARP_ERROR_CODES_H)
    214#define PSWARP_ERROR_CODES_H

  • trunk/pswarp/src/pswarpHeadersLoad.c

    r13109 r21323  
     1/** @file pswarpHeadersLoad.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    3 // XXX this function should load all of the PSWARP.INPUT headers
    4 // it should examine the overlap between each chip in PSWARP.INPUT
    5 // and the output (pswarpMatchRange) and select/de-select the chips
    6 // and/or cell which contribute pixels.
    7 
    8 // pswarpDataLoad should then load the pixel of the needed chips
    9 
    10 // all of the different astrometry analysis modes use the same data load loop
     15/** XXX this function should load all of the PSWARP.INPUT headers
     16 * it should examine the overlap between each chip in PSWARP.INPUT
     17 * and the output (pswarpMatchRange) and select/de-select the chips
     18 * and/or cell which contribute pixels.
     19 *
     20 * pswarpDataLoad should then load the pixel of the needed chips
     21 *
     22 * all of the different astrometry analysis modes use the same data load loop
     23 */
    1124bool pswarpHeadersLoad (pmConfig *config) {
    1225

  • trunk/pswarp/src/pswarpLoop.c

    r21256 r21323  
     1/** @file pswarpLoop.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#include "pswarp.h"
    214#include <ppStats.h>
    315
    4 #define WCS_NONLIN_TOL 0.001            // Non-linear tolerance for header WCS
    5 #define PSPHOT_FIND_PSF 1               // Use psphot's findPSF function?
    6 #define TESTING 0                       // Testing output?
    7 
    8 // Lists of file rules used at different stages
    9 #include "pswarpFileNames.h"
    10 
    11 // XXX these are generic functions which should be moved to psModules
    12 // Activate a list of files
    13 static void fileActivation(pmConfig *config, // Configuration
    14                            char **files, // Files to turn on/off
    15                            bool state   // Activation state
     16#define WCS_NONLIN_TOL 0.001            ///< Non-linear tolerance for header WCS
     17#define PSPHOT_FIND_PSF 1               ///< Use psphot's findPSF function?
     18#define TESTING 0                       ///< Testing output?
     19
     20#include "pswarpFileNames.h" ///< Lists of file rules used at different stages
     21
     22/**
     23 * XXX these are generic functions which should be moved to psModules
     24 * Activate a list of files
     25 */
     26static void fileActivation(pmConfig *config, ///< Configuration
     27                           char **files, ///< Files to turn on/off
     28                           bool state   ///< Activation state
    1629    )
    1730{
    … …  
    2235}
    2336
    24 // Run down the FPA hierarchy, checking files
    25 static bool ioChecksBefore(pmConfig *config // Configuration
     37/**
     38 * Run down the FPA hierarchy, checking files
     39 */
     40static bool ioChecksBefore(pmConfig *config ///< Configuration
    2641                           )
    2742{
    28     pmFPAview *view = pmFPAviewAlloc(0); // View for checking
    29     bool status = true;                 // Status of checks
     43    pmFPAview *view = pmFPAviewAlloc(0); ///< View for checking
     44    bool status = true;                 ///< Status of checks
    3045    status &= pmFPAfileIOChecks(config, view, PM_FPA_BEFORE);
    3146    view->chip = 0;
    … …  
    3752}
    3853
    39 // Run up the FPA hierarchy, checking files
    40 static bool ioChecksAfter(pmConfig *config // Configuration
     54/**
     55 * Run up the FPA hierarchy, checking files
     56 */
     57static bool ioChecksAfter(pmConfig *config ///< Configuration
    4158                          )
    4259{
    43     pmFPAview *view = pmFPAviewAlloc(0); // View for checking
     60    pmFPAview *view = pmFPAviewAlloc(0); ///< View for checking
    4461    view->chip = view->cell = 0;
    45     bool status = true;                 // Status of checks
     62    bool status = true;                 ///< Status of checks
    4663    status &= pmFPAfileIOChecks(config, view, PM_FPA_AFTER);
    4764    view->cell = -1;
    … …  
    5471
    5572
    56 // Loop over the inputs, warp them to the output skycell and then write out the output.
     73/**
     74 * Loop over the inputs, warp them to the output skycell and then write out the output.
     75 */
    5776bool pswarpLoop(pmConfig *config)
    5877{
    … …  
    100119    psFree (view);
    101120
    102     bool mdok;                          // Status of MD lookup
    103     const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); // Filename for statistics
    104     psMetadata *stats = NULL;           // Container for statistics
    105     FILE *statsFile = NULL;             // File stream for statistics
     121    bool mdok;                          ///< Status of MD lookup
     122    const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); ///< Filename for statistics
     123    psMetadata *stats = NULL;           ///< Container for statistics
     124    FILE *statsFile = NULL;             ///< File stream for statistics
    106125    if (mdok && statsName && strlen(statsName) > 0) {
    107126        psString resolved = pmConfigConvertFilename(statsName, config, true, true);
    … …  
    245264    }
    246265
    247     pmCell *outCell = output->parent;   // Output cell
    248     pmChip *outChip = outCell->parent;  // Output chip
    249     pmFPA *outFPA = outChip->parent;    // Output FP
     266    pmCell *outCell = output->parent;   ///< Output cell
     267    pmChip *outChip = outCell->parent;  ///< Output chip
     268    pmFPA *outFPA = outChip->parent;    ///< Output FP
    250269
    251270    if (!pswarpPixelFraction(output, stats, config)) {
    … …  
    265284        varFactor /= goodPix;
    266285
    267         psMetadataItem *vfItem = psMetadataLookup(outCell->concepts, "CELL.VARFACTOR"); // Item to update
     286        psMetadataItem *vfItem = psMetadataLookup(outCell->concepts, "CELL.VARFACTOR"); ///< Item to update
    268287        psAssert(vfItem && vfItem->type == PS_TYPE_F32, "Concept should be as specified.");
    269288        if (!isfinite(vfItem->data.F32)) {
    … …  
    283302    psFree(cells);
    284303
    285     psRegion *trimsec = psMetadataLookupPtr(NULL, outCell->concepts, "CELL.TRIMSEC"); // Trim section
    286     trimsec->x0 = trimsec->x1 = trimsec->y0 = trimsec->y1 = 0; // All pixels
     304    psRegion *trimsec = psMetadataLookupPtr(NULL, outCell->concepts, "CELL.TRIMSEC"); ///< Trim section
     305    trimsec->x0 = trimsec->x1 = trimsec->y0 = trimsec->y1 = 0; ///< All pixels
    287306
    288307    if (!psMetadataCopy(outFPA->concepts, input->fpa->concepts)) {
    … …  
    293312    }
    294313
    295     pmHDU *hdu = outFPA->hdu;           // HDU for the output warped image
     314    pmHDU *hdu = outFPA->hdu;           ///< HDU for the output warped image
    296315
    297316    // Copy header from target
    298317    {
    299         pmFPAview *skyView = pmFPAviewAlloc(0); // View into skycell
     318        pmFPAview *skyView = pmFPAviewAlloc(0); ///< View into skycell
    300319        skyView->chip = skyView->cell = 0;
    301320        pmCell *cell = pmFPAfileThisCell(config->files, skyView, "PSWARP.SKYCELL"); // Skycell cell
    302321        psFree(skyView);
    303         pmHDU *skyHDU = pmHDUFromCell(cell); // HDU
     322        pmHDU *skyHDU = pmHDUFromCell(cell); ///< HDU
    304323        if (!skyHDU) {
    305324            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find skycell HDU.");
    … …  
    333352        pmFPACopy(photFile->fpa, outFPA);
    334353
    335         pmFPAview *view = pmFPAviewAlloc(0); // View into skycell
     354        pmFPAview *view = pmFPAviewAlloc(0); ///< View into skycell
    336355        view->chip = view->cell = view->readout = 0;
    337356
    … …  
    340359        // We can adjust the weight directly since this is a deep copy
    341360        pmReadout *photRO = pmFPAviewThisReadout(view, photFile->fpa);
    342         float vf = psMetadataLookupF32(NULL, photRO->parent->concepts, "CELL.VARFACTOR"); // Variance factor
     361        float vf = psMetadataLookupF32(NULL, photRO->parent->concepts, "CELL.VARFACTOR"); ///< Variance factor
    343362        psBinaryOp(photRO->weight, photRO->weight, "*", psScalarAlloc(vf, PS_TYPE_F32));
    344363
    … …  
    359378#if (TESTING)
    360379        {
    361             #define PSF_SIZE 20         // Half-size of PSF
    362             #define PSF_FLUX 10000      // Central flux for PSF
     380            #define PSF_SIZE 20         ///< Half-size of PSF
     381            #define PSF_FLUX 10000      ///< Central flux for PSF
    363382            pmChip *photChip = pmFPAviewThisChip(view, photFile->fpa);
    364383            pmPSF *psf = psMetadataLookupPtr(NULL, photChip->analysis, "PSPHOT.PSF");
    … …  
    390409    const char *chipName = psMetadataLookupStr(NULL, output->parent->parent->concepts, "CHIP.NAME");
    391410    const char *cellName = psMetadataLookupStr(NULL, output->parent->concepts, "CELL.NAME");
    392     psString headerName = NULL; // Header name for MD5
     411    psString headerName = NULL; ///< Header name for MD5
    393412    psStringAppend(&headerName, "MD5_%s_%s_%d", chipName, cellName, view->readout);
    394     psVector *md5 = psImageMD5(output->image); // md5 hash
    395     psString md5string = psMD5toString(md5); // String
     413    psVector *md5 = psImageMD5(output->image); ///< md5 hash
     414    psString md5string = psMD5toString(md5); ///< String
    396415    psFree(md5);
    397416    psMetadataAddStr(hdu->header, PS_LIST_TAIL, headerName, PS_META_REPLACE,

  • trunk/pswarp/src/pswarpMapGrid.c

    r18839 r21323  
     1/** @file pswarpMapGrid.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    3 // pswarpMapGridFromImage builds a set (a grid) of locally-linear maps which convert the source
    4 // coordinates (src) to destination coordinates (dest).  we construct a grid with superpixel
    5 // spacing of nXpix, nYpix.  The transformation for each grid cell is valid for the superpixel.
    6 // The grid over-fills the source image so every source image pixel is guaranteed to have a map.
     15/**
     16 * pswarpMapGridFromImage builds a set (a grid) of locally-linear maps which convert the source
     17 * coordinates (src) to destination coordinates (dest).  we construct a grid with superpixel
     18 * spacing of nXpix, nYpix.  The transformation for each grid cell is valid for the superpixel.
     19 * The grid over-fills the source image so every source image pixel is guaranteed to have a map.
     20 */
    721pswarpMapGrid *pswarpMapGridFromImage (pmReadout *dest, pmReadout *src, int nXpix, int nYpix) {
    822
    … …  
    4155}
    4256
    43 // set the grid coordinate (gridX,gridY) for the given source image coordinate (ix,iy)
    44 // XXX return true if the result is on the src image, false otherwise (???)
     57/**
     58 * set the grid coordinate (gridX,gridY) for the given source image coordinate (ix,iy)
     59 * XXX return true if the result is on the src image, false otherwise (???)
     60 */
    4561bool pswarpMapGridSetGrid (pswarpMapGrid *grid, int ix, int iy, int *gridX, int *gridY) {
    4662
    … …  
    5167}
    5268
    53 // given the specified grid coordinate (gridX, gridY), return the min and max coordinates for the tile
     69/**
     70 * given the specified grid coordinate (gridX, gridY), return the min and max coordinates for the tile
     71 */
    5472bool pswarpMapGridCoordRange (pswarpMapGrid *grid, int gridX, int gridY, psPlane *min, psPlane *max) {
    5573
    … …  
    6381}
    6482
    65 // given the specified grid coordinate (gridX), return the x-coordinate for the source image
    66 // corresponding to the next grid cell
     83/**
     84 * given the specified grid coordinate (gridX), return the x-coordinate for the source image
     85 * corresponding to the next grid cell
     86 */
    6787int pswarpMapGridNextGrid_X (pswarpMapGrid *grid, int gridX) {
    6888
    … …  
    7191}
    7292
    73 // given the specified grid coordinate (gridY), return the y-coordinate for the source image
    74 // corresponding to the next grid cell
     93/**
     94 * given the specified grid coordinate (gridY), return the y-coordinate for the source image
     95 * corresponding to the next grid cell
     96 */
    7597int pswarpMapGridNextGrid_Y (pswarpMapGrid *grid, int gridY) {
    7698
    … …  
    79101}
    80102
    81 // measure the max error accumulated in applying one grid point to its neighbors
    82 // XXX double-check this
     103/**
     104 * measure the max error accumulated in applying one grid point to its neighbors
     105 * XXX double-check this
     106 */
    83107double pswarpMapGridMaxError (pswarpMapGrid *grid) {
    84108
    … …  
    102126}
    103127
    104 // given the source coordinate (inX,inY), return the destination coordinate (outX,outY)
     128/**
     129 * given the source coordinate (inX,inY), return the destination coordinate (outX,outY)
     130 */
    105131bool pswarpMapApply (double *outX, double *outY, pswarpMap *map, double inX, double inY) {
    106132
    … …  
    111137}
    112138
    113 // determine the (linear) map for the given pixel (ix,iy) from source image (src) to the destination image (dest)
    114 // pixel is in src coords. input and output pixel coordinates are in the parent frame of the image (Note that the
    115 // astrometric transformations are supplied for the parent image coordinate frame.
     139/**
     140 * determine the (linear) map for the given pixel (ix,iy) from source image (src) to the destination image (dest)
     141 * pixel is in src coords. input and output pixel coordinates are in the parent frame of the image (Note that the
     142 * astrometric transformations are supplied for the parent image coordinate frame.
     143 */
    116144bool pswarpMapSetLocalModel (pswarpMap *map, pmReadout *dest, pmReadout *src, int ix, int iy) {
    117145
    … …  
    139167    // XXX need to include readout->cell->chip offsets
    140168
    141     // V(0,0) position
     169    /** V(0,0) position */
    142170    offset->x = ix;
    143171    offset->y = iy;
    … …  
    149177    psPlaneTransformApply (V00, chipDest->fromFPA, FP);
    150178   
    151     // V(1,0) position
     179    /** V(1,0) position */
    152180    offset->x = ix + 1;
    153181    offset->y = iy;
    … …  
    159187    psPlaneTransformApply (V10, chipDest->fromFPA, FP);
    160188   
    161     // V(0,1) position
     189    /** V(0,1) position */
    162190    offset->x = ix;
    163191    offset->y = iy + 1;

  • trunk/pswarp/src/pswarpMatchRange.c

    r12526 r21323  
     1/** @file pswarpMatchRange.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    … …  
    1325    *maxY = PS_MAX (*maxY, srcPix->y);
    1426
    15 // we are warping from src to dest.  find the max overlapping pixels in the INPUT (src)
    16 // coordinate frame.  NOTE: these are in the parent pixel frame since the astrometric
    17 // transformation refers to the parent frame
     27/** we are warping from src to dest.  find the max overlapping pixels in the INPUT (src)
     28 * coordinate frame.  NOTE: these are in the parent pixel frame since the astrometric
     29 * transformation refers to the parent frame
     30 */
    1831bool pswarpMatchRange (int *minX, int *minY, int *maxX, int *maxY, pmReadout *dest, pmReadout *src) {
    1932

  • trunk/pswarp/src/pswarpParseCamera.c

    r20331 r21323  
     1/** @file pswarpParseCamera.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    … …  
    416{
    517    bool status;
    6     bool mdok;                          // Status of MD lookup
     18    bool mdok;                          ///< Status of MD lookup
    719    pmFPAfile *skycell = NULL;
    820    pmConfig *skyConfig = NULL;

  • trunk/pswarp/src/pswarpPixelFraction.c

    r21183 r21323  
     1/** @file pswarpPixelFraction.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#ifdef HAVE_CONFIG_H
    214#include <config.h>
    … …  
    3042    bool status;
    3143
    32     float minFrac = psMetadataLookupF32(NULL, config->arguments, "ACCEPT.FRAC"); // Minimum fraction
     44    float minFrac = psMetadataLookupF32(NULL, config->arguments, "ACCEPT.FRAC"); ///< Minimum fraction
    3345
    3446    // load the recipe
    … …  
    4355    psAssert (status, "MASK.OUTPUT was not defined");
    4456
    45     psImage *image = readout->image;    // Image of interest
    46     psImage *mask = readout->mask;      // Mask image
     57    psImage *image = readout->image;    ///< Image of interest
     58    psImage *mask = readout->mask;      ///< Mask image
    4759
    48     int numCols = image->numCols, numRows = image->numRows; // Size of image
     60    int numCols = image->numCols, numRows = image->numRows; ///< Size of image
    4961    long numPix = numCols * numRows;
    5062
    … …  
    5264    int xMin = INT_MAX, xMax = -INT_MAX, yMin = INT_MAX, yMax = -INT_MAX;
    5365
    54     long numBad = 0;                     // Number of bad pixels
     66    long numBad = 0;                     ///< Number of bad pixels
    5567    for (int y = 0; y < numRows; y++) {
    5668        for (int x = 0; x < numCols; x++) {
    … …  
    7486    }
    7587
    76     float goodFrac = (numPix - numBad) / (float)numPix; // Fraction of good pixels
    77     bool accept = (goodFrac >= minFrac ? true : false); // Accept this readout?
     88    float goodFrac = (numPix - numBad) / (float)numPix; ///< Fraction of good pixels
     89    bool accept = (goodFrac >= minFrac ? true : false); ///< Accept this readout?
    7890
    7991    if (stats) {

  • trunk/pswarp/src/pswarpSetMaskBits.c

    r21183 r21323  
     1/** @file pswarpSetMaskBits.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    3 // This function is called by the stand-alone pswarp program to set the mask values in the
    4 // config file.  It sets the named mask values MASK.PSPHOT and MARK.PSPHOT in the PSPHOT
    5 // recipe.  Functions or programs which call psphotReadout as a library function must set these
    6 // named mask values in the PSPHOT recipe on their own.  This function should only be called
    7 // after the first header of the input mask image has been loaded and the named mask bits
    8 // updated in the config metadata.
    9 
     15/** This function is called by the stand-alone pswarp program to set the mask values in the
     16 * config file.  It sets the named mask values MASK.PSPHOT and MARK.PSPHOT in the PSPHOT
     17 * recipe.  Functions or programs which call psphotReadout as a library function must set these
     18 * named mask values in the PSPHOT recipe on their own.  This function should only be called
     19 * after the first header of the input mask image has been loaded and the named mask bits
     20 * updated in the config metadata.
     21 */
    1022bool pswarpSetMaskBits (pmConfig *config) {
    1123
    12     psImageMaskType maskIn = 0x00;                      // mask for the input image
    13     psImageMaskType markIn = 0x00;                      // mark for the input image
    14     psImageMaskType maskOut = 0x00;                     // mask for the output image
     24    psImageMaskType maskIn = 0x00;                      ///< mask for the input image
     25    psImageMaskType markIn = 0x00;                      ///< mark for the input image
     26    psImageMaskType maskOut = 0x00;                     ///< mask for the output image
    1527
    1628    // this function sets the required single-image mask bits

  • trunk/pswarp/src/pswarpSetThreads.c

    r19299 r21323  
     1/** @file pswarpSetThreads.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    3 // each thread runs this function, starting a new job when it finished with an old one
    4 // it is called with a (void *) pointer to its own thread pointer
     15/** each thread runs this function, starting a new job when it finished with an old one
     16 * it is called with a (void *) pointer to its own thread pointer
     17 */
    518bool pswarpThread_pswarpTransformTile(psThreadJob *job)
    619{

  • trunk/pswarp/src/pswarpThreads.c

    r18839 r21323  
     1/** @file pswarpThreads.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113# include "pswarp.h"
    214
    … …  
    3951}
    4052
    41 // create a pool of Nthreads
     53/**
     54 * create a pool of Nthreads
     55 */
    4256bool pswarpThreadsCreate (int nThreads) {
    4357

  • trunk/pswarp/src/pswarpTransformReadout.c

    r21183 r21323  
     1/** @file pswarpTransformReadout.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#include "pswarp.h"
    214
    3 // NOTE: in this function, the coordinates are transformed from the OUTPUT to the INPUT
     15/**
     16 * NOTE: in this function, the coordinates are transformed from the OUTPUT to the INPUT
     17 */
    418bool pswarpTransformReadout(pmReadout *output, pmReadout *input, pmConfig *config)
    519{
    620    // XXX this implementation currently ignores the use of the region
    7     psImage *region = NULL;             // Region to transform
     21    psImage *region = NULL;             ///< Region to transform
    822
    923    psTimerStart("warp");
    1024
    1125    // Get warp parameters
    12     bool mdok;                          // Status of MD lookup
    13     int nGridX = psMetadataLookupS32(NULL, config->arguments, "GRID.NX"); // Number of grid points in x
    14     int nGridY = psMetadataLookupS32(NULL, config->arguments, "GRID.NY"); // Number of grid points in y
     26    bool mdok;                          ///< Status of MD lookup
     27    int nGridX = psMetadataLookupS32(NULL, config->arguments, "GRID.NX"); ///< Number of grid points in x
     28    int nGridY = psMetadataLookupS32(NULL, config->arguments, "GRID.NY"); ///< Number of grid points in y
    1529    psImageInterpolateMode interpolationMode = psMetadataLookupS32(NULL, config->arguments,
    16                                                                    "INTERPOLATION.MODE"); // Mode for interp
    17     int numKernels = psMetadataLookupS32(NULL, config->arguments, "INTERPOLATION.NUM"); // Number of kernels
     30                                                                   "INTERPOLATION.MODE"); ///< Mode for interp
     31    int numKernels = psMetadataLookupS32(NULL, config->arguments, "INTERPOLATION.NUM"); ///< Number of kernels
    1832
    1933    // load the recipe
    … …  
    2741    psAssert(mdok, "MASK.INPUT was not defined");
    2842
    29     int nThreads = psMetadataLookupS32(&mdok, config->arguments, "NTHREADS"); // Number of threads
     43    int nThreads = psMetadataLookupS32(&mdok, config->arguments, "NTHREADS"); ///< Number of threads
    3044    if (!mdok) {
    3145        nThreads = 0;
    3246    }
    33     float poorFrac = psMetadataLookupF32(NULL, config->arguments, "POOR.FRAC"); // Flux fraction for "poor"
     47    float poorFrac = psMetadataLookupF32(NULL, config->arguments, "POOR.FRAC"); ///< Flux fraction for "poor"
    3448
    3549    // pswarpMapGridFromImage builds a set of locally-linear maps which convert the
    … …  
    4256
    4357    // Get range of interest
    44     int xOutMin, xOutMax, yOutMin, yOutMax; // Output pixel range
     58    int xOutMin, xOutMax, yOutMin, yOutMax; ///< Output pixel range
    4559    pswarpMatchRange(&xOutMin, &yOutMin, &xOutMax, &yOutMax, input, output);
    4660
    … …  
    5367    }
    5468
    55     int xGridMin = nGridX, xGridMax = 0, yGridMin = nGridY, yGridMax = 0; // Grid range
    56     int xGrid, yGrid;                   // Grid coordinates
     69    int xGridMin = nGridX, xGridMax = 0, yGridMin = nGridY, yGridMax = 0; ///< Grid range
     70    int xGrid, yGrid;                   ///< Grid coordinates
    5771    pswarpMapGridSetGrid(grid, xOutMin, yOutMin, &xGrid, &yGrid);
    5872    CHECK_GRID_RANGE();
    … …  
    121135    psThreadJob *job = NULL;
    122136    int xMin = output->image->numCols, xMax = 0, yMin = output->image->numRows, yMax = 0; // Bounds
    123     int goodPixels = 0;                 // total number of good pixels across all tiles
     137    int goodPixels = 0;                 ///< total number of good pixels across all tiles
    124138    while ((job = psThreadJobGetDone()) != NULL) {
    125139        if (job->args->n < 1) {

  • trunk/pswarp/src/pswarpTransformSources.c

    r20578 r21323  
     1/** @file pswarpTransformSources.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#include "pswarp.h"
    214
    3 #define SOURCE_ARRAY_BUFFER 100         // Size to grow the array of sources at a time
     15#define SOURCE_ARRAY_BUFFER 100         ///< Size to grow the array of sources at a time
    416
    5 // NOTE: in this function, the coordinates are transformed from the OUTPUT to the INPUT
     17/**
     18 * NOTE: in this function, the coordinates are transformed from the OUTPUT to the INPUT
     19 */
    620bool pswarpTransformSources(pmReadout *output, pmReadout *input, pmConfig *config)
    721{
    … …  
    3347    // this does not cost us so much time.
    3448    for (int i = 0; i < inSources->n; i++) {
    35         pmSource *source = inSources->data[i]; // Source of interest
    36         pmModel *model = source->modelPSF; // Model for this source
    37         float xIn, yIn;             // Coordinates of source
     49        pmSource *source = inSources->data[i]; ///< Source of interest
     50        pmModel *model = source->modelPSF; ///< Model for this source
     51        float xIn, yIn;             ///< Coordinates of source
    3852        xIn = model->params->data.F32[PM_PAR_XPOS] - input->image->col0;
    3953        yIn = model->params->data.F32[PM_PAR_YPOS] - input->image->row0;
    4054
    41         int xGrid, yGrid;           // Grid coordinates for local map
     55        int xGrid, yGrid;           ///< Grid coordinates for local map
    4256        if (!pswarpMapGridSetGrid(sourceGrid, xIn + 0.5, yIn + 0.5, &xGrid, &yGrid)) {
    4357            psError(PS_ERR_UNKNOWN, false, "Unable to get grid coordinates for source at %f,%f\n",
    … …  
    5367        }
    5468
    55         pswarpMap *map = sourceGrid->maps[xGrid][yGrid]; // Locally linear transformation
    56         double xOut, yOut;          // Output coordinates
     69        pswarpMap *map = sourceGrid->maps[xGrid][yGrid]; ///< Locally linear transformation
     70        double xOut, yOut;          ///< Output coordinates
    5771        if (!pswarpMapApply(&xOut, &yOut, map, xIn + 0.5, yIn + 0.5)) {
    5872            psError(PS_ERR_UNKNOWN, false, "Unable to transform coordinates for source at %f,%f\n",
    … …  
    7387        // Magnitudes will be off if there's any change in scale, but for our purposes (mainly x,y and
    7488        // relative flux) that's OK.
    75         pmSource *new = pmSourceAlloc(); // New source
     89        pmSource *new = pmSourceAlloc(); ///< New source
    7690        new->peak = pmPeakAlloc(xOut, yOut, source->peak->flux, PM_PEAK_LONE);
    7791        new->peak->flux = source->peak->flux;

  • trunk/pswarp/src/pswarpTransformTile.c

    r21183 r21323  
     1/** @file pswarpTransformTile.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#include "pswarp.h"
    214
    … …  
    3648bool pswarpTransformTile(pswarpTransformTileArgs *args)
    3749{
    38     psImage *inImage = args->input->image; // Input image
    39     psImage *outImage = args->output->image; // Output image
     50    psImage *inImage = args->input->image; ///< Input image
     51    psImage *outImage = args->output->image; ///< Output image
    4052
    41     int inNumCols = inImage->numCols, inNumRows = inImage->numRows; // Size of input image
    42     int outNumCols = outImage->numCols, outNumRows = outImage->numRows; // Size of output image
    43     int outCol0 = outImage->col0, outRow0 = outImage->row0; // Offset of output image
     53    int inNumCols = inImage->numCols, inNumRows = inImage->numRows; ///< Size of input image
     54    int outNumCols = outImage->numCols, outNumRows = outImage->numRows; ///< Size of output image
     55    int outCol0 = outImage->col0, outRow0 = outImage->row0; ///< Offset of output image
    4456
    45     psPlane minPt, maxPt;               // Minimum and maximum points for this tile
     57    psPlane minPt, maxPt;               ///< Minimum and maximum points for this tile
    4658    pswarpMapGridCoordRange(args->grid, args->gridX, args->gridY, &minPt, &maxPt);
    4759
    … …  
    5264    psImageMaskType **inMaskData  = (args->input->mask)    ? args->input->mask->data.PS_TYPE_IMAGE_MASK_DATA : NULL;
    5365
    54     pswarpMap *map = args->grid->maps[args->gridX][args->gridY]; // Map for this tile
    55     psImage *region = args->region;     // Region to transform
     66    pswarpMap *map = args->grid->maps[args->gridX][args->gridY]; ///< Map for this tile
     67    psImage *region = args->region;     ///< Region to transform
    5668
    57     // Bounds for iteration
     69    /** Bounds for iteration */
    5870    int xMin = PS_MAX(minPt.x, 0);
    5971    int xMax = PS_MIN(maxPt.x, outNumCols);
    … …  
    6274
    6375    // Iterate over the output image pixels (parent frame)
    64     long goodPixels = 0;                // Number of input pixels landing on the output image
     76    long goodPixels = 0;                ///< Number of input pixels landing on the output image
    6577    for (int y = yMin; y < yMax; y++) {
    6678        for (int x = xMin; x < xMax; x++) {
    … …  
    8092            }
    8193
     94            double imageValue, varValue; // Value of image and variance map
     95
    8296            // psImagePixelInterpolate determines the value at pixel coordinate (x,y) in child coordinates
    83             double imageValue, varValue; // Value of image and variance map
    8497            psImageMaskType maskValue = inMaskData ? inMaskData[(int)yIn][(int)xIn] : 0; // Value of mask
     98
    8599            if (!psImageInterpolate(&imageValue, &varValue, &maskValue, xIn, yIn, args->interp)) {
    86100                psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
    … …  
    88102            }
    89103
    90             int xOut = x - outCol0, yOut = y - outRow0; // Position on output image
     104            int xOut = x - outCol0, yOut = y - outRow0; ///< Position on output image
    91105
    92106            if (outImageData) {

  • trunk/pswarp/src/pswarpVersion.c

    r10946 r21323  
     1/** @file pswarpVersion.c
     2 *
     3 *  @brief
     4 *
     5 *  @ingroup pswarp
     6 *
     7 *  @author IfA
     8 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2009-02-05 20:44:04 $
     10 *  Copyright 2009 Institute for Astronomy, University of Hawaii
     11 */
     12
    113#ifdef HAVE_CONFIG_H
    214#include <config.h>
    … …  
    820#include "pswarp.h"
    921
    10 static const char *cvsTag = "$Name: not supported by cvs2svn $";// CVS tag name
     22static const char *cvsTag = "$Name: not supported by cvs2svn $";///< CVS tag name
    1123
    1224psString pswarpVersion(void)
    1325{
    14     psString version = NULL;            // Version, to return
     26    psString version = NULL;            ///< Version, to return
    1527    psStringAppend(&version, "%s-%s",PACKAGE_NAME,PACKAGE_VERSION);
    1628    return version;
    … …  
    1931psString pswarpVersionLong(void)
    2032{
    21     psString version = pswarpVersion(); // Version, to return
    22     psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag
     33    psString version = pswarpVersion(); ///< Version, to return
     34    psString tag = psStringStripCVS(cvsTag, "Name"); ///< CVS tag
    2335    psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__);
    2436    psFree(tag);
Note: See TracChangeset for help on using the changeset viewer.