Changeset 2551 in Sophya for trunk/SophyaExt/XephemAstroLib/misc.c

Timestamp:

Jun 15, 2004, 6:54:12 PM (21 years ago)

Author:

cmv

Message:

nouvelle version de xephem/libastro (3.6) cmv 15/6/04

File:

• trunk/SophyaExt/XephemAstroLib/misc.c (modified) (20 diffs)

trunk/SophyaExt/XephemAstroLib/misc.c

@@ -6 +6 @@
 #include <stdio.h>
 #include <math.h>
-
-#if defined(__STDC__)
 #include <stdlib.h>
 #include <string.h>
-#else
-extern double atof();
-#endif
-
-#include "P_.h"
+
 #include "astro.h"
-#include "circum.h"
 
 /* zero from loc for len bytes */
 void
-zero_mem (loc, len)
-void *loc;
-unsigned len;
+zero_mem (void *loc, unsigned len)
 {
         (void) memset (loc, 0, len);
@@ -33 +24 @@
  */
 int
-tickmarks (min, max, numdiv, ticks)
-double min, max;
-int numdiv;
-double ticks[];
+tickmarks (double min, double max, int numdiv, double ticks[])
 {
         static int factor[] = { 1, 2, 5 };
@@ -47 +35 @@
         minscale = fabs(max - min);
         delta = minscale/numdiv;
-        for (n=0; n < sizeof(factor)/sizeof(factor[0]); n++) {
+        for (n=0; n < (int)(sizeof(factor)/sizeof(factor[0])); n++) {
             double scale;
             double x = delta/factor[n];
@@ -67 +55 @@
  */
 char *
-obj_description (op)
-Obj *op;
-{
-        static struct {
-            char class;
+obj_description (Obj *op)
+{
+        typedef struct {
+            char classcode;
             char *desc;
-        } fixed_class_map[] = {
+        } CC;
+
+#define NFCM    ((int)(sizeof(fixed_class_map)/sizeof(fixed_class_map[0])))
+        static CC fixed_class_map[] = {
             {'A', "Cluster of Galaxies"},
-            {'B', "Binary Star"},
+            {'B', "Binary System"},
             {'C', "Globular Cluster"},
             {'D', "Double Star"},
@@ -94 +84 @@
             {'U', "Cluster, with nebulosity"},
             {'V', "Variable Star"},
+            {'Y', "Supernova"},
         };
-#define NFCM    (sizeof(fixed_class_map)/sizeof(fixed_class_map[0]))
+
+#define NBCM    ((int)(sizeof(binary_class_map)/sizeof(binary_class_map[0])))
+        static CC binary_class_map[] = {
+            {'a', "Astrometric binary"},
+            {'c', "Cataclysmic variable"},
+            {'e', "Eclipsing binary"},
+            {'x', "High-mass X-ray binary"},
+            {'y', "Low-mass X-ray binary"},
+            {'o', "Occultation binary"},
+            {'s', "Spectroscopic binary"},
+            {'t', "1-line spectral binary"},
+            {'u', "2-line spectral binary"},
+            {'v', "Spectrum binary"},
+            {'b', "Visual binary"},
+            {'d', "Visual binary, apparent"},
+            {'q', "Visual binary, optical"},
+            {'r', "Visual binary, physical"},
+            {'p', "Exoplanet"},
+        };
 
         switch (op->o_type) {
@@ -102 +111 @@
                 int i;
                 for (i = 0; i < NFCM; i++)
-                    if (fixed_class_map[i].class == op->f_class)
+                    if (fixed_class_map[i].classcode == op->f_class)
                         return (fixed_class_map[i].desc);
             }
-            return (op->o_type == FIXED ? "Fixed" : "Field Star");
+            return ("Fixed");
         case PARABOLIC:
             return ("Solar - Parabolic");
@@ -112 +121 @@
         case ELLIPTICAL:
             return ("Solar - Elliptical");
-        case PLANET:
-            return ("Planet");
+        case BINARYSTAR:
+            if (op->f_class) {
+                int i;
+                for (i = 0; i < NFCM; i++)
+                    if (binary_class_map[i].classcode == op->f_class)
+                        return (binary_class_map[i].desc);
+            }
+            return ("Binary system");
+        case PLANET: {
+            static char nsstr[16];
+            static Obj *biop;
+
+            if (op->pl_code == SUN)
+                return ("Star");
+            if (op->pl_code == MOON)
+                return ("Moon of Earth");
+            if (op->pl_moon == X_PLANET)
+                return ("Planet");
+            if (!biop)
+                getBuiltInObjs (&biop);
+            sprintf (nsstr, "Moon of %s", biop[op->pl_code].o_name);
+            return (nsstr);
+            }
         case EARTHSAT:
             return ("Earth Sat");
         default:
             printf ("obj_description: unknown type: 0x%x\n", op->o_type);
-            exit (1);
+            abort();
             return (NULL);      /* for lint */
         }
@@ -126 +156 @@
  */
 void
-now_lst (np, lstp)
-Now *np;
-double *lstp;
+now_lst (Now *np, double *lstp)
 {
         static double last_mjd = -23243, last_lng = 121212, last_lst;
@@ -156 +184 @@
  */
 void
-radec2ha (np, ra, dec, hap)
-Now *np;
-double ra, dec;
-double *hap;
+radec2ha (Now *np, double ra, double dec, double *hap)
 {
         double ha, lst;
@@ -182 +207 @@
  */
 int
-lc (cx, cy, cw, x1, y1, x2, y2, sx1, sy1, sx2, sy2)
-int cx, cy, cw;                 /* circle bounding box corner and width */
-int x1, y1, x2, y2;             /* line segment endpoints */
-int *sx1, *sy1, *sx2, *sy2;     /* segment inside the circle */
+lc (
+int cx, int cy, int cw,                 /* circle bbox corner and width */
+int x1, int y1, int x2, int y2,         /* line segment endpoints */
+int *sx1, int *sy1, int *sx2, int *sy2) /* segment inside the circle */
 {
         int dx = x2 - x1;
@@ -240 +265 @@
  */
 void
-hg_mag (h, g, rp, rho, rsn, mp)
-double h, g;
-double rp;      /* sun-obj dist, AU */
-double rho;     /* earth-obj dist, AU */
-double rsn;     /* sun-earth dist, AU */
-double *mp;
+hg_mag (
+double h, double g,
+double rp,      /* sun-obj dist, AU */
+double rho,     /* earth-obj dist, AU */
+double rsn,     /* sun-earth dist, AU */
+double *mp)
 {
         double psi_t, Psi_1, Psi_2, beta;
@@ -265 +290 @@
         psi_t = pow (tb2, 1.22);
         Psi_2 = exp(-1.87*psi_t);
-        *mp = h + 5.0*log10(rp*rho) - 2.5*log10((1-g)*Psi_1 + g*Psi_2);
+        *mp = h + 5.0*log10(rp*rho);
+        if (Psi_1 || Psi_2) *mp -= 2.5*log10((1-g)*Psi_1 + g*Psi_2);
 }
 
@@ -273 +299 @@
  */
 int
-magdiam (fmag, magstp, scale, mag, size)
-int fmag;       /* faintest mag */
-int magstp;     /* mag range per dot size */
-double scale;   /* rads per pixel */
-double mag;     /* magnitude */
-double size;    /* rads, or 0 */
+magdiam (
+int fmag,       /* faintest mag */
+int magstp,     /* mag range per dot size */
+double scale,   /* rads per pixel */
+double mag,     /* magnitude */
+double size)    /* rads, or 0 */
 {
         int diam, sized;
@@ -295 +321 @@
  */
 void
-gk_mag (g, k, rp, rho, mp)
-double g, k;
-double rp;      /* sun-obj dist, AU */
-double rho;     /* earth-obj dist, AU */
-double *mp;
+gk_mag (
+double g, double k,
+double rp,      /* sun-obj dist, AU */
+double rho,     /* earth-obj dist, AU */
+double *mp)
 {
         *mp = g + 5.0*log10(rho) + 2.5*k*log10(rp);
@@ -309 +335 @@
  */
 double
-atod (buf)
-char *buf;
-{
-        return (atof (buf));
+atod (char *buf)
+{
+        return (strtod (buf, NULL));
 }
 
@@ -331 +356 @@
  */
 void
-solve_sphere (A, b, cc, sc, cap, Bp)
-double A, b;
-double cc, sc;
-double *cap, *Bp;
+solve_sphere (double A, double b, double cc, double sc, double *cap, double *Bp)
 {
         double cb = cos(b), sb = sin(b);
-        double cA = cos(A);
+        double sA, cA = cos(A);
+        double x, y;
         double ca;
         double B;
@@ -350 +373 @@
             return;
 
-        if (cc > .99999) {
-            /* as c approaches 0, B approaches pi - A */
-            B = PI - A;
-        } else if (cc < -.99999) {
-            /* as c approaches PI, B approaches A */
-            B = A;
-        } else {
-            /* compute cB and sB and remove common factor of sa from quotient.
-             * be careful where B causes atan to blow.
-             */
-            double sA = sin(A);
-            double x, y;
-
-            y = sA*sb*sc;
-            x = cb - ca*cc;
-        
-            if (fabs(x) < 1e-5)
-                B = y < 0 ? 3*PI/2 : PI/2;
-            else
-                B = atan2 (y, x);
-        }
+        sA = sin(A);
+        y = sA*sb*sc;
+        x = cb - ca*cc;
+        B = y ? (x ? atan2(y,x) : (y>0 ? PI/2 : -PI/2)) : (x>=0 ? 0 : PI);
 
         *Bp = B;
@@ -435 +441 @@
  */
 double
-delra (dra)
-double dra;
+delra (double dra)
 {
         double fdra = fmod(fabs(dra), 2*PI);
@@ -449 +454 @@
  */
 int
-is_deepsky (op)
-Obj *op;
+is_deepsky (Obj *op)
 {
         int deepsky = 0;
@@ -473 +477 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: misc.c,v $ $Date: 2001-10-22 12:08:27 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: misc.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};