Changeset 4810 for trunk/Ohana/src/getstar

Timestamp:

Aug 17, 2005, 9:36:55 AM (21 years ago)

Author:

eugene

Message:

renamed hms_to_deg hstgsc_hms_to_deg everywhere, moved into libohana

File:

• trunk/Ohana/src/getstar/src/aregion.c (modified) (2 diffs)

trunk/Ohana/src/getstar/src/aregion.c

@@ -83 +83 @@
     strncpy (temp, &buffer[i*48], 48);
     temp[49] = 0;
-    hms_to_deg (&RA0, &RA1, &DEC0, &DEC1, &temp[7]);
+    hstgsc_hms_to_deg (&RA0, &RA1, &DEC0, &DEC1, &temp[7]);
     if (RA1 < RA0) RA1 += 360.0;
     if ((dec >= 0) && (dec >= DEC0) && (dec < DEC1) && (ra >= RA0) && (ra < RA1)) {
@@ -111 +111 @@
   return;
 }
-
-
-/**********/
-int hms_to_deg (h0, h1, d0, d1, string) 
-     char *string;
-     double *h0, *h1, *d0, *d1;
-{
-  
-  int flag_d0, flag_d1, flag_h0, flag_h1;
-  double tmp;
-  
-  *d0 = *h0 = *d1 = *h1 = 0;
-
-  flag_h0 = dparse (h0, 1, string);
-  flag_h1 = dparse (h1, 4, string);
-  flag_d0 = dparse (d0, 7, string);
-  flag_d1 = dparse (d1, 9, string);
-  *h0 *= flag_h0;
-  *h1 *= flag_h1;
-  *d0 *= flag_d0;
-  *d1 *= flag_d1;
-
-  dparse (&tmp, 2, string);
-  *h0 += tmp/60.0;
-  dparse (&tmp, 3, string);
-  *h0 += tmp/3600.0;
-  
-  dparse (&tmp, 5, string);
-  *h1 += tmp/60.0;
-  dparse (&tmp, 6, string);
-  *h1 += tmp/3600.0;
-  
-  dparse (&tmp, 8, string);
-  *d0 += tmp/60.0;
-
-  dparse (&tmp, 10, string);
-  *d1 += tmp/60.0;
-
-  *h0 *= 15*flag_h0;
-  *h1 *= 15*flag_h1;
-  *d0 *= flag_d0;
-  *d1 *= flag_d1;
-
-  return (TRUE);
-}
-
-
-/*
-      if (buffer[i*48 + 19] == ' ') continue;
-      strncpy (temp, &buffer[i*48 + 19], 20);       temp[20] = 0;
-      hms_to_deg (&RA,  &DEC, temp, ' ', 3);
-
-
-  dBigRA = 360.0 / (int)(0.5 + 48*cos(3.1415927*0.5*(BigDecBounds[NBigDec] + BigDecBounds[NBigDec + 1])/180.0));
-
-  NBigRA = ra / dBigRA;
-
-  NBig = NBigRA;
-  for (i = 0; (i < 12) && (i < NBigDec); i++) {
-    NBig += NBigRASections[i];
-  }
-  for (i = 13; (i < 24) && (i < NBigDec); i++) {
-    NBig += NBigRASections[i];
-  }
-
-
-  fprintf (stderr, "%d %d %d %d %f %f -> %f %f %f\n", NBigDec, NBigRA, NBigRASections[NBigDec], NBig, ra, dec, BigDecBounds[NBigDec], BigDecBounds[NBigDec + 1], dBigRA);
-*/