Changeset 3402 for trunk/Ohana/src/addstar

Timestamp:

Mar 9, 2005, 9:23:49 PM (22 years ago)

Author:

eugene

Message:

adding mosaic astrom support

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (3 diffs)
• include/addstar.h (modified) (1 diff)
• src/addstar.c (modified) (1 diff)
• src/args.c (modified) (1 diff)
• src/gstars.c (modified) (2 diffs)

trunk/Ohana/src/addstar/Makefile

@@ -1 @@
-#install:
-#       @echo "addstar under re-construction"
 default: addstar
 help:
@@ -31 +29 @@
 $(SRC)/ConfigInit.$(ARCH).o \
 $(SRC)/conversions.$(ARCH).o \
+$(SRC)/dump.$(ARCH).o \
 $(SRC)/edge_check.$(ARCH).o \
 $(SRC)/find_matches.$(ARCH).o \
@@ -112 +111 @@
 # utilities #################################################
 
-# install:
+install:
         for i in $(INSTALL); do make $$i.install; done
 

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

@@ -87 +87 @@
 
 int MODE;
+char *DUMP;
 
 time_t TIMEREF;

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

@@ -24 +24 @@
   case M_IMAGE:
     stars = gstars (argv[1], &Nstars, &image);
+    if ((DUMP != NULL) && !strcmp (DUMP, "rawstars")) dump_rawstars (stars, Nstars);
     regions = gregion_image (&image, &Nregions);
     overlap = gimages (&image, &Noverlap);

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

@@ -149 +149 @@
     remove_argument (N, &argc, argv);
   }
+  DUMP = NULL;
+  if ((N = get_argument (argc, argv, "-dump"))) {
+    remove_argument (N, &argc, argv);
+    DUMP = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
 
   if (argc != 2) {

trunk/Ohana/src/addstar/src/gstars.c

@@ -44 +44 @@
     exit (1);
   }
-  while (image[0].coords.crval1 < 0) image[0].coords.crval1 += 360.0;
-  while (image[0].coords.crval1 > 360.0) image[0].coords.crval1 -= 360.0;
   itmp = 0;
   fits_scan (&header, "NASTRO",   "%d", 1, &itmp);
@@ -58 +56 @@
     }
     RegisterMosaic (MOSAIC);
-  }    
+  } else {
+    /* force image to lie in 0-360 range */
+    while (image[0].coords.crval1 < 0) image[0].coords.crval1 += 360.0;
+    while (image[0].coords.crval1 > 360.0) image[0].coords.crval1 -= 360.0;
+  }
     
   /* get ST (used for airmass calculation) */