IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4330 for trunk/psLib/src/astro


Ignore:
Timestamp:
Jun 20, 2005, 5:01:37 PM (21 years ago)
Author:
drobbin
Message:

* empty log message *

Location:
trunk/psLib/src/astro
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r4321 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-20 22:42:29 $
     12*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    221221}
    222222
    223 psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2)
     223psPlaneTransform* psPlaneTransformAlloc(int n1, int n2)
    224224{
    225225    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
    … …  
    290290                             const psPlaneDistort* transform,
    291291                             const psPlane* coords,
    292                              float color,
    293                              float magnitude)
     292                             float mag,
     293                             float color)
    294294{
    295295    PS_ASSERT_PTR_NON_NULL(transform, NULL);
    … …  
    305305                 coords->x,
    306306                 coords->y,
    307                  color,
    308                  magnitude
     307                 mag,
     308                 color
    309309             );
    310310    out->y = psDPolynomial4DEval(
    … …  
    312312                 coords->x,
    313313                 coords->y,
    314                  color,
    315                  magnitude
     314                 mag,
     315                 color
    316316             );
    317317    return (out);
    … …  
    481481
    482482psProjection* psProjectionAlloc(
    483     psF64 R,
    484     psF64 D,
    485     psF64 Xs,
    486     psF64 Ys,
     483    double R,
     484    double D,
     485    double Xs,
     486    double Ys,
    487487    psProjectionType type)
    488488{

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

    r4321 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-20 22:42:29 $
     12*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    188188
    189189psPlaneTransform* psPlaneTransformAlloc(
    190     psS32 n1,  ///< The order of the x term in the transform.
    191     psS32 n2   ///< The order of the y term in the transform.
     190    int n1,                            ///< The order of the x term in the transform.
     191    int n2                             ///< The order of the y term in the transform.
    192192);
    193193
    … …  
    223223    const psPlaneDistort* transform,   ///< the transform to apply
    224224    const psPlane* coords,             ///< the coordinate to apply the transform above.
    225     float term3,                       ///< third term -- maybe magnitude
    226     float term4                        ///< forth term -- maybe color
     225    float mag,                         ///< third term -- maybe magnitude
     226    float color                        ///< forth term -- maybe color
    227227);
    228228
    … …  
    283283 */
    284284psProjection* psProjectionAlloc(
    285     psF64 R,                   ///< Right-ascension of projection center.
    286     psF64 D,                   ///< Declination of projection center.
    287     psF64 Xs,                  ///< Scale in x-dimension
    288     psF64 Ys,                  ///< Scale in y-dimension
     285    double R,                   ///< Right-ascension of projection center.
     286    double D,                   ///< Declination of projection center.
     287    double Xs,                  ///< Scale in x-dimension
     288    double Ys,                  ///< Scale in y-dimension
    289289    psProjectionType type
    290290);

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

    r4209 r4330  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-10 18:09:12 $
     12 *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-21 03:01:37 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    731731}
    732732
    733 psF64 psTimeToLMST(psTime *time, psF64 longitude)
     733double psTimeToLMST(psTime *time, double longitude)
    734734{
    735735    psF64  jdTdtDays    =  0.0;
    … …  
    804804}
    805805
    806 psF64 psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin)
     806double psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin)
    807807{
    808808    psU32              nTables               = 2;
    … …  
    10811081}
    10821082
    1083 psS64 psTimeLeapSecondDelta(const psTime *time1, const psTime *time2)
     1083long psTimeLeapSecondDelta(const psTime *time1, const psTime *time2)
    10841084{
    10851085    psS64 diff = 0;
    … …  
    10951095}
    10961096
    1097 psBool psTimeIsLeapSecond(const psTime* utc)
     1097bool psTimeIsLeapSecond(const psTime* utc)
    10981098{
    10991099    psTime*    prevUtc     = NULL;
    … …  
    11261126}
    11271127
    1128 psF64 psTimeToJD(const psTime *time)
     1128double psTimeToJD(const psTime *time)
    11291129{
    11301130    psF64 jd = NAN;
    … …  
    11461146}
    11471147
    1148 psF64 psTimeToMJD(const psTime *time)
     1148double psTimeToMJD(const psTime *time)
    11491149{
    11501150    psF64 mjd = NAN;
    … …  
    13021302*/
    13031303
    1304 psTime* psTimeFromJD(psF64 time)
     1304psTime* psTimeFromJD(double jd)
    13051305{
    13061306    psF64 days = 0.0;
    … …  
    13121312
    13131313    // Julian date conversion courtesy of Eugene Magnier
    1314     days = time - 2440587.5;
     1314    days = jd - 2440587.5;
    13151315    seconds = days * SEC_PER_DAY;
    13161316    if(seconds < 0.0) {
    … …  
    13271327}
    13281328
    1329 psTime* psTimeFromMJD(psF64 time)
     1329psTime* psTimeFromMJD(double mjd)
    13301330{
    13311331    psF64 days = 0.0;
    … …  
    13371337
    13381338    // Modified Julian date conversion courtesy of Eugene Magnier
    1339     days = time - 40587.0;
     1339    days = mjd - 40587.0;
    13401340    seconds = days * SEC_PER_DAY;
    13411341
    … …  
    14061406}
    14071407
    1408 psTime* psTimeFromUTC(psS64 sec, psU32 nsec, psBool leapsecond)
     1408psTime* psTimeFromUTC(psS64 sec, psU32 nsec, bool leapsecond)
    14091409{
    14101410    psTime*   outTime   = NULL;
    … …  
    15101510}
    15111511
    1512 psTime* psTimeMath(const psTime *time, psF64 delta)
     1512psTime* psTimeMath(const psTime *time, double delta)
    15131513{
    15141514    psF64 sec = 0.0;
    … …  
    15511551}
    15521552
    1553 psF64 psTimeDelta(const psTime *time1, const psTime *time2)
     1553double psTimeDelta(const psTime *time1, const psTime *time2)
    15541554{
    15551555    psF64 out = 0.0;

  • trunk/psLib/src/astro/psTime.h

    r4293 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-17 00:10:59 $
     13 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    127127 *  in UTC format, then it is converted.
    128128 *
    129  *  @return  psF64: LST Time.
    130  */
    131 psF64 psTimeToLMST(
    132     psTime *time,                       ///< psTime to be converted.
    133     psF64 longitude                    ///< Longitude.
     129 *  @return  double: LST Time.
     130 */
     131double psTimeToLMST(
     132    psTime *time,                      ///< psTime to be converted.
     133    double longitude                    ///< Longitude.
    134134);
    135135
    … …  
    138138 *  This function is necessary to for various SLALIB functions.
    139139 *
    140  *  @return  psF64: Time difference.
    141  */
    142 psF64 psTimeGetUT1Delta(
     140 *  @return  double: Time difference.
     141 */
     142double psTimeGetUT1Delta(
    143143    const psTime *time,                 ///< psTime to be looked up.
    144144    psTimeBulletin bulletin             ///< IERS bulletin to use
    … …  
    169169 *  Calculates the number of leapseconds between two times.
    170170 *
    171  *  @return  psS64: leapseconds added between given times
    172  */
    173 psS64 psTimeLeapSecondDelta(
    174     const psTime* time1,                ///< First input time.
    175     const psTime* time2                 ///< Second input time.
     171 *  @return  long: leapseconds added between given times
     172 */
     173long psTimeLeapSecondDelta(
     174    const psTime* time1,               ///< First input time.
     175    const psTime* time2                ///< Second input time.
    176176);
    177177
    … …  
    180180 *  Determines if the specified UTC time is a valid leapsecond.
    181181 *
    182  *  @return  psBool: valid leap second
    183  */
    184 psBool psTimeIsLeapSecond(
     182 *  @return  bool: valid leap second
     183 */
     184bool psTimeIsLeapSecond(
    185185    const psTime* utc                  ///< UTC to verify if leap second
    186186);
    … …  
    191191 *  subtract leapseconds.
    192192 *
    193  *  @return  psF64: Julian Date (JD) time.
    194  */
    195 psF64 psTimeToJD(
    196     const psTime* time                  ///< Input time to be converted.
     193 *  @return  double: Julian Date (JD) time.
     194 */
     195double psTimeToJD(
     196    const psTime* time                 ///< Input time to be converted.
    197197);
    198198/** Convert psTime to modified Julian date time.
    … …  
    201201 *  add or subtract leapseconds.
    202202 *
    203  *  @return  psF64: Modified Julian Days (MJD) time.
    204  */
    205 psF64 psTimeToMJD(
     203 *  @return  double: Modified Julian Days (MJD) time.
     204 */
     205double psTimeToMJD(
    206206    const psTime* time                  ///< Input time to be converted.
    207207);
    … …  
    248248 */
    249249psTime* psTimeFromJD(
    250     psF64 time                       ///< Input time to be converted.
     250    double jd                          ///< Input time to be converted.
    251251);
    252252
    … …  
    258258 */
    259259psTime* psTimeFromMJD(
    260     psF64 time                      ///< Input time to be converted.
     260    double mjd                         ///< Input time to be converted.
    261261);
    262262
    … …  
    268268 */
    269269psTime* psTimeFromISO(
    270     const char* time                 ///< Input time to be converted.
     270    const char* time                   ///< Input time to be converted.
    271271);
    272272
    … …  
    278278 */
    279279psTime* psTimeFromTimeval(
    280     const struct timeval *time       ///< Input time to be converted.
     280    const struct timeval *time         ///< Input time to be converted.
    281281);
    282282
    … …  
    288288 */
    289289psTime* psTimeFromTT(
    290     psS64 sec,                      ///< Input terrestrial time in seconds
    291     psU32 nsec                      ///< Input terrestrial time fraction of seconds (nanoseconds)
     290    psS64 sec,                         ///< Input terrestrial time in seconds
     291    psU32 nsec                         ///< Input terrestrial time fraction of seconds (nanoseconds)
    292292);
    293293
    … …  
    299299 */
    300300psTime* psTimeFromUTC(
    301     psS64  sec,                    ///< Input time in seconds
    302     psU32  nsec,                   ///< Input time fraction of seconds (nanoseconds)
    303     psBool leapsecond              ///< Input time is a leapsecond
     301    psS64  sec,                        ///< Input time in seconds
     302    psU32  nsec,                       ///< Input time fraction of seconds (nanoseconds)
     303    bool leapsecond                    ///< Input time is a leapsecond
    304304);
    305305
    … …  
    313313 */
    314314psTime* p_psTimeFromTM(
    315     const struct tm *time            ///< Input time to be converted.
     315    const struct tm *time              ///< Input time to be converted.
    316316);
    317317
    … …  
    323323 */
    324324psTime* psTimeMath(
    325     const psTime *time,              ///< Time.
    326     psF64 delta                      ///< Time delta.
     325    const psTime *time,                ///< Time.
     326    double delta                       ///< Time delta.
    327327);
    328328
    … …  
    331331 *  Determine difference between two times. Input times are converted to TAI format if necessary.
    332332 *
    333  *  @return psF64: Time difference.
    334  */
    335 psF64 psTimeDelta(
    336     const psTime *time1,             ///< First time.
    337     const psTime *time2              ///< Second time.
     333 *  @return double: Time difference.
     334 */
     335double psTimeDelta(
     336    const psTime *time1,               ///< First time.
     337    const psTime *time2                ///< Second time.
    338338);
    339339
Note: See TracChangeset for help on using the changeset viewer.