Changeset 3572 in Sophya for trunk/SophyaExt/XAstroPack

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

Location:

trunk/SophyaExt/XAstroPack

Files:

• mollweide.cc (modified) (4 diffs)
• mollweide.h (modified) (1 diff)
• tstmollweide.cc (modified) (2 diffs)

trunk/SophyaExt/XAstroPack/mollweide.cc

@@ -48 +48 @@
  \endverbatim
 */
-double MollWeide_XY(double longitude,double latitude,double* xmoll,double*ymoll)
+double MollWeide_XY(double longitude,double latitude,double& xmoll,double& ymoll)
 {
  int i,niter=2;
@@ -90 +90 @@
 
  t0 *= asgn;
- *xmoll = 2.*M_SQRT2*(longitude-M_PI)/M_PI*cos(t0);
- *ymoll = M_SQRT2*sin(t0);
+ xmoll = 2.*M_SQRT2*(longitude-M_PI)/M_PI*cos(t0);
+ ymoll = M_SQRT2*sin(t0);
 
  return t0;
@@ -118 +118 @@
  \endverbatim
 */
-double MollWeide_LL(double xmoll,double ymoll,double* longitude,double* latitude)
+double MollWeide_LL(double xmoll,double ymoll,double& longitude,double& latitude)
 {
  double t,a,eps=1.e-20;
 
- *longitude = *latitude = -999.;
+ longitude = latitude = -999.;
  if(xmoll<-2*M_SQRT2 || xmoll>2*M_SQRT2) return(-901.);
  if(ymoll<-M_SQRT2 || ymoll>M_SQRT2) return(-902.);
@@ -130 +130 @@
 
  a = (2.*t+sin(2.*t))/M_PI; if(a<-1.) a=-1.; else if(a>1.) a=1.;
- *latitude = asin(a);
+ latitude = asin(a);
 
  a= cos(t);
  if(fabs(a)<eps) return(-903.);
- *longitude = M_PI*(xmoll/(2.*M_SQRT2*a)+1.);
+ longitude = M_PI*(xmoll/(2.*M_SQRT2*a)+1.);
 
  return(t);

trunk/SophyaExt/XAstroPack/mollweide.h

@@ -1 +1 @@
 #ifndef MOLLWEIDE_H_SEEN
 #define MOLLWEIDE_H_SEEN
-double MollWeide_XY(double longitude,double latitude,double* xmoll,double* ymoll);
-double MollWeide_LL(double xmoll,double ymoll,double* longitude,double* latitude);
+double MollWeide_XY(double longitude,double latitude,double& xmoll,double& ymoll);
+double MollWeide_LL(double xmoll,double ymoll,double& longitude,double& latitude);
 #endif

trunk/SophyaExt/XAstroPack/tstmollweide.cc

@@ -20 +20 @@
    a = 2.*tvrai+sin(2.*tvrai);
    lat = asin(a/M_PI);
-   tcalc = MollWeide_XY(0.,lat,&x,&y);
+   tcalc = MollWeide_XY(0.,lat,x,y);
    if(fabs(tcalc-tvrai)>tll) {tll = fabs(tcalc-tvrai); txy=tvrai;}
    if(file) fprintf(file,"%e %e %e %e\n",tvrai,tcalc,a,tcalc-tvrai);
@@ -28 +28 @@
 
  for(lon=0.;lon<360.;lon+=2.5) for(lat=-90.;lat<=90.1;lat+=2.5) {
-   txy = MollWeide_XY(lon*M_PI/180.,lat*M_PI/180.,&x,&y);
-   tll = MollWeide_LL(x,y,&longitude,&latitude);
+   txy = MollWeide_XY(lon*M_PI/180.,lat*M_PI/180.,x,y);
+   tll = MollWeide_LL(x,y,longitude,latitude);
    longitude *= 180./M_PI;
    latitude  *= 180./M_PI;