IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2104


Ignore:
Timestamp:
Oct 13, 2004, 3:17:50 PM (22 years ago)
Author:
gusciora
Message:

Mostly cosmetic edit.

Location:
trunk/psLib/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astro/psCoord.c

    r2103 r2104  
    1010*  @author George Gusciora, MHPCC
    1111*
    12 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2004-10-14 01:10:58 $
     12*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2004-10-14 01:17:50 $
    1414*
    1515*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2626#include "psAbort.h"
    2727#include "psTime.h"
     28#include "psConstants.h"
     29#include "psError.h"
    2830#include <math.h>
    2931#include <float.h>

  • trunk/psLib/src/astronomy/psAstrometry.c

    r2098 r2104  
    88 *  @author George Gusciora, MHPCC
    99 *
    10  *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2004-10-14 00:12:40 $
     10 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2004-10-14 01:17:50 $
    1212 *
    1313 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5959{
    6060    int i = 0;
    61     PS_CHECK_NULL_PTR_RETURN_NULL(transform);
     61    PS_CHECK_NULL_PTR_RETURN_ZERO(transform);
    6262
    6363    for (i=2;i<(transform->x->nX);i++) {
    … …  
    214214
    215215/*
    216  *
    217216 * XXX: Verify that you interpreted the SDR correctly.
    218217 *
    … …  
    499498                    const psFPA* FPA)
    500499{
    501     //printf("Entering psCellInFPA()\n");
     500    PS_CHECK_NULL_PTR_RETURN_NULL(fpaCoord);
     501    PS_CHECK_NULL_PTR_RETURN_NULL(FPA);
    502502    psChip* tmpChip = NULL;
    503503    psPlane chipCoord;
    504504    psCell* outCell = NULL;
    505 
    506     PS_CHECK_NULL_PTR_RETURN_NULL(fpaCoord);
    507     PS_CHECK_NULL_PTR_RETURN_NULL(FPA);
    508505
    509506    // Determine which chip contains the fpaCoords.
    … …  
    519516    outCell = psCellInChip(&chipCoord, tmpChip);
    520517
    521     //printf("Exiting psCellInFPA()\n");
    522518    return (outCell);
    523519}
    … …  
    526522                    const psFPA* FPA)
    527523{
    528     //printf("Entering psChipInFPA()\n");
    529524    PS_CHECK_NULL_PTR_RETURN_NULL(fpaCoord);
    530525    PS_CHECK_NULL_PTR_RETURN_NULL(FPA);
    … …  
    535530    psCell *tmpCell = NULL;
    536531
    537     // Loop through every chip in this FPA.  Convert the original
    538     // FPA coordinates to chip coordinates for that chip.  Then,
    539     // determine if any cells in that chip contain those chip
    540     // coordinates.
     532    // Loop through every chip in this FPA.  Convert the original FPA
     533    // coordinates to chip coordinates for that chip.  Then, determine if any
     534    // cells in that chip contain those chip coordinates.
     535
    541536    for (int i = 0; i < nChips; i++) {
    542         //printf("HERE 01 (checking chip %d)\n", i);
    543537        psChip* tmpChip = chips->data[i];
    544538        psPlaneTransformApply(&chipCoord, tmpChip->fromFPA, fpaCoord);
    … …  
    546540        tmpCell = psCellInChip(&chipCoord, tmpChip);
    547541        if (tmpCell != NULL) {
    548             //printf("Exiting psChipInFPA()\n");
    549542            return(tmpChip);
    550543        }
    551544    }
    552545
    553     //printf("Exiting psChipInFPA()\n");
    554546    return (NULL);
    555547}
    … …  
    558550                     const psChip* chip)
    559551{
    560     //printf("Entering psCellInChip(%f, %f, %d)\n", chipCoord->x, chipCoord->y, chip);
    561552    PS_CHECK_NULL_PTR_RETURN_NULL(chipCoord);
    562553    PS_CHECK_NULL_PTR_RETURN_NULL(chip);
    … …  
    567558    cells = chip->cells;
    568559    if (cells == NULL) {
    569         //printf("Exiting psCellInChip()\n");
    570560        return NULL;
    571561    }
    … …  
    590580                                          cellCoord.y,
    591581                                          tmpReadout->image)) {
    592                     //printf("Exiting psCellInChip()\n");
    593582                    return (tmpCell);
    594583                }
    … …  
    597586    }
    598587
    599     //printf("Exiting psCellInChip()\n");
    600588    return (NULL);
    601589}
    … …  
    641629                         const psGrommit* grommit)
    642630{
     631    PS_CHECK_NULL_PTR_RETURN_NULL(tpCoord);
     632    PS_CHECK_NULL_PTR_RETURN_NULL(grommit);
     633
    643634    double AOB = 0.0;
    644635    double ZOB = 0.0;
    645636    double HOB = 0.0;
    646     PS_CHECK_NULL_PTR_RETURN_NULL(tpCoord);
    647     PS_CHECK_NULL_PTR_RETURN_NULL(grommit);
    648637    if (outSphere == NULL) {
    649638        outSphere = (psSphere* ) psAlloc(sizeof(psSphere));
    … …  
    740729                        const psGrommit* grommit)
    741730{
    742     char* type = "RA";
    743 
    744731    PS_CHECK_NULL_PTR_RETURN_NULL(in);
    745732    PS_CHECK_NULL_PTR_RETURN_NULL(grommit);
     733
     734    char* type = "RA";
    746735
    747736    if (tpCoord == NULL) {
    … …  
    775764    PS_CHECK_NULL_PTR_RETURN_NULL(chip);
    776765    PS_CHECK_NULL_PTR_RETURN_NULL(chip->parent);
    777     //    psFPA *FPA = chip->parent;
     766
    778767    chipCoord = psPlaneTransformApply(chipCoord, chip->fromFPA, fpaCoord);
    779 
    780768    return(chipCoord);
    781769}
    … …  
    790778
    791779    cellCoord = psPlaneTransformApply(cellCoord, cell->fromChip, chipCoord);
    792 
    793780    return(cellCoord);
    794781}

  • trunk/psLib/src/astronomy/psCoord.c

    r2103 r2104  
    1010*  @author George Gusciora, MHPCC
    1111*
    12 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2004-10-14 01:10:58 $
     12*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2004-10-14 01:17:50 $
    1414*
    1515*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    2626#include "psAbort.h"
    2727#include "psTime.h"
     28#include "psConstants.h"
     29#include "psError.h"
    2830#include <math.h>
    2931#include <float.h>
Note: See TracChangeset for help on using the changeset viewer.