Changeset 12840 for trunk/Ohana/src/addstar

Timestamp:

Apr 17, 2007, 9:59:02 AM (19 years ago)

Author:

eugene

Message:

various fixes to support Mac OS X

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/ReadImageHeader.c (modified) (2 diffs)
• src/SetSignals.c (modified) (1 diff)
• src/args.c (modified) (1 diff)

trunk/Ohana/src/addstar/include/addstar.h

@@ -82 +82 @@
 int     ACCEPT_ASTROM;  // accept even bad astrometry solutions (NASTRO == 0)
 int     ACCEPT_MOTION;  // accept reference proper motion measurements
+int     ACCEPT_TIME;    // accept time stamp (or 0)
+int     NO_STARS;       // ignore the stars
 int     TEXTMODE;       // force input file to be loaded as RAW
 int     SUBPIX;         // apply a subpix correction

trunk/Ohana/src/addstar/src/ReadImageHeader.c

@@ -24 +24 @@
   image[0].NY = Ny;
 
-  if (!gfits_scan (header, "TZERO",   "%d",  1, &image[0].tzero)) {
+  if (!gfits_scan (header, "TZERO",   "%d",  1, &image[0].tzero) && !ACCEPT_TIME) {
     image[0].tzero = parse_time (header);
   }
@@ -155 +155 @@
 
   /* find expected number of stars */
-  if (!gfits_scan (header, "NSTARS", "%d", 1, &image[0].nstar)) {
+  if (!gfits_scan (header, "NSTARS", "%d", 1, &image[0].nstar) && !NO_STARS) {
     fprintf (stderr, "can't get NSTARS from header\n");
     return (FALSE);

trunk/Ohana/src/addstar/src/SetSignals.c

@@ -30 +30 @@
   for (i = 0; i < 36; i++) {
     switch (i) {
-      /* can't redirect this signals */
-    case SIGKILL:    /* kill -9: cannot be caught or ignored */
-    case SIGSTOP:    /* SIGSTOP: cannot be caught or ignored */
+      /* can't redirect these signals */
+    case SIGKILL:    /* kill -9: cannot be caught or ignored (POSIX.1-1990) */
+    case SIGSTOP:    /* SIGSTOP: cannot be caught or ignored (POSIX.1-1990) */
       /* ignore these signals */
-    case SIGCHLD:    /* child halted: ignore */
-    case SIGPWR:     /* power failure - why ignore this? */
-    case SIGWINCH:   /* window resized */
-    case SIGCONT:    /* continue - maintain this action */
-    case SIGTSTP:    /* stop signal sent from tty - why ignore? */
-    case SIGURG:     /* socket signal, ignore this */
+    case SIGCHLD:    /* child halted: ignore (POSIX.1-1990) */
+    case SIGCONT:    /* continue - maintain this action (POSIX.1-1990) */
+    case SIGTSTP:    /* stop signal sent from tty - why ignore? (POSIX.1-1990) */
+    case SIGURG:     /* socket signal, ignore this (POSIX.1-2001) */
+# ifdef (SIGPWR)
+    case SIGPWR:     /* power failure - why ignore this? (Sys V) */
+# endif
+# ifdef (SIGWINCH)
+    case SIGWINCH:   /* window resized (4.3BSD) */
+# endif
       break;
       

trunk/Ohana/src/addstar/src/args.c

@@ -242 +242 @@
   if ((N = get_argument (argc, argv, "-accept-motion"))) {
     ACCEPT_MOTION = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  /* accept bad header astrometry */
+  ACCEPT_TIME = FALSE;
+  if ((N = get_argument (argc, argv, "-accept-time"))) {
+    ACCEPT_TIME = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  /* skip the stars */
+  NO_STARS = FALSE;
+  if ((N = get_argument (argc, argv, "-no-stars"))) {
+    NO_STARS = TRUE;
     remove_argument (N, &argc, argv);
   }