Changeset 1465 in Sophya for trunk/SophyaExt

Timestamp:

Apr 11, 2001, 12:17:22 PM (24 years ago)

Author:

cmv

Message:

petits bugs cmv 11/4/01

Location:

trunk/SophyaExt

Files:

• XAstroPack/xastropack.cc (modified) (4 diffs)
• XAstroPack/xastropack.h (modified) (2 diffs)
• XephemAstroLib/Makefile (modified) (1 diff)

trunk/SophyaExt/XAstroPack/xastropack.cc

@@ -25 +25 @@
 //               (angle + vers l'ouest, - vers l'est)
 
-double TrueMJDfrMJD(double mjd)
+double TrueJDfrMJD(double mjd)
 {
   return mjd + MJD0;
+}
+
+double MJDfrTrueJD(double jd)
+{
+  return jd - MJD0;
 }
 
@@ -130 +135 @@
 }
 
-void HdectoHMS(double hd,int *h,int *mn,double *s)
+void HMSfrHdec(double hd,int *h,int *mn,double *s)
 // INPUT: hd
-// OUTPUT: h:mn:s
-// REMARQUE: si hd<0 alors h<0 mais toujours mn,s>=0
+// OUTPUT: h mn s   (h,mn,s >=< 0)
+// REMARQUE: si hd<0 alors h<0 ET mn<0 ET s<0
+// EX: 12.51 -> h=12  mn=30  s=10 ; 
+//    -12.51 -> h=-12 mn=-30 s=-10 ; 
 {
  int sgn=1;
@@ -145 +152 @@
  if(*mn<0) *mn = 0;
  if(*mn>=60) {*mn-=60; *h+=1;}
- *h *= sgn;
-}
-
-double HMStoHdec(int h,int mn,double s)
-// INPUT: h , mn , s
-// RETURN: h:|mn|:|s| en heures decimales
-// REMARQUE: si h<0  return -h:mn:s
-// ERROR: mn<0 ou s<0 n'est pas correct, le programme les remet>0
-{
- if(mn<0) {
-   cout<<"HMStoHdec: mn out of range <0 : "<<mn<<" changed to abs()"<<endl;
-   mn *= -1;
- }
- if(s<0.) {
-   cout<<"HMStoHdec: s out of range <0 : "<<s<<" changed to abs()"<<endl;
-   s *= -1.;
- }
- int sgn=1;  if(h<0) {sgn=-1; h*=-1;}
- return ((double)h + (double)mn/60. + s/3600.)*(double)sgn;
+ *h *= sgn; *mn *= sgn; *s *= (double)sgn;
+}
+
+double HdecfrHMS(int h,int mn,double s)
+// INPUT: h , mn , s  (h,mn,s >=< 0)
+// RETURN:  en heures decimales
+// REMARQUE: pour avoir hd=-12.51 <- h=-12 mn=-30 s=-10
+{
+ return ((double)h + (double)mn/60. + s/3600.);
 }
 
 string ToStringHMS(int h,int mn,double s)
-// INPUT: h , mn>=0 , s >=0
+// INPUT: h , mn , s   (h,mn,s >=< 0)
 // RETURN: string h:mn:s
-// REMARQUE: si h<0  return -h:mn:s
-// ERROR: mn<0 ou s<0 est une erreur !
-//        on prend la valeur absolue mn->|mn| , s->|s|
-{
- double hd = HMStoHdec(h,mn,s); // put in range
- HdectoHMS(hd,&h,&mn,&s);
+{
+ double hd = HdecfrHMS(h,mn,s); // put in range
+ HMSfrHdec(hd,&h,&mn,&s);
  char str[128];
- sprintf(str,"%d:%d:%.3f",h,mn,s);
+ if(hd<0.)
+   sprintf(str,"-%d:%d:%.3f",-h,-mn,-s);
+ else
+   sprintf(str,"%d:%d:%.3f",h,mn,s);
  string dum = str;
  return dum;
@@ -184 +181 @@
 {
  int h,mn; double s;
- HdectoHMS(hd,&h,&mn,&s);
+ HMSfrHdec(hd,&h,&mn,&s);
  return ToStringHMS(h,mn,s);
 }

trunk/SophyaExt/XAstroPack/xastropack.h

@@ -14 +14 @@
 #endif
 
-double TrueMJDfrMJD(double mjd);
+double TrueJDfrMJD(double mjd);
+double MJDfrTrueJD(double jd);
 double MJDfrDate(double dy,int mn,int yr);
 void DatefrMJD(double mjd,double *dy,int *mn,int *yr);
@@ -26 +27 @@
 double AirmassfrAlt(double alt);
 double HafrRaTS(double gst,double ra);
-void HdectoHMS(double hd,int *h,int *mn,double *s);
-double HMStoHdec(int h,int mn,double s);
+void HMSfrHdec(double hd,int *h,int *mn,double *s);
+double HdecfrHMS(int h,int mn,double s);
 string ToStringHMS(int h,int mn,double s);
 string ToStringHdec(double hd);

trunk/SophyaExt/XephemAstroLib/Makefile

@@ -9 +9 @@
 install:
         if [ ! -d $(EXTINCPATH)/XAstro ] ; then mkdir $(EXTINCPATH)/XAstro ; fi
-        rm -f $(EXTINCPATH)/XAstro/*
+        rm -f $(EXTINCPATH)/XAstro/astro.h
+        rm -f $(EXTINCPATH)/XAstro/P_.h
         rm -f $(EXTLIBPATH)/libxastro.a
         cp *.h $(EXTINCPATH)/XAstro/.