Changeset 6683 for trunk/Ohana/src/libohana

Timestamp:

Mar 26, 2006, 10:46:32 AM (20 years ago)

Author:

eugene

Message:

adding proper motion and parallax to addstar, dropping _PS from RA and DEC in average

File:

• trunk/Ohana/src/libohana/src/time.c (modified) (5 diffs)

trunk/Ohana/src/libohana/src/time.c

@@ -48 +48 @@
   value += tmp / 3600.0;
 
- escape:
+escape:
   if (neg) {
     value *= -1;
@@ -64 +64 @@
   *ra = *dec = 0;
   switch (dms_to_ddd (&Ra, str1)) {
-  case 0:
-    fprintf (stderr, "syntax error in RA\n");
-    return (FALSE);
-  case 1:
-    break;
-  case 2:
-    Ra = Ra * 15;
-    break;
+    case 0:
+      fprintf (stderr, "syntax error in RA\n");
+      return (FALSE);
+    case 1:
+      break;
+    case 2:
+      Ra = Ra * 15;
+      break;
   }
   switch (dms_to_ddd (&Dec, str2)) {
-  case 0:
-    fprintf (stderr, "syntax error in DEC\n");
-    return (FALSE);
-  case 1:
-  case 2:
-    break;
+    case 0:
+      fprintf (stderr, "syntax error in DEC\n");
+      return (FALSE);
+    case 1:
+    case 2:
+      break;
   }
   *ra = Ra;
@@ -151 +151 @@
     
   switch (chk_time (line)) {
-  case 0:
-    return (FALSE);
-  case TIME_DATE:
-    *second = date_to_sec (line);
-    return (TRUE);
-  case TIME_DAYS:
-    *second = strtod (line, 0) * 86400.0;
-    return (TRUE);
-  case TIME_HOURS:
-    *second = strtod (line, 0) * 3600.0;
-    return (TRUE);
-  case TIME_MINUTES:
-    *second = strtod (line, 0) * 60.0;
-    return (TRUE);
-  case TIME_SECONDS:
-    *second = strtod (line, 0);
-    return (TRUE);
-  case TIME_JD:
-    jd = strtod (line, 0);
-    *second = jd_to_sec (jd);
-    return (TRUE);
-  case TIME_MJD:
-    jd = strtod (line, 0);
-    *second = mjd_to_sec (jd);
-    return (TRUE);
+    case 0:
+      return (FALSE);
+    case TIME_DATE:
+      *second = date_to_sec (line);
+      return (TRUE);
+    case TIME_DAYS:
+      *second = strtod (line, 0) * 86400.0;
+      return (TRUE);
+    case TIME_HOURS:
+      *second = strtod (line, 0) * 3600.0;
+      return (TRUE);
+    case TIME_MINUTES:
+      *second = strtod (line, 0) * 60.0;
+      return (TRUE);
+    case TIME_SECONDS:
+      *second = strtod (line, 0);
+      return (TRUE);
+    case TIME_JD:
+      jd = strtod (line, 0);
+      *second = jd_to_sec (jd);
+      return (TRUE);
+    case TIME_MJD:
+      jd = strtod (line, 0);
+      *second = mjd_to_sec (jd);
+      return (TRUE);
   }
   return (FALSE);
@@ -185 +185 @@
   
   switch (chk_time (line)) {
-  case 0:
-  case TIME_JD:
-  case TIME_MJD:
-  case TIME_DATE:
-    return (FALSE);
-  case TIME_DAYS:
-    *second = strtod (line, 0) * 86400.0;
-    return (TRUE);
-  case TIME_HOURS:
-    *second = strtod (line, 0) * 3600.0;
-    return (TRUE);
-  case TIME_MINUTES:
-    *second = strtod (line, 0) * 60.0;
-    return (TRUE);
-  case TIME_SECONDS:
-    *second = strtod (line, 0);
-    return (TRUE);
+    case 0:
+    case TIME_JD:
+    case TIME_MJD:
+    case TIME_DATE:
+      return (FALSE);
+    case TIME_DAYS:
+      *second = strtod (line, 0) * 86400.0;
+      return (TRUE);
+    case TIME_HOURS:
+      *second = strtod (line, 0) * 3600.0;
+      return (TRUE);
+    case TIME_MINUTES:
+      *second = strtod (line, 0) * 60.0;
+      return (TRUE);
+    case TIME_SECONDS:
+      *second = strtod (line, 0);
+      return (TRUE);
   }
   return (FALSE);
@@ -312 +312 @@
   p1 = p2 + 1;
 
- escape:
+escape:
   jd = now.tm_mday - 32075 + (int)(1461*(1900 + now.tm_year + 4800 + (int)(((now.tm_mon+1)-14)/12))/4)
     + (int)(367*((now.tm_mon+1) - 2 - (int)(((now.tm_mon+1) - 14)/12)*12)/12)