Changeset 18718

Timestamp:

Jul 24, 2008, 3:54:50 PM (18 years ago)

Author:

eugene

Message:

added a new radec conversion function

Location:

trunk/Ohana/src/opihi

Files:

• cmd.astro/Makefile (modified) (1 diff)
• cmd.astro/init.c (modified) (2 diffs)
• cmd.astro/radec.c (added)
• lib.data/convert.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.astro/Makefile

@@ -41 +41 @@
 $(SRC)/precess.$(ARCH).o           \
 $(SRC)/profile.$(ARCH).o           \
+$(SRC)/radec.$(ARCH).o     \
 $(SRC)/region.$(ARCH).o    \
 $(SRC)/rotcurve.$(ARCH).o          \

trunk/Ohana/src/opihi/cmd.astro/init.c

@@ -27 +27 @@
 int precess                 PROTO((int, char **));
 int profile                 PROTO((int, char **));
+int radec                   PROTO((int, char **));
 int region                  PROTO((int, char **));
 int rotcurve                PROTO((int, char **));
@@ -62 +63 @@
   {1, "precess",     precess,      "precess coordinates"},
   {1, "profile",     profile,      "radial profile at X, Y"},
+  {1, "radec",       radec,        "convert to/from radec in hms or dd"},
   {1, "region",      region,       "define sky region for plot"},
   {1, "rotcurve",    rotcurve,     "convert CO images to polar coords"},

trunk/Ohana/src/opihi/lib.data/convert.c

@@ -7 +7 @@
 int hh_hms (double hh, int *hr, int *mn, double *sc) {
 
-  int flag;
+  int N, flag;
 
   flag = SIGN(hh);
-  hh *= flag;
-  hh = 24.0*(hh/24.0 - (int)(hh/24.0));
-  *sc = 60.0*(60.0*hh - (int)(60.0*hh));
-  *mn = 60.0*(hh - (int)hh);
+  hh = fabs(hh);
+
+  // rationalize hh to range -24.0 < hh < 24.0
+  if (hh >= 24.0) {
+    N = (int)(hh/24.0);
+    hh -= 24.0*N;
+  }
+
   *hr = (int) hh;
+  *mn = (int) 60*(hh - *hr);
+  *sc = 3600.0*(hh - *hr - *mn / 60.0);
+  if (*sc > 59.99) {
+    *sc = 0.0;
+    *mn += 1.0;
+  }
   *hr *= flag;
   return (TRUE);
@@ -49 +59 @@
       sprintf (line, "-%02d:%02d:%05.2f", abs(hr), mn, sc);
     } else {
-      sprintf (line, "%02d:%02d:%05.2f", hr, mn, sc);
+      sprintf (line, "+%02d:%02d:%05.2f", hr, mn, sc);
     }
   }      
@@ -64 +74 @@
     sprintf (line, "-%02d:%02d:%05.2f", abs(dg), mn, sc);
   } else {
-    sprintf (line, "%02d:%02d:%05.2f", dg, mn, sc);
+    sprintf (line, "+%02d:%02d:%05.2f", dg, mn, sc);
   }
   return (TRUE);