IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2602


Ignore:
Timestamp:
Dec 3, 2004, 9:43:43 AM (22 years ago)
Author:
gusciora
Message:

MOdified makefile for /usr/local/include

Location:
trunk/psLib/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/src/astro/psCoord.c

    r2600 r2602  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2004-12-02 21:12:51 $
     12*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2004-12-03 19:43:43 $
    1414*
    1515*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    208208    y = coord->d;
    209209    dx = x - transform->phiP;
    210     sinY = cos(y) * sin(dx) * transform->sinDeltaP + sin(y) * transform->cosDeltaP;
     210    sinY = cos(y) * sin(dx) * transform->sinDeltaP +
     211           sin(y) * transform->cosDeltaP;
    211212    cosY = sqrt(1.0 - sinY * sinY);
    212     sinX = (cos(y) * sin(dx) * transform->cosDeltaP - sin(y) * transform->sinDeltaP) / cos(y);
     213    sinX = (cos(y) * sin(dx) * transform->cosDeltaP -
     214            sin(y) * transform->sinDeltaP) / cos(y);
    213215    cosX = cos(y) * cos(dx) / cos(y);
    214216
  • trunk/psLib/src/astronomy/Makefile

    r2600 r2602  
    33endif
    44
     5# XXX: Must put appropiate conditional here:
     6LIBXMLDIR = /usr/include/libxml2
     7LIBXMLDIR = /usr/local/include/libxml2
     8
    59TARGET_STATIC  = libpslib.a
    610include ../Makefile.Globals
    711CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip \
    8     -I.. -I../image -I../fileUtils -I/usr/local/include/libxml2 \
     12    -I.. -I../image -I../fileUtils -I$(LIBXMLDIR) \
    913    -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\""
    1014
  • trunk/psLib/src/astronomy/psCoord.c

    r2600 r2602  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2004-12-02 21:12:51 $
     12*  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2004-12-03 19:43:43 $
    1414*
    1515*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    208208    y = coord->d;
    209209    dx = x - transform->phiP;
    210     sinY = cos(y) * sin(dx) * transform->sinDeltaP + sin(y) * transform->cosDeltaP;
     210    sinY = cos(y) * sin(dx) * transform->sinDeltaP +
     211           sin(y) * transform->cosDeltaP;
    211212    cosY = sqrt(1.0 - sinY * sinY);
    212     sinX = (cos(y) * sin(dx) * transform->cosDeltaP - sin(y) * transform->sinDeltaP) / cos(y);
     213    sinX = (cos(y) * sin(dx) * transform->cosDeltaP -
     214            sin(y) * transform->sinDeltaP) / cos(y);
    213215    cosX = cos(y) * cos(dx) / cos(y);
    214216
  • trunk/psLib/src/image/psImageStats.c

    r2436 r2602  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-11-24 22:14:39 $
     11 *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-12-03 19:43:43 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    1271270:512 to -1:1.  This routine takes as input an integer N and produces as
    128128output a vector of evenly spaced floating point values between -1.0:1.0.
     129 
     130XXX: Use the p_psNormalizeVector here?
    129131 *****************************************************************************/
    130132double* calcScaleFactors(psS32 n)
     
    253255                        pixel = input->data.F64[x][y];
    254256                    }
    255                     sums[i][j] += pixel *
    256                                   psPolynomial1DEval(
    257                                       chebPolys[i],
    258                                       rScalingFactors[x]
    259                                   ) *
    260                                   psPolynomial1DEval(
    261                                       chebPolys[j],
    262                                       cScalingFactors[y]
    263                                   );
     257                    sums[i][j] += pixel * psPolynomial1DEval(chebPolys[i],rScalingFactors[x]) *
     258                                  psPolynomial1DEval(chebPolys[j], cScalingFactors[y]);
    264259                }
    265260            }
     
    375370    // Free the Chebyshev polynomials that were
    376371    // created in this routine.
    377     // XXX: Use dtatic data structures here.
     372    // XXX: Use static data structures here.
    378373    for (i = 0; i < maxChebyPoly; i++) {
    379374        psFree(chebPolys[i]);
  • trunk/psLib/src/imageops/psImageStats.c

    r2436 r2602  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-11-24 22:14:39 $
     11 *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-12-03 19:43:43 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    1271270:512 to -1:1.  This routine takes as input an integer N and produces as
    128128output a vector of evenly spaced floating point values between -1.0:1.0.
     129 
     130XXX: Use the p_psNormalizeVector here?
    129131 *****************************************************************************/
    130132double* calcScaleFactors(psS32 n)
     
    253255                        pixel = input->data.F64[x][y];
    254256                    }
    255                     sums[i][j] += pixel *
    256                                   psPolynomial1DEval(
    257                                       chebPolys[i],
    258                                       rScalingFactors[x]
    259                                   ) *
    260                                   psPolynomial1DEval(
    261                                       chebPolys[j],
    262                                       cScalingFactors[y]
    263                                   );
     257                    sums[i][j] += pixel * psPolynomial1DEval(chebPolys[i],rScalingFactors[x]) *
     258                                  psPolynomial1DEval(chebPolys[j], cScalingFactors[y]);
    264259                }
    265260            }
     
    375370    // Free the Chebyshev polynomials that were
    376371    // created in this routine.
    377     // XXX: Use dtatic data structures here.
     372    // XXX: Use static data structures here.
    378373    for (i = 0; i < maxChebyPoly; i++) {
    379374        psFree(chebPolys[i]);
Note: See TracChangeset for help on using the changeset viewer.