Changeset 4605

Timestamp:

Jul 24, 2005, 8:30:34 PM (21 years ago)

Author:

eugene

Message:

starting delstar cleanup

Location:

trunk/Ohana/src/delstar

Files:

• Makefile (modified) (1 diff)
• include/delstar.h (modified) (1 diff)
• src/convert.c (added)
• src/gtimes.c (modified) (1 diff)

trunk/Ohana/src/delstar/Makefile

@@ -29 +29 @@
 $(SRC)/sort_lists.$(ARCH).o     $(SRC)/parse_time.$(ARCH).o     \
 $(SRC)/gcatstats.$(ARCH).o      $(SRC)/find_images.$(ARCH).o    \
-$(SRC)/match_images.$(ARCH).o   $(SRC)/delete_orphans.$(ARCH).o
+$(SRC)/match_images.$(ARCH).o   $(SRC)/delete_orphans.$(ARCH).o \
+$(SRC)/convert.$(ARCH).o
 
 OBJ = $(DELSTAR)

trunk/Ohana/src/delstar/include/delstar.h

@@ -24 +24 @@
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
+
+/*** values for time formats */
+enum {TIME_NONE, TIME_JD, TIME_MJD, TIME_DATE, TIME_DAYS, TIME_HOURS, TIME_MINUTES, TIME_SECONDS};
+
+/*** conversion functions ***/
+int           chk_time              PROTO((char *line));
+time_t        date_to_sec           PROTO((char *date));
+time_t        jd_to_sec             PROTO((double jd));
+time_t        mjd_to_sec            PROTO((double mjd));
+char         *sec_to_date           PROTO((time_t second));
+double        sec_to_jd             PROTO((time_t second));
+double        sec_to_mjd            PROTO((time_t second));
+int           str_to_dtime          PROTO((char *line, double *second));
+int           str_to_radec          PROTO((double *ra, double *dec, char *str1, char *str2));
+int           str_to_time           PROTO((char *line, time_t *second));

trunk/Ohana/src/delstar/src/gtimes.c

@@ -4 +4 @@
  
   int i, npimage, NPIMAGE, ntimage, Ntimage, NTIMAGE, Nimage;
-  int start, end, range, tstart, tend;
-  double Ra, Dec;
+  time_t start, end, tstart, tend;
+  double Ra, Dec, range;
   Image *pimage, *timage;
   Header header;
 
-  start = atof(argv[1]);
-  range = atof(argv[2]);
-  if (range < 2) {
-    start = start - 1;
-    range = 2;
+  if (!str_to_time (argv[1], &start)) { 
+    fprintf (stderr, "syntax error\n");
+    return (FALSE);
+  }
+  if (!str_to_dtime (argv[2], &range)) { 
+    fprintf (stderr, "syntax error\n");
+    return (FALSE);
+  }
+  if (range < 0) {
+    range = fabs (range);
+    start -= range;
   }
   end = start + range;
+
+  fprintf (stderr, "start: %d\n", start);
+  fprintf (stderr, "end: %d\n", end);
+
   *START = start;
   *END = end;